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

chore: Override the version of protobuf-bom to 4.28.3 in libraries-bom. #6836

Merged
merged 3 commits into from
Oct 31, 2024
Merged

chore: Override the version of protobuf-bom to 4.28.3 in libraries-bom. #6836

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7f5101
chore: Override the version of protobuf-bom to 4.28.3 in libraries-bom.
blakeli0 Oct 29, 2024
df57b82
chore: Address comments.
blakeli0 Oct 30, 2024
37fb772
chore: Address comments.
blakeli0 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries-bom-protobuf3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom-protobuf3</artifactId>
<version>0.2.0-SNAPSHOT</version><!-- {x-version-update:libraries-bom-protobuf3:current} -->
<version>26.50.0-SNAPSHOT</version><!-- {x-version-update:libraries-bom-protobuf3:current} -->
<packaging>pom</packaging>

<parent>
Expand Down
11 changes: 11 additions & 0 deletions libraries-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@

<dependencyManagement>
<dependencies>
<!-- This section overrides the protobuf version specified in first-party-dependencies. This is to provide customers a bom that includes protobuf-java 4.x.
We will upgrade protobuf-bom in first-party-dependencies once we feel comfortable that most customers would not have conflict with protobuf-java 4.x.
This section has to be specified before first-party-dependencies, please do not move it. -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>4.28.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- first-party-dependencies is part of java-shared-dependencies
BOM in https://github.com/googleapis/sdk-platform-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml.
This includes Guava, Protobuf, gRPC, Google Auth Libraries, etc. -->
Expand Down
3 changes: 3 additions & 0 deletions release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ private void printKeyCoreLibraryDependencies(Bom bom) {
.append("- Google Cloud Core: ")
.append(versionlessCoordinatesToVersion.get("com.google.cloud:google-cloud-core"))
.append("\n");
report
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was considering adding a unit test for it, but looks like we don't have any for this Core Library Dependencies section.

.append("If you encounter compatibility issues with protobuf-java 4.x, please update your codebase and dependencies to ensure compatibility. If this is not feasible, you may use libraries-bom-protobuf3 as a workaround. This option utilizes protobuf-java 3.x and provides the same client libraries as libraries-bom.")
blakeli0 marked this conversation as resolved.
Show resolved Hide resolved
.append("\n");
}

private void printApiReferenceLink() {
Expand Down
6 changes: 6 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
"^com.fasterxml.jackson.core"
],
"groupName": "jackson dependencies"
},
{
"matchPackagePatterns": [
"^com.google.protobuf:"
],
"enabled": false
}
],
"semanticCommits": "enabled",
Expand Down
2 changes: 1 addition & 1 deletion versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

google-cloud-bom:0.230.0:0.231.0-SNAPSHOT
libraries-bom:26.49.0:26.50.0-SNAPSHOT
libraries-bom-protobuf3:0.1.0:0.2.0-SNAPSHOT
libraries-bom-protobuf3:26.49.0:26.50.0-SNAPSHOT
blakeli0 marked this conversation as resolved.
Show resolved Hide resolved
java-cloud-bom-tests:0.45.0:0.46.0-SNAPSHOT
full-convergence-check:0.48.0:0.49.0-SNAPSHOT
Loading