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 org.apache.avro:avro from 1.11.3 to 1.12.0 in /plugins/repository-hdfs #15119

Merged
merged 2 commits into from
Aug 5, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Aug 5, 2024

Description

Bumps org.apache.avro:avro from 1.11.3 to 1.12.0.

Replacement for #15109 to fix failure in ./gradlew :plugins:repository-hdfs:thirdPartyAudit

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

…y-hdfs

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@reta reta added the backport 2.x Backport to 2.x branch label Aug 5, 2024
Copy link
Contributor

github-actions bot commented Aug 5, 2024

❕ Gradle check result for 9342b8f: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testDownloadStatsCorrectnessSinglePrimarySingleReplica

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link
Contributor

github-actions bot commented Aug 5, 2024

❕ Gradle check result for 15530aa: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Aug 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.80%. Comparing base (b911b6f) to head (15530aa).
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main   #15119   +/-   ##
=========================================
  Coverage     71.80%   71.80%           
- Complexity    62775    62838   +63     
=========================================
  Files          5169     5169           
  Lines        294665   294664    -1     
  Branches      42616    42615    -1     
=========================================
+ Hits         211574   211588   +14     
- Misses        65678    65732   +54     
+ Partials      17413    17344   -69     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta reta merged commit 49b7cd4 into opensearch-project:main Aug 5, 2024
37 of 38 checks passed
@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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-15119-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 49b7cd47b0f0112ca21d1ea3952106f28f8253bb
# Push it to GitHub
git push --set-upstream origin backport/backport-15119-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-15119-to-2.x.

@reta
Copy link
Collaborator

reta commented Aug 5, 2024

@cwperks mind please backport manually? thank you!

cwperks added a commit to cwperks/OpenSearch that referenced this pull request Aug 6, 2024
…y-hdfs (opensearch-project#15119)

* Bump org.apache.avro:avro from 1.11.3 to 1.12.0 in /plugins/repository-hdfs

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 49b7cd4)
@cwperks
Copy link
Member Author

cwperks commented Aug 6, 2024

Raised a manual backport: #15121

reta pushed a commit that referenced this pull request Aug 6, 2024
…y-hdfs (#15119) (#15121)

* Bump org.apache.avro:avro from 1.11.3 to 1.12.0 in /plugins/repository-hdfs

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 49b7cd4)
harshavamsi pushed a commit to harshavamsi/OpenSearch that referenced this pull request Aug 20, 2024
…y-hdfs (opensearch-project#15119)

* Bump org.apache.avro:avro from 1.11.3 to 1.12.0 in /plugins/repository-hdfs

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
…y-hdfs (opensearch-project#15119)

* Bump org.apache.avro:avro from 1.11.3 to 1.12.0 in /plugins/repository-hdfs

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
…y-hdfs (opensearch-project#15119)

* Bump org.apache.avro:avro from 1.11.3 to 1.12.0 in /plugins/repository-hdfs

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@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 backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants