-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Manually bump net.minidev:json-smart from 2.4.11 to 2.5.0 #8576
Manually bump net.minidev:json-smart from 2.4.11 to 2.5.0 #8576
Conversation
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
221ed9e
to
001b7b7
Compare
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Failure seems like a flaky result from Jenkins--will manually trigger retry but pushing text change. |
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #8576 +/- ##
============================================
+ Coverage 70.77% 70.83% +0.05%
- Complexity 56893 56907 +14
============================================
Files 4758 4758
Lines 269417 269417
Branches 39420 39420
============================================
+ Hits 190679 190829 +150
+ Misses 62635 62500 -135
+ Partials 16103 16088 -15 |
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Gradle Check (Jenkins) Run Completed with:
|
@scrawfor99 can you take care of the conflicts and the above comment? |
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@owaiskazi19 should be all set! |
Gradle Check (Jenkins) Run Completed with:
|
@scrawfor99 the changes in CHANGELOG are still under |
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Gradle Check (Jenkins) Run Completed with:
|
The backport to
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-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8576-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 11f46994a6a0e4fa510fb878891446ccb007fbf4
# Push it to GitHub
git push --set-upstream origin backport/backport-8576-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
@scrawfor99 can you backport this to 2.x? |
…-project#8576) * Bump schema validator Signed-off-by: Stephen Crawford <steecraw@amazon.com> * update Json smart Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Manually retry Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Remove unneeded comment to trigger rerun Signed-off-by: Stephen Crawford <steecraw@amazon.com> * MOve line Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> --------- Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
…-project#8576) * Bump schema validator Signed-off-by: Stephen Crawford <steecraw@amazon.com> * update Json smart Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Manually retry Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Remove unneeded comment to trigger rerun Signed-off-by: Stephen Crawford <steecraw@amazon.com> * MOve line Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> --------- Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
…-project#8576) * Bump schema validator Signed-off-by: Stephen Crawford <steecraw@amazon.com> * update Json smart Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Manually retry Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Remove unneeded comment to trigger rerun Signed-off-by: Stephen Crawford <steecraw@amazon.com> * MOve line Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> --------- Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
…-project#8576) * Bump schema validator Signed-off-by: Stephen Crawford <steecraw@amazon.com> * update Json smart Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Manually retry Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Remove unneeded comment to trigger rerun Signed-off-by: Stephen Crawford <steecraw@amazon.com> * MOve line Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> --------- Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Signed-off-by: sahil buddharaju <sahilbud@amazon.com>
…-project#8576) * Bump schema validator Signed-off-by: Stephen Crawford <steecraw@amazon.com> * update Json smart Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Manually retry Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Remove unneeded comment to trigger rerun Signed-off-by: Stephen Crawford <steecraw@amazon.com> * MOve line Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> --------- Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
…-project#8576) * Bump schema validator Signed-off-by: Stephen Crawford <steecraw@amazon.com> * update Json smart Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Manually retry Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Remove unneeded comment to trigger rerun Signed-off-by: Stephen Crawford <steecraw@amazon.com> * MOve line Signed-off-by: Stephen Crawford <steecraw@amazon.com> * Update changelog Signed-off-by: Stephen Crawford <steecraw@amazon.com> --------- Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
Manually update net.minidev:json-smart from 2.4.11 to 2.5.0 since #8569 failed.
Check List
New functionality includes testing.All tests passNew functionality has been documented.New functionality has javadoc addedBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.