Skip to content

Conversation

@dai-chen
Copy link
Collaborator

@dai-chen dai-chen commented Aug 11, 2022

Description

Bump Jackson dependency version and extract hardcoding version number to root Gradle script. Will back port this to 1.3 branch after merged.

Verify all Jackson dependencies upgraded to latest 2.13.3:

$ ./gradlew clean
$ ./gradlew assemble
$ unzip -l plugin/build/distributions/opensearch-sql-2.2.0.0-SNAPSHOT.zip | grep -E 'spring|jackson'
  1275108  08-04-2022 11:08   spring-context-5.3.22.jar
   382963  08-04-2022 11:08   spring-aop-5.3.22.jar
   699011  08-04-2022 11:08   spring-beans-5.3.22.jar
    75714  07-19-2022 13:34   jackson-annotations-2.13.3.jar
  1536542  07-19-2022 13:34   jackson-databind-2.13.3.jar
   289392  08-04-2022 11:08   spring-expression-5.3.22.jar
  1486059  08-04-2022 11:08   spring-core-5.3.22.jar
    24436  08-04-2022 11:08   spring-jcl-5.3.22.jar

Note that SQL JDBC only has one dependency and has no access to root script, so change the version in place.

Issues Resolved

N/A

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

@dai-chen dai-chen added the dependencies Pull requests that update a dependency file label Aug 11, 2022
@dai-chen dai-chen self-assigned this Aug 11, 2022
@dai-chen dai-chen marked this pull request as ready for review August 11, 2022 18:29
@dai-chen dai-chen requested a review from a team as a code owner August 11, 2022 18:29
Copy link
Member

@vamsimanohar vamsimanohar left a comment

Choose a reason for hiding this comment

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

LGTM

@dai-chen dai-chen merged commit 6fb3fac into opensearch-project:main Aug 11, 2022
@dai-chen dai-chen deleted the bump-jackson-version branch August 11, 2022 19:33
@dai-chen dai-chen mentioned this pull request Aug 12, 2022
6 tasks
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

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

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-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-745-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6fb3fac98f5917d13eb5cb37e10acc009f1cbee4
# Push it to GitHub
git push --set-upstream origin backport/backport-745-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-745-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-745-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6fb3fac98f5917d13eb5cb37e10acc009f1cbee4
# Push it to GitHub
git push --set-upstream origin backport/backport-745-to-2.x
# Go back to the original working tree
cd ../..
# 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-745-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-745-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6fb3fac98f5917d13eb5cb37e10acc009f1cbee4
# Push it to GitHub
git push --set-upstream origin backport/backport-745-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-745-to-1.3.

@Yury-Fridlyand Yury-Fridlyand mentioned this pull request Nov 1, 2022
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 1.x backport 1.3 backport 2.x dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants