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

Using jackson and jackson_databind version defined in OpenSearch #1169

Merged
merged 2 commits into from
Dec 14, 2022

Conversation

penghuo
Copy link
Collaborator

@penghuo penghuo commented Dec 13, 2022

Signed-off-by: Peng Huo penghuo@gmail.com

Description

Using jackson and jackson_databind version defined in OpenSearch. SQL plugins's jackson depedency will automatically allign with OpenSearch core then.

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.

Signed-off-by: Peng Huo <penghuo@gmail.com>
dai-chen
dai-chen previously approved these changes Dec 14, 2022
Copy link
Collaborator

@dai-chen dai-chen 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 the changes!

@dai-chen dai-chen added the dependencies Pull requests that update a dependency file label Dec 14, 2022
build.gradle Outdated
apply plugin: 'opensearch.java'
// versions https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
ext {
jackson_version = versions.jackson
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 conform to the same version name convention ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I did not get it. do you mean using version.jackson directly?

Copy link
Member

Choose a reason for hiding this comment

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

yes 👍

joshuali925
joshuali925 previously approved these changes Dec 14, 2022
Signed-off-by: Peng Huo <penghuo@gmail.com>
@penghuo penghuo dismissed stale reviews from joshuali925 and dai-chen via cb6850c December 14, 2022 17:39
@codecov-commenter
Copy link

Codecov Report

Merging #1169 (cb6850c) into main (034027c) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1169   +/-   ##
=========================================
  Coverage     95.81%   95.81%           
  Complexity     3521     3521           
=========================================
  Files           352      352           
  Lines          9359     9359           
  Branches        673      673           
=========================================
  Hits           8967     8967           
  Misses          334      334           
  Partials         58       58           
Flag Coverage Δ
query-workbench 62.76% <ø> (ø)
sql-engine 98.31% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@penghuo penghuo merged commit 5073215 into opensearch-project:main Dec 14, 2022
@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-1169-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5073215f813bad5fdad0d5d37a20c7cb100296fd
# Push it to GitHub
git push --set-upstream origin backport/backport-1169-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-1169-to-1.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-1169-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5073215f813bad5fdad0d5d37a20c7cb100296fd
# Push it to GitHub
git push --set-upstream origin backport/backport-1169-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-1169-to-1.3.

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 14, 2022
Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

joshuali925 pushed a commit that referenced this pull request Dec 14, 2022
…) (#1173)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)

Co-authored-by: Peng Huo <penghuo@gmail.com>
penghuo added a commit to penghuo/os-sql that referenced this pull request Dec 15, 2022
…nsearch-project#1169)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
penghuo added a commit to penghuo/os-sql that referenced this pull request Dec 15, 2022
…nsearch-project#1169)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
penghuo added a commit that referenced this pull request Dec 15, 2022
…) (#1178)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
penghuo added a commit that referenced this pull request Dec 15, 2022
…) (#1179)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
penghuo added a commit to penghuo/os-sql that referenced this pull request Dec 16, 2022
penghuo added a commit to penghuo/os-sql that referenced this pull request Dec 16, 2022
penghuo added a commit to penghuo/os-sql that referenced this pull request Dec 16, 2022
penghuo added a commit to penghuo/os-sql that referenced this pull request Dec 16, 2022
penghuo added a commit that referenced this pull request Dec 16, 2022
…) (#1178) (#1185)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
penghuo added a commit that referenced this pull request Dec 16, 2022
…) (#1178) (#1186)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
penghuo added a commit that referenced this pull request Dec 16, 2022
…) (#1178) (#1184)

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 5073215)
@penghuo penghuo deleted the hp/main/jackson branch December 16, 2022 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants