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

Update all guava #8107

Merged
merged 7 commits into from
Jun 16, 2023
Merged

Update all guava #8107

merged 7 commits into from
Jun 16, 2023

Conversation

stephen-crawford
Copy link
Contributor

Description

When trying to resolve the dependencies for the gcs plugin, I noticed that in some places, we used the older Guava version. We can see here that everything before 32.0.1-jre has a vulnerability: https://mvnrepository.com/artifact/com.google.guava/guava.

Updating elsewhere just to be safe.

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.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@reta
Copy link
Collaborator

reta commented Jun 16, 2023

Thanks a lot @scrawfor99 !

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@stephen-crawford
Copy link
Contributor Author

Thanks a lot @scrawfor99 !

No problem :)

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchTaskCancellationWithHighCpu
      1 org.opensearch.indices.replication.SegmentReplicationIT.testReplicationPostDeleteAndForceMerge

@codecov
Copy link

codecov bot commented Jun 16, 2023

Codecov Report

Merging #8107 (9251c7e) into main (0b775e7) will increase coverage by 0.07%.
The diff coverage is 100.00%.

❗ Current head 9251c7e differs from pull request most recent head cc4c308. Consider uploading reports for the commit cc4c308 to get more accurate results

@@             Coverage Diff              @@
##               main    #8107      +/-   ##
============================================
+ Coverage     70.92%   71.00%   +0.07%     
- Complexity    56664    56723      +59     
============================================
  Files          4722     4722              
  Lines        267604   267604              
  Branches      39214    39214              
============================================
+ Hits         189803   190017     +214     
+ Misses        61826    61585     -241     
- Partials      15975    16002      +27     
Impacted Files Coverage Δ
...n/src/main/java/org/opensearch/common/Classes.java 66.66% <ø> (ø)
.../src/main/java/org/opensearch/common/Explicit.java 63.63% <ø> (ø)
...rch/common/ExponentiallyWeightedMovingAverage.java 100.00% <ø> (ø)
...in/java/org/opensearch/common/LocalTimeOffset.java 87.75% <ø> (ø)
...java/org/opensearch/common/MacAddressProvider.java 40.62% <ø> (ø)
...main/java/org/opensearch/common/NamedRegistry.java 100.00% <ø> (ø)
...rg/opensearch/common/RandomBasedUUIDGenerator.java 100.00% <ø> (ø)
...java/org/opensearch/common/SecureRandomHolder.java 50.00% <ø> (ø)
...src/main/java/org/opensearch/common/StopWatch.java 48.33% <ø> (ø)
.../org/opensearch/common/TimeBasedUUIDGenerator.java 84.37% <ø> (ø)
... and 141 more

... and 452 files with indirect coverage changes

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchTaskCancellationWithHighCpu

Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

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

Thanks for this @scrawfor99!

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit a31e159 into opensearch-project:main Jun 16, 2023
@reta reta added dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch labels Jun 16, 2023
@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:

# 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
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8107-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a31e159ad9965536e9f0a8ffce0f3d50243705a8
# Push it to GitHub
git push --set-upstream origin backport/backport-8107-to-2.x
# Go back to the original working tree
popd
# 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-8107-to-2.x.

@reta
Copy link
Collaborator

reta commented Jun 16, 2023

@scrawfor99 mind please backport manually? thank you

kartg pushed a commit that referenced this pull request Jun 16, 2023
* Backport guava

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* fix exclusions

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 26, 2023
…pensearch-project#8114)

* Backport guava

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* fix exclusions

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jun 27, 2023
* Update all guava

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* changelog

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* remove ignors

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix ignores

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update plugins/repository-gcs/build.gradle

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update plugins/repository-azure/build.gradle

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
* Update all guava

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* changelog

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* remove ignors

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Fix ignores

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update plugins/repository-gcs/build.gradle

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

* Update plugins/repository-azure/build.gradle

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Co-authored-by: Andriy Redko <drreta@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.

4 participants