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

Manually bump net.minidev:json-smart from 2.4.11 to 2.5.0 #8576

Merged
merged 10 commits into from Jul 11, 2023

Conversation

scrawfor99
Copy link
Contributor

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 pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By 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.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: null ❌
  • URL: null
  • CommitID: 001b7b7
    Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green.
    Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@scrawfor99
Copy link
Contributor Author

Failure seems like a flaky result from Jenkins--will manually trigger retry but pushing text change.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Jul 10, 2023

Codecov Report

Merging #8576 (f70fee8) into main (397069f) will increase coverage by 0.05%.
The diff coverage is n/a.

@@             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     

see 468 files with indirect coverage changes

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

CHANGELOG.md Outdated Show resolved Hide resolved
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@owaiskazi19
Copy link
Member

owaiskazi19 commented Jul 10, 2023

@scrawfor99 can you take care of the conflicts and the above comment?

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@scrawfor99
Copy link
Contributor Author

@owaiskazi19 should be all set!

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testPitCreatedOnReplica

@owaiskazi19
Copy link
Member

owaiskazi19 commented Jul 10, 2023

@owaiskazi19 should be all set!

@scrawfor99 the changes in CHANGELOG are still under Unreleased 3.0. We have included it in under 2.x here. Let's do the same in this PR as well.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testPitCreatedOnReplica
      1 org.opensearch.remotestore.CreateRemoteIndexIT.testRemoteStoreOverrideTranslogRepoCorrectly
      1 org.opensearch.remotestore.CreateRemoteIndexIT.classMethod
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

@owaiskazi19 owaiskazi19 merged commit 11f4699 into opensearch-project:main Jul 11, 2023
9 checks passed
@owaiskazi19 owaiskazi19 added the backport 2.x Backport to 2.x branch label Jul 11, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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 base branch is 2.x and the compare/head branch is backport/backport-8576-to-2.x.

@owaiskazi19
Copy link
Member

@scrawfor99 can you backport this to 2.x?

vikasvb90 pushed a commit to raghuvanshraj/OpenSearch that referenced this pull request Jul 12, 2023
…-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>
raghuvanshraj pushed a commit to raghuvanshraj/OpenSearch that referenced this pull request Jul 12, 2023
…-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>
dzane17 pushed a commit to dzane17/OpenSearch that referenced this pull request Jul 12, 2023
…-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>
buddharajusahil pushed a commit to buddharajusahil/OpenSearch that referenced this pull request Jul 18, 2023
…-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>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…-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>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…-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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants