diff --git a/libraries-bom-protobuf3/pom.xml b/libraries-bom-protobuf3/pom.xml index 83abcabc188e..6904ebbe90b0 100644 --- a/libraries-bom-protobuf3/pom.xml +++ b/libraries-bom-protobuf3/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud libraries-bom-protobuf3 - 0.2.0-SNAPSHOT + 26.50.0-SNAPSHOT pom diff --git a/libraries-bom/pom.xml b/libraries-bom/pom.xml index 7bb15da7e286..a0253c67bacb 100644 --- a/libraries-bom/pom.xml +++ b/libraries-bom/pom.xml @@ -59,6 +59,17 @@ + + + com.google.protobuf + protobuf-bom + 4.28.3 + pom + import + + diff --git a/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java b/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java index bd0b7aac2ca4..11ececf6f0fb 100644 --- a/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java +++ b/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java @@ -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 + .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, use libraries-bom-protobuf3 as a workaround. libraries-bom-protobuf3 includes the same client libraries and library versions as libraries-bom.") + .append("\n"); } private void printApiReferenceLink() { diff --git a/renovate.json b/renovate.json index 941c34d2249f..d6d9e90720ea 100644 --- a/renovate.json +++ b/renovate.json @@ -69,6 +69,12 @@ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" + }, + { + "matchPackagePatterns": [ + "^com.google.protobuf:" + ], + "enabled": false } ], "semanticCommits": "enabled", diff --git a/versions.txt b/versions.txt index d7655f34ffe1..095783f1c44d 100644 --- a/versions.txt +++ b/versions.txt @@ -3,6 +3,5 @@ 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 java-cloud-bom-tests:0.45.0:0.46.0-SNAPSHOT full-convergence-check:0.48.0:0.49.0-SNAPSHOT