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

Bump guava version to 32.1.3 #3300

Merged
merged 1 commit into from
Dec 28, 2024

Conversation

junqiu-lei
Copy link
Member

@junqiu-lei junqiu-lei commented Dec 27, 2024

Description

Bump guava version to 32.1.3 to resolve version conflicts in neural search plugin to compile ml-commons plugin.

| Caused by: java.lang.IllegalStateException: jar hell!
| class: com.google.common.annotations.Beta
| jar1: /local/home/junqiu/dev/neural-search/build/testclusters/integTest-0/distro/3.0.0-ARCHIVE/plugins/opensearch-ml/guava-32.1.2-jre.jar
| jar2: /local/home/junqiu/dev/neural-search/build/testclusters/integTest-0/distro/3.0.0-ARCHIVE/plugins/opensearch-knn/guava-32.1.3-jre.jar
|       at org.opensearch.bootstrap.JarHell.checkClass(JarHell.java:316)
|       at org.opensearch.bootstrap.JarHell.checkJarHell(JarHell.java:215)
|       at org.opensearch.plugins.PluginsService.checkBundleJarHell(PluginsService.java:675)
|       ... 11 more

Related Issues

opensearch-project/neural-search#480

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.

@jngz-es
Copy link
Collaborator

jngz-es commented Dec 27, 2024

Thanks @junqiu-lei , could you also help bump the version in ml-algorithms,

implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
?

@dhrubo-os
Copy link
Collaborator

Thanks @junqiu-lei , could you also help bump the version in ml-algorithms,

implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'

?

+1

@junqiu-lei junqiu-lei temporarily deployed to ml-commons-cicd-env-require-approval December 27, 2024 20:39 — with GitHub Actions Inactive
Signed-off-by: Junqiu Lei <junqiu@amazon.com>
@junqiu-lei junqiu-lei temporarily deployed to ml-commons-cicd-env-require-approval December 27, 2024 20:52 — with GitHub Actions Inactive
@junqiu-lei junqiu-lei had a problem deploying to ml-commons-cicd-env-require-approval December 27, 2024 20:52 — with GitHub Actions Failure
@junqiu-lei
Copy link
Member Author

Thanks @junqiu-lei , could you also help bump the version in ml-algorithms,

implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'

?

Yes, just updated PR.

@junqiu-lei junqiu-lei temporarily deployed to ml-commons-cicd-env-require-approval December 27, 2024 21:36 — with GitHub Actions Inactive
@junqiu-lei junqiu-lei temporarily deployed to ml-commons-cicd-env-require-approval December 27, 2024 23:31 — with GitHub Actions Inactive
@dhrubo-os dhrubo-os merged commit ff85b12 into opensearch-project:main Dec 28, 2024
9 checks passed
@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-3300-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ff85b120db2af4ea6424ee419cbd86a0729daac7
# Push it to GitHub
git push --set-upstream origin backport/backport-3300-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-3300-to-2.x.

@dhrubo-os
Copy link
Collaborator

@junqiu-lei could you please raise a backport PR for this?

junqiu-lei added a commit to junqiu-lei/ml-commons that referenced this pull request Dec 30, 2024
Signed-off-by: Junqiu Lei <junqiu@amazon.com>

(cherry picked from commit ff85b12)
Signed-off-by: Junqiu Lei <junqiu@amazon.com>
@junqiu-lei
Copy link
Member Author

@junqiu-lei could you please raise a backport PR for this?

Hi @dhrubo-os, the backport PR is raised at #3302, could you please help review? Thanks!

dhrubo-os pushed a commit that referenced this pull request Dec 31, 2024
(cherry picked from commit ff85b12)

Signed-off-by: Junqiu Lei <junqiu@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.

3 participants