Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove org.json lib fork and use new version of the API https://githu… #865

Merged
merged 25 commits into from
Nov 19, 2024
Merged

Remove org.json lib fork and use new version of the API https://githu… #865

merged 25 commits into from
Nov 19, 2024

Conversation

iroqueta
Copy link
Collaborator

…b.com/stleary/JSON-java

Issue: 105607

@iroqueta iroqueta requested a review from tomas-sexenian May 22, 2024 19:22
@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 1 conflicted file in commit d844074
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java

@iroqueta iroqueta removed the conflict label May 22, 2024
tomas-sexenian
tomas-sexenian previously approved these changes May 22, 2024
View reviewed changes
@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 1 conflicted file in commit d844074
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java

iroqueta added 7 commits May 23, 2024 12:14
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
04003dc 
…b.com/stleary/JSON-java

Issue: 105607
d844074
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
11cfef3 
…b.com/stleary/JSON-java

Issue: 105607
d844074
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
8611985 
…b.com/stleary/JSON-java

Issue: 105607
d844074
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
6ae833f 
…b.com/stleary/JSON-java

Issue: 105607
d844074
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
9b79487 
…b.com/stleary/JSON-java

Issue: 105607
d844074
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
75563b2 
…b.com/stleary/JSON-java

Issue: 105607
d844074
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
95be0dc 
…b.com/stleary/JSON-java

Issue: 105607
d844074
@iroqueta iroqueta removed the conflict label May 28, 2024
@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 4 conflicted files in commit d844074
  • common/src/main/java/com/genexus/xml/GXXMLSerializable.java
  • gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebRow.java

@iroqueta iroqueta removed the conflict label May 28, 2024
@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 4 conflicted files in commit d844074
  • common/src/main/java/com/genexus/xml/GXXMLSerializable.java
  • gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebRow.java

@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 4 conflicted files in commit d844074
  • common/src/main/java/com/genexus/xml/GXXMLSerializable.java
  • gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebRow.java

iroqueta and others added 7 commits May 31, 2024 12:04
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
457df2a 
…b.com/stleary/JSON-java

Issue: 105607
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
bf106f1 
…b.com/stleary/JSON-java

Issue: 105607
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
1bae3d3 
…b.com/stleary/JSON-java

Issue: 105607
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
30fdb7f 
…b.com/stleary/JSON-java

Issue: 105607
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
8187fba 
…b.com/stleary/JSON-java

Issue: 105607
@iroqueta
Remove org.json lib fork and use new version of the API https://githu…
285c0db 
…b.com/stleary/JSON-java

Issue: 105607
@jotapeg
Fix SDTs instantiation not working in offline Android procedures
48b1f68
@genexusbot
Copy link
Collaborator

Manual cherry pick to beta success

@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 6 conflicted files in commit d844074
  • common/src/main/java/com/genexus/internet/GXNavigationHelper.java
  • common/src/main/java/com/genexus/util/GXProperties.java
  • common/src/main/java/com/genexus/xml/GXXMLSerializable.java
  • gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebRow.java

@genexusbot
Copy link
Collaborator

Manual cherry pick to beta success

@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 6 conflicted files in commit d844074
  • common/src/main/java/com/genexus/internet/GXNavigationHelper.java
  • common/src/main/java/com/genexus/util/GXProperties.java
  • common/src/main/java/com/genexus/xml/GXXMLSerializable.java
  • gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebRow.java

@genexusbot
Copy link
Collaborator

Manual cherry pick to beta success

@genexusbot
Copy link
Collaborator

Cherry pick to beta failed, 7 conflicted files in commit d844074
  • common/src/main/java/com/genexus/internet/GXNavigationHelper.java
  • common/src/main/java/com/genexus/util/GXProperties.java
  • common/src/main/java/com/genexus/xml/GXXMLSerializable.java
  • gxawsserverless/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaEventBridgeHandler.java
  • gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebPanel.java
  • gxweb/src/main/java/com/genexus/webpanels/GXWebRow.java

@genexusbot
Copy link
Collaborator

BETA RESET - Cherry pick to beta failed, 2 conflicted files in commit d844074
  • common/src/main/java/com/genexus/internet/GXNavigationHelper.java
  • gxawsserverless/src/main/java/com/genexus/cloud/serverless/aws/handler/LambdaEventBridgeHandler.java

@genexusbot
Copy link
Collaborator

Manual cherry pick to beta success

@genexusbot
Copy link
Collaborator

Cherry pick to beta success

@cinthamo cinthamo removed the run bot label Sep 4, 2024
@iroqueta iroqueta merged commit 309497c into master Nov 19, 2024
10 checks passed
@iroqueta iroqueta deleted the ReplaceJsonAPI branch November 19, 2024 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomas-sexenian tomas-sexenian tomas-sexenian left review comments

Assignees
No one assigned
Labels
bot closed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@iroqueta @genexusbot @tomas-sexenian @cinthamo @anaiberta @jotapeg