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.codehaus.jettison:jettison to 1.5.4 #6878

Merged
merged 1 commit into from
Mar 29, 2023

Conversation

kotwanikunal
Copy link
Member

Description

Issues Resolved

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: Kunal Kotwani <kkotwani@amazon.com>
@kotwanikunal kotwanikunal added the backport 2.x Backport to 2.x branch label Mar 29, 2023
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@@ -100,6 +100,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `com.google.protobuf:protobuf-java` from 3.22.0 to 3.22.2
- Bump Netty to 4.1.90.Final ([#6677](https://github.com/opensearch-project/OpenSearch/pull/6677)
- Bump `com.diffplug.spotless` from 6.15.0 to 6.17.0
- Bump `org.codehaus.jettison:jettison` from 1.5.3 to 1.5.4 ([#6878](https://github.com/opensearch-project/OpenSearch/pull/6878))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we add this change in unreleased 3.x and then add it back here while backporting to 2.x?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, just remove this here, add skip-changelog and add this line on the 2.x backport. We really should fix this changelog process to be easier.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The process ideally is, if you know it has to be backported to x.x, add it to the Unreleased x.x version. That way, the automated backport flow does not fail.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nknize Added the reasoning above. This is also covered within https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#where-should-i-put-my-changelog-entry

Where should I put my CHANGELOG entry?
Please review the branching strategy document. The changelog on the main branch will contain sections for the next major and next minor releases. Your entry should go into the section it is intended to be released in. In practice, most changes to main will be backported to the next minor release so most entries will likely be in that section.

The following examples assume the next major release on main is 3.0, then next minor release is 2.5, and the current release is 2.4.

Add a new feature to release in next minor: Add a changelog entry to [Unreleased 2.x] on main, then backport to 2.x (including the changelog entry).

Copy link
Collaborator

@nknize nknize left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this... just fix the changelog craziness and let's merge since this is fixing the cascading whitesource failures.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.snapshots.SearchableSnapshotIT.testCacheFilesAreClosedAfterUse
      1 org.opensearch.search.basic.SearchWithRandomIOExceptionsIT.testRandomDirectoryIOExceptions
      1 org.opensearch.search.basic.SearchWithRandomIOExceptionsIT.classMethod
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

@kotwanikunal kotwanikunal merged commit ad059c7 into opensearch-project:main Mar 29, 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-6878-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ad059c75927df050058da233ba3788c2b887d6f0
# Push it to GitHub
git push --set-upstream origin backport/backport-6878-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-6878-to-2.x.

kotwanikunal added a commit to kotwanikunal/OpenSearch that referenced this pull request Mar 29, 2023
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
(cherry picked from commit ad059c7)
@kotwanikunal
Copy link
Member Author

Backport: #6880
Looks like the changelog has drifted causing the auto backport failure.
Raising a PR to fix that as well.

@kotwanikunal
Copy link
Member Author

Fix for changelog divergence: #6882

kotwanikunal added a commit that referenced this pull request Mar 29, 2023
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
(cherry picked from commit ad059c7)
mitrofmep pushed a commit to mitrofmep/OpenSearch that referenced this pull request Apr 5, 2023
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Signed-off-by: Valentin Mitrofanov <mitrofmep@gmail.com>
@kotwanikunal kotwanikunal deleted the jettison-upgrade branch July 12, 2023 19:55
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.

3 participants