Bump org.codehaus.jettison:jettison to 1.5.4#6878
Bump org.codehaus.jettison:jettison to 1.5.4#6878kotwanikunal merged 1 commit intoopensearch-project:mainfrom
Conversation
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
542782e to
f0cd8d1
Compare
Gradle Check (Jenkins) Run Completed with:
|
| - 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)) |
There was a problem hiding this comment.
Shouldn't we add this change in unreleased 3.x and then add it back here while backporting to 2.x?
There was a problem hiding this comment.
+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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
@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).
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-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.xThen, create a pull request where the |
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com> (cherry picked from commit ad059c7)
|
Backport: #6880 |
|
Fix for changelog divergence: #6882 |
Signed-off-by: Kunal Kotwani <kkotwani@amazon.com> Signed-off-by: Valentin Mitrofanov <mitrofmep@gmail.com>
Description
org.codehaus.jettison:jettisonto 1.5.4Issues Resolved
Check List
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.