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

Fix build #134

Merged
merged 2 commits into from
May 2, 2023
Merged

Fix build #134

merged 2 commits into from
May 2, 2023

Conversation

msfroh
Copy link
Collaborator

@msfroh msfroh commented May 2, 2023

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

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.

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-commenter
Copy link

codecov-commenter commented May 2, 2023

Codecov Report

Merging #134 (24d6c16) into main (095d367) will not change coverage.
The diff coverage is n/a.

📣 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           

@sejli sejli mentioned this pull request May 2, 2023
3 tasks
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
Copy link
Collaborator

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."

Copy link
Collaborator Author

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.

Copy link
Collaborator Author

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.

@macohen macohen mentioned this pull request May 2, 2023
1 task
As suggested by @dbwiddis on
opensearch-project#132

Signed-off-by: Michael Froh <[email protected]>
@noCharger noCharger merged commit 3704821 into opensearch-project:main May 2, 2023
@msfroh msfroh deleted the fix_build branch May 2, 2023 17:14
@mingshl mingshl added the backport 2.x Backport to 2.x branch label Jul 12, 2023
@opensearch-trigger-bot
Copy link

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-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 base branch is 2.x and the compare/head branch is backport/backport-134-to-2.x.

mingshl added a commit that referenced this pull request Jul 12, 2023
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants