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.

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

Bump org.json:json from 20140107 to 20240205 #7701

Merged
merged 2 commits into from
Feb 8, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Feb 6, 2024

Bumps org.json:json from 20140107 to 20240205.

Release notes

Sourced from org.json:json's releases.

20240205

Pull Request Description
#855 Fix JSONArrayTest testRecursiveDepthArrayFor1000Levels() 
#846 Cleanup warnings and merge new unit tests
#845 improved annotation search performance
#835 Delete redundant .toString() call in README
#832 Add a config flag to disable whitespace trimming
#831 Refactor NumberConversionUtil and toString() of CookieList & XML Classes
#830 Upgrade json-path's version to 2.4.0 to avoid dependency conflict
#828 Fixed flaky tests in XMLTest.java
#824 Ignore tests that fail due to resource differences
#823 JSON parsing self reference object and array
#820 Close XML tag explicitly for empty tags with configuration
#815 Ensure java 6 compatable 
#814 Refactor duplicate code for stringToNumber() in JSONObject, JSONArray, and XML
#812 docs: use syntax highlighting
#808 Fix compiler warnings
#806 Add new deployment pipeline
#803 ci: test with Java 21 
#801 Updates the pipeline to validate that packaging a jar works properly
#798 fix: flakiness in org.json.junit.XMLTest#testIndentComplicatedJsonObjectWithArrayAndWithConfig
#794 XML optLong/getLong equivalent updates for string to number conversion.

20231013

Pull Request Description
#793 Reverted #761
#792 update the docs for release 20231013
#783 optLong vs getLong inconsistencies
#782 Fix XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig() for Windows
#779 add validity check for JSONObject constructors
#778 Fix XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig() for Windows
#776 Update [JUnit to version 4.13.2
#774 Removing unneeded synchronization
#773 Add optJSONArray method to JSONObject with a default value
#772 Disallow nested objects and arrays as keys in objects
#779 Unit test cleanup
#769 Addressed Java 17 compile warnings
#764 Update CodeQL action version
#761 Add module-info
#759 JSON parsing should detect embedded 
#753 Updated new object methods
#752 Fixes possible unit test bug when compiling/testing on Windows

20230618

Pull Request Description
#749 Prep for release 20230618
#740 Fixed Flaky Tests Caused by JSON permutations

... (truncated)

Changelog

Sourced from org.json:json's changelog.

20240205 Recent commits.

20231013 First release with minimum Java version 1.8. Recent commits, including fixes for CVE-2023-5072.

20230618 Final release with Java 1.6 compatibility. Future releases will require Java 1.8 or greater.

20230227 Fix for CVE-2022-45688 and recent commits

20220924 New License - public domain, and some minor updates

20220320 Wrap StackOverflow with JSONException

20211205 Recent commits and some bug fixes for similar()

20210307 Recent commits and potentially breaking fix to JSONPointer

20201115 Recent commits and first release after project structure change

20200518 Recent commits and snapshot before project structure change

20190722 Recent commits

20180813 POM change to include Automatic-Module-Name (#431) JSONObject(Map) now throws an exception if any of a map keys are null (#405)

20180130 Recent commits

20171018 Checkpoint for recent commits.

20170516 Roll up recent commits.

20160810 Revert code that was breaking opt*() methods.

20160807 This release contains a bug in the JSONObject.opt*() and JSONArray.opt*() methods, it is not recommended for use. Java 1.6 compatability fixed, JSONArray.toList() and JSONObject.toMap(), RFC4180 compatibility, JSONPointer, some exception fixes, optional XML type conversion. Contains the latest code as of 7 Aug 2016

20160212 Java 1.6 compatibility, OSGi bundle. Contains the latest code as of 12 Feb 2016.

20151123 JSONObject and JSONArray initialization with generics. Contains the latest code as of 23 Nov 2015.

20150729 Checkpoint for Maven central repository release. Contains the latest code as of 29 July 2015.

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Feb 6, 2024
@juanluisrp
Copy link
Contributor

@dependabot rebase

Copy link
Contributor Author

dependabot bot commented on behalf of github Feb 6, 2024

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

dependabot bot and others added 2 commits February 6, 2024 13:27
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20140107 to 20240205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Remove the version from common/pom.xml and add the dependency to
dependencyManagement section of root pom.xml.
@juanluisrp
Copy link
Contributor

Although the dependency stated in common/pom.xml was 20140107 GN was already using version 20230618 introduced by org.mapfish.print:print-lib:jar:2.3.0 so the version jump is not so scary.

I've removed the version number from common/pom.xml and added the dependency to the dependencyManagement section of the root pom.xml.

Copy link

sonarcloud bot commented Feb 6, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@juanluisrp juanluisrp merged commit f36682e into main Feb 8, 2024
11 checks passed
@dependabot dependabot bot deleted the dependabot/maven/org.json-json-20240205 branch February 8, 2024 09:55
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6582907530... Add org.json:json to dependency management
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging common/pom.xml
[backport-7701-to-4.2.x b596f43d0f] Bump org.json:json from 20140107 to 20240205
 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 Date: Tue Feb 6 07:24:05 2024 +0000
 1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging common/pom.xml
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-7701-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1807d510765153e6f53dee9ee355e18b7b7e5899,65829075308c12351eabd89c74b7ffe886fc7b2b
# Push it to GitHub
git push --set-upstream origin backport-7701-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-7701-to-4.2.x.

juanluisrp added a commit to juanluisrp/core-geonetwork that referenced this pull request Feb 8, 2024
Remove the version from common/pom.xml and add the dependency to
dependencyManagement section of root pom.xml.

Backport geonetwork#7701.
juanluisrp added a commit that referenced this pull request Feb 8, 2024
* Bump org.json:json from 20140107 to 20240205

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20140107 to 20240205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* [Backport 4.2.x] Add org.json:json to dependency management

Remove the version from common/pom.xml and add the dependency to
dependencyManagement section of root pom.xml.

Backport #7701.

* Automatic JS formatting

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 3.12.x backport 4.2.x dependencies Pull requests that update a dependency file failed backport java Pull requests that update Java code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants