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

Remove jackson-databind and jackson-annotations now coming from core #349

Merged
merged 1 commit into from
Dec 29, 2022

Conversation

dzane17
Copy link
Contributor

@dzane17 dzane17 commented Dec 28, 2022

Signed-off-by: David Zane davizane@amazon.com

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
Fixes #344

Describe the solution you are proposing
Remove direct jackson-databind and jackson-annotations direct dependency in PA.
Also pick Jackson versions from OpenSearch props file https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties

Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

Additional context
Add any other context or screenshots about the feature request here.

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

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: David Zane <davizane@amazon.com>
@dzane17
Copy link
Contributor Author

dzane17 commented Dec 28, 2022

WhiteSource Security Check failing due to bad Netty version. I will fix that in a separate PR

@codecov-commenter
Copy link

Codecov Report

Merging #349 (6d21cb1) into main (3ab57eb) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #349   +/-   ##
=========================================
  Coverage     70.82%   70.82%           
  Complexity      372      372           
=========================================
  Files            44       44           
  Lines          2581     2581           
  Branches        174      174           
=========================================
  Hits           1828     1828           
  Misses          641      641           
  Partials        112      112           

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

@dzane17 dzane17 marked this pull request as ready for review December 28, 2022 21:41
@dzane17 dzane17 requested a review from a team December 28, 2022 21:41
@dzane17 dzane17 merged commit b8d3a4c into main Dec 29, 2022
@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-349-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b8d3a4c996788c832355d17a074c14b8e733e52c
# Push it to GitHub
git push --set-upstream origin backport/backport-349-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-349-to-2.x.

@dzane17 dzane17 deleted the feature/jackson branch December 29, 2022 00:40
dzane17 added a commit that referenced this pull request Dec 29, 2022
…349)

Signed-off-by: David Zane <davizane@amazon.com>
(cherry picked from commit b8d3a4c)
dzane17 added a commit that referenced this pull request Dec 29, 2022
…349) (#351)

Signed-off-by: David Zane <davizane@amazon.com>
(cherry picked from commit b8d3a4c)
dzane17 added a commit that referenced this pull request Jan 5, 2023
ryanbogan added a commit to ryanbogan/performance-analyzer that referenced this pull request Jan 10, 2023
@kiranprakash154 kiranprakash154 restored the feature/jackson branch January 10, 2023 23:53
kiranprakash154 pushed a commit to kiranprakash154/performance-analyzer that referenced this pull request Jan 11, 2023
@kiranprakash154 kiranprakash154 deleted the feature/jackson branch January 11, 2023 00:57
kiranprakash154 added a commit that referenced this pull request Jan 11, 2023
…ore' (#369)

* Revert 'Remove jackson-databind and jackson-annotations now coming from core (#349)'

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* update licenses

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* update licenses

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Kiran Prakash <awskiran@amazon.com>
Co-authored-by: Ryan Bogan <rbogan@amazon.com>
kaushalmahi12 pushed a commit to kaushalmahi12/performance-analyzer that referenced this pull request Jan 18, 2023
kaushalmahi12 pushed a commit to kaushalmahi12/performance-analyzer that referenced this pull request Jan 18, 2023
…ore' (opensearch-project#369)

* Revert 'Remove jackson-databind and jackson-annotations now coming from core (opensearch-project#349)'

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* update licenses

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* update licenses

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Kiran Prakash <awskiran@amazon.com>
Co-authored-by: Ryan Bogan <rbogan@amazon.com>
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.

Remove jackson-databind and jackson-annotations dependencies now coming from core
4 participants