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

Force tests jackson dependencies to 2.18 #911

Merged
merged 2 commits into from
Oct 10, 2024

Conversation

owaiskazi19
Copy link
Member

@owaiskazi19 owaiskazi19 commented Oct 9, 2024

Description

Coming from comment. Forced tests jackson dependencies to 2.18

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

Copy link

codecov bot commented Oct 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.07%. Comparing base (2f52b7e) to head (3e1b0a3).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main     #911   +/-   ##
=========================================
  Coverage     78.07%   78.07%           
  Complexity      995      995           
=========================================
  Files            99       99           
  Lines          4621     4621           
  Branches        431      431           
=========================================
  Hits           3608     3608           
  Misses          833      833           
  Partials        180      180           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

Please also see d3c8141 which I added to get backport #906 to compile

build.gradle Outdated Show resolved Hide resolved
Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

LGTM!

@dbwiddis dbwiddis merged commit 30966d6 into opensearch-project:main Oct 10, 2024
19 of 20 checks passed
@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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-911-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 30966d6be53a99e7af880d7a11603d57cdc98da7
# Push it to GitHub
git push --set-upstream origin backport/backport-911-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

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

@dbwiddis
Copy link
Member

@owaiskazi19 @junweid62 one of you should do this backport :)

@junweid62
Copy link
Contributor

Hey @owaiskazi19, could you help out with this backport? I’m currently tied up with bug fixing over on the Trineo side and might not have the time to dive deep into this right now. Thanks a lot in advance!

@owaiskazi19
Copy link
Member Author

Was already on it :) Here you go #912

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants