Skip to content

[Backport 1.x] Bump guava bump to 32.0.1-jre#8124

Merged
kartg merged 2 commits into
opensearch-project:1.xfrom
stephen-crawford:guava1.x
Jun 16, 2023
Merged

[Backport 1.x] Bump guava bump to 32.0.1-jre#8124
kartg merged 2 commits into
opensearch-project:1.xfrom
stephen-crawford:guava1.x

Conversation

@stephen-crawford
Copy link
Copy Markdown
Contributor

Description

Manually backports #8107 to 1.x

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>
@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

kartg
kartg previously approved these changes Jun 16, 2023
The update to ignoreViolations syncs this section with 2.x. This change also includes a minor correction to the changelog.

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
@kartg kartg dismissed their stale review June 16, 2023 22:48

Removing self-approval since I contributed to this PR

@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 16, 2023

Codecov Report

Merging #8124 (5c5320f) into 1.x (70aa15b) will decrease coverage by 0.04%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                1.x    #8124      +/-   ##
============================================
- Coverage     77.59%   77.56%   -0.04%     
+ Complexity    58775    58743      -32     
============================================
  Files          4223     4223              
  Lines        253545   253545              
  Branches      38714    38714              
============================================
- Hits         196743   196654      -89     
- Misses        40820    40861      +41     
- Partials      15982    16030      +48     

see 462 files with indirect coverage changes

@kartg kartg added the backport 1.3 Backport to 1.3 branch label Jun 16, 2023
@kotwanikunal kotwanikunal changed the title Manually backport guava bump to 32.0.1-jre [Backport 1.x] Bump guava bump to 32.0.1-jre Jun 16, 2023
@kartg kartg merged commit a191f3d into opensearch-project:1.x Jun 16, 2023
@kartg
Copy link
Copy Markdown
Member

kartg commented Jun 16, 2023

Looks like the failure was an old flaky test - #1957
Seems like the fix was backported to 1.x too - #2265

kartg added a commit to kartg/OpenSearch that referenced this pull request Jun 17, 2023
* Update guava

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

* update SHAs, and add ignoreViolations entries for ingest-attachment

The update to ignoreViolations syncs this section with 2.x. This change also includes a minor correction to the changelog.

Signed-off-by: Kartik Ganesh <gkart@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Kartik Ganesh <gkart@amazon.com>
Co-authored-by: Kartik Ganesh <gkart@amazon.com>
(cherry picked from commit a191f3d)
Signed-off-by: Kartik Ganesh <gkart@amazon.com>
kartg added a commit that referenced this pull request Jun 17, 2023
* Update guava
* update SHAs, and add ignoreViolations entries for ingest-attachment

The update to ignoreViolations syncs this section with 2.x. This change also includes a minor correction to the changelog.

---------

(cherry picked from commit a191f3d)

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Kartik Ganesh <gkart@amazon.com>
Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 1.3 Backport to 1.3 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants