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 com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli #8527

Merged
merged 2 commits into from
Jul 7, 2023

Conversation

owaiskazi19
Copy link
Member

@owaiskazi19 owaiskazi19 commented Jul 7, 2023

Handled #8402 here by setting transitive dependencies as false.

Description

Bumps com.google.guava:guava from 32.0.1-jre to 32.1.1-jre.

guava 32.1.1-jre brings up 4.11.0 of mockito-core as a transitive dependency: https://mvnrepository.com/artifact/com.google.guava/guava-parent/32.1.1-jre whereas OpenSearch is having 5.4.0 of mockito.


* What went wrong:
Could not determine the dependencies of task ':distribution:tools:plugin-cli:forbiddenApisTest'.
> Could not resolve all task dependencies for configuration ':distribution:tools:plugin-cli:testRuntimeClasspath'.
   > Conflict(s) found for the following module(s):
       - org.mockito:mockito-core between versions 5.4.0 and 4.11.0
     Run with:
         --scan or
         :distribution:tools:plugin-cli:dependencyInsight --configuration testRuntimeClasspath --dependency org.mockito:mockito-core
     to get more insight on how to solve the conflict.

Related Issues

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

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

…ution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jul 7, 2023

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jul 7, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Jul 7, 2023

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit e0e60ee into opensearch-project:main Jul 7, 2023
@reta reta added dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch labels Jul 7, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 7, 2023
…ution/tools/upgrade-cli (#8527)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Disabled transitive dependencies for test

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
(cherry picked from commit e0e60ee)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit that referenced this pull request Jul 7, 2023
…ution/tools/upgrade-cli (#8527) (#8530)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli



* Disabled transitive dependencies for test



---------


(cherry picked from commit e0e60ee)

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
vikasvb90 pushed a commit to raghuvanshraj/OpenSearch that referenced this pull request Jul 12, 2023
…ution/tools/upgrade-cli (opensearch-project#8527)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Disabled transitive dependencies for test

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
raghuvanshraj pushed a commit to raghuvanshraj/OpenSearch that referenced this pull request Jul 12, 2023
…ution/tools/upgrade-cli (opensearch-project#8527)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Disabled transitive dependencies for test

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
dzane17 pushed a commit to dzane17/OpenSearch that referenced this pull request Jul 12, 2023
…ution/tools/upgrade-cli (opensearch-project#8527)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Disabled transitive dependencies for test

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
buddharajusahil pushed a commit to buddharajusahil/OpenSearch that referenced this pull request Jul 18, 2023
…ution/tools/upgrade-cli (opensearch-project#8527)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Disabled transitive dependencies for test

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
Signed-off-by: sahil buddharaju <sahilbud@amazon.com>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…ution/tools/upgrade-cli (opensearch-project#8527)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Disabled transitive dependencies for test

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…ution/tools/upgrade-cli (opensearch-project#8527)

* Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Disabled transitive dependencies for test

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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 dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants