-
Notifications
You must be signed in to change notification settings - Fork 24
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
Fix build #134
Fix build #134
Conversation
Build was broken due to changes in OpenSearch core project that we needed to handle. These changes include: 1. Gradle upgraded to 8.1 2. ImmutableOpenMap removed from OpenSearch core. 3. Jackson libs updated to 2.15.0 Signed-off-by: Michael Froh <[email protected]>
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## main #134 +/- ##
=========================================
Coverage 80.93% 80.93%
Complexity 215 215
=========================================
Files 29 29
Lines 881 881
Branches 120 120
=========================================
Hits 713 713
Misses 106 106
Partials 62 62 |
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From #133 "There are other incompatibilities in the build for Gradle 8, so 7.6.1 is the only option to keep a working build."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given that the build passes on this PR, what are the other incompatibilities? The linked issue doesn't explain why we can't use 8.1, like OpenSearch core.
I will try removing the Jackson dependencies altogether though. If we can just pick them up transitively, that should save us time in the long run.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm.... nope. I was able to remove jackson-core and have it compile, but if I remove either of jackson-databind or jackson-annotations, the build fails.
As suggested by @dbwiddis on opensearch-project#132 Signed-off-by: Michael Froh <[email protected]>
The backport to
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-134-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3704821ce373516f9da18e07deec6e22360918e9
# Push it to GitHub
git push --set-upstream origin backport/backport-134-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 |
* cherry pick 3704821 (#159) Signed-off-by: Mingshi Liu <[email protected]> (cherry picked from commit c16baf0) * revert the change for ImmutableOpenMap Signed-off-by: Mingshi Liu <[email protected]> --------- Signed-off-by: Mingshi Liu <[email protected]> Co-authored-by: Mingshi Liu <[email protected]> Co-authored-by: Mingshi Liu <[email protected]>
Build was broken due to changes in OpenSearch core project that we needed to handle.
These changes include:
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.