From a7f5101b77aa02e25f66c031ccd1f64ef41877d9 Mon Sep 17 00:00:00 2001
From: blakeli <blakeli@google.com>
Date: Tue, 29 Oct 2024 19:55:01 -0400
Subject: [PATCH 1/3] chore: Override the version of protobuf-bom to 4.28.3 in
 libraries-bom.

---
 libraries-bom-protobuf3/pom.xml                       |  2 +-
 libraries-bom/pom.xml                                 | 11 +++++++++++
 .../java/com/google/cloud/ReleaseNoteGeneration.java  |  3 +++
 renovate.json                                         |  6 ++++++
 versions.txt                                          |  2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/libraries-bom-protobuf3/pom.xml b/libraries-bom-protobuf3/pom.xml
index 83abcabc188e..20e09dadf5e2 100644
--- a/libraries-bom-protobuf3/pom.xml
+++ b/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-protobuf3:current} -->
   <packaging>pom</packaging>
 
   <parent>
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 @@
 
   <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. -->
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..4c1566438766 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, 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.")
+        .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..9417dd243c32 100644
--- a/versions.txt
+++ b/versions.txt
@@ -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
 java-cloud-bom-tests:0.45.0:0.46.0-SNAPSHOT
 full-convergence-check:0.48.0:0.49.0-SNAPSHOT

From df57b82635225afee959007fb4e05e0aaf9020bd Mon Sep 17 00:00:00 2001
From: blakeli <blakeli@google.com>
Date: Wed, 30 Oct 2024 17:03:15 -0400
Subject: [PATCH 2/3] chore: Address comments.

---
 libraries-bom-protobuf3/pom.xml                                 | 2 +-
 .../src/main/java/com/google/cloud/ReleaseNoteGeneration.java   | 2 +-
 versions.txt                                                    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries-bom-protobuf3/pom.xml b/libraries-bom-protobuf3/pom.xml
index 20e09dadf5e2..6904ebbe90b0 100644
--- a/libraries-bom-protobuf3/pom.xml
+++ b/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>26.50.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>
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 4c1566438766..b06eb97b9ec5 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
@@ -183,7 +183,7 @@ private void printKeyCoreLibraryDependencies(Bom bom) {
         .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, 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.")
+        .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, as a workaround, use libraries-bom-protobuf3 which is compatible with protobuf-java 3.x. libraries-bom-protobuf3 includes the same client libraries and library versions as libraries-bom.")
         .append("\n");
   }
 
diff --git a/versions.txt b/versions.txt
index 9417dd243c32..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:26.49.0:26.50.0-SNAPSHOT
 java-cloud-bom-tests:0.45.0:0.46.0-SNAPSHOT
 full-convergence-check:0.48.0:0.49.0-SNAPSHOT

From 37fb7725c69536419c17d2b926c94ec4e6f285a2 Mon Sep 17 00:00:00 2001
From: blakeli <blakeli@google.com>
Date: Wed, 30 Oct 2024 17:59:51 -0400
Subject: [PATCH 3/3] chore: Address comments.

---
 .../src/main/java/com/google/cloud/ReleaseNoteGeneration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b06eb97b9ec5..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
@@ -183,7 +183,7 @@ private void printKeyCoreLibraryDependencies(Bom bom) {
         .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, as a workaround, use libraries-bom-protobuf3 which is compatible with protobuf-java 3.x. libraries-bom-protobuf3 includes the same client libraries and library versions as libraries-bom.")
+        .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");
   }