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

Bumps 'jackson' from 2.14.2 to 2.15.2 #537

Merged
merged 1 commit into from
Jun 26, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Jun 22, 2023

Description

Bumps 'jackson' from 4.14.2 to 4.15.2

Issues Resolved

N/A

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.

@reta reta added dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Jun 22, 2023
CHANGELOG.md Outdated
@@ -30,6 +30,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Add support for knn_vector field type ([#529](https://github.com/opensearch-project/opensearch-java/pull/524))

### Dependencies
- Bumps `jackson` from 4.14.2 to 4.15.2 ((#537)[https://github.com/opensearch-project/opensearch-java/pull/537])
Copy link
Collaborator

Choose a reason for hiding this comment

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

Typo here, should be 2.x.x (same in PR title):

Suggested change
- Bumps `jackson` from 4.14.2 to 4.15.2 ((#537)[https://github.com/opensearch-project/opensearch-java/pull/537])
- Bumps `jackson` from 2.14.2 to 2.15.2 ((#537)[https://github.com/opensearch-project/opensearch-java/pull/537])

@reta reta force-pushed the jackson.2.15.2 branch from 9ace611 to 4baf5cb Compare June 23, 2023 12:28
@reta reta changed the title Bumps 'jackson' from 4.14.2 to 4.15.2 Bumps 'jackson' from 2.14.2 to 2.15.2 Jun 24, 2023
@dblock dblock merged commit f606949 into opensearch-project:main Jun 26, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Jun 27, 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-537-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f606949b3ed4380dc31494855f197ac911554706
# Push it to GitHub
git push --set-upstream origin backport/backport-537-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-537-to-2.x.

reta added a commit to reta/opensearch-java that referenced this pull request Jun 27, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit f606949)
dblock pushed a commit that referenced this pull request Jun 27, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit f606949)
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 dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants