chore: Override the version of protobuf-bom to 4.28.3 in libraries-bo…

…m. (#6836)

libraries-bom-protobuf3/pom.xml

@@ -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:current} -->
   <packaging>pom</packaging>
 
   <parent>

libraries-bom/pom.xml

@@ -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. -->

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() {

renovate.json

@@ -69,6 +69,12 @@
         "^com.fasterxml.jackson.core"
       ],
       "groupName": "jackson dependencies"
+    },
+    {
+      "matchPackagePatterns": [
+        "^com.google.protobuf:"
+      ],
+      "enabled": false
     }
   ],
   "semanticCommits": "enabled",

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