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.

Sign up for GitHub

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

Jump to bottom

[Backport 2.x] Bump protobuf-java to 3.21.8 #5005

Merged
merged 3 commits into from
Nov 1, 2022
Merged

[Backport 2.x] Bump protobuf-java to 3.21.8 #5005

merged 3 commits into from
Nov 1, 2022

Conversation

VachaShah
Copy link
Collaborator

Description

Backport #4886 to 2.x

Issues Resolved

[List any issues this PR will resolve]

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.

@dependabot @VachaShah
Bump protobuf-java from 3.21.7 to 3.21.8 in /test/fixtures/hdfs-fixtu…
025d045 
…re (opensearch-project#4886)

* Bump protobuf-java from 3.21.7 to 3.21.8 in /test/fixtures/hdfs-fixture

Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.21.7 to 3.21.8.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](protocolbuffers/protobuf@v3.21.7...v3.21.8)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
@VachaShah VachaShah requested review from a team and reta as code owners November 1, 2022 02:13
@VachaShah
Update CHANGELOG
58391d4 
Signed-off-by: Vacha Shah <[email protected]>
@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

dblock
dblock reviewed Nov 1, 2022
View reviewed changes
CHANGELOG.md Outdated
@@ -40,6 +40,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Update Apache Lucene to 9.4.1 ([#4922](https://github.com/opensearch-project/OpenSearch/pull/4922))
- Bump `woodstox-core` to 6.4.0 ([#4951](https://github.com/opensearch-project/OpenSearch/pull/4951))
- Upgrade jetty-http, kotlin-stdlib and snakeyaml ([#4982](https://github.com/opensearch-project/OpenSearch/pull/4982))
- Bump protobuf-java to 3.21.8 ([#5005](https://github.com/opensearch-project/OpenSearch/pull/5005))
Copy link
Member

Choose a reason for hiding this comment

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

If I understand correctly this should be in the 2.x section? @kotwanikunal?

Copy link
Member

Choose a reason for hiding this comment

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

Yes!

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Moved, thank you!

@VachaShah
Updating changelog
55a4abd 
Signed-off-by: Vacha Shah <[email protected]>
@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Collaborator Author

Gradle Check (Jenkins) Run Completed with:

Failing tests for version assertions, an example:

org.opensearch.test.VersionUtilsTests.testResolveReleasedVersionsForUnreleasedStableBranch

java.lang.AssertionError: 
Expected: <[2.0.0, 3.0.0, 3.0.1]>
     but: was <[2.0.0, 3.0.0, 3.0.1, 3.0.2, 3.1.0]>
	at __randomizedtesting.SeedInfo.seed([360B543EE03021EF:287365EFC398C638]:0)

@github-actions
Copy link
Contributor

github-actions bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@VachaShah VachaShah requested a review from andrross November 1, 2022 21:19
@andrross andrross merged commit 12d9175 into opensearch-project:2.x Nov 1, 2022
@VachaShah VachaShah added the backport 2.4 Backport to 2.4 branch label Nov 1, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 1, 2022
@VachaShah @github-actions
[Backport 2.x] Bump protobuf-java to 3.21.8 (#5005)
41f0320 
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.21.7 to 3.21.8.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](protocolbuffers/protobuf@v3.21.7...v3.21.8)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 12d9175)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Nov 1, 2022
Merged
andrross pushed a commit that referenced this pull request Nov 1, 2022
@opensearch-trigger-bot @VachaShah
[Backport 2.x] Bump protobuf-java to 3.21.8 (#5005) (#5029)
1828cb2 
Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.21.7 to 3.21.8.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](protocolbuffers/protobuf@v3.21.7...v3.21.8)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 12d9175)

Co-authored-by: Vacha Shah <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrross andrross andrross approved these changes

@reta reta Awaiting requested review from reta reta is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

Assignees
No one assigned
Labels
backport 2.4 Backport to 2.4 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@VachaShah @dblock @andrross @kotwanikunal