From 341c804f874e67f89d2235fac8fdb818baa6d1b7 Mon Sep 17 00:00:00 2001
From: Moreno Ambrosin <ambrosin@google.com>
Date: Thu, 18 Jul 2024 00:59:27 -0700
Subject: [PATCH 1/2] Downgrade proto to 3.25.3

Protobuf 4.x introduced a breaking change. Version 27.2 introduced a set of stubs to make proto backward compatible (https://github.com/protocolbuffers/protobuf/releases/tag/v27.2) but this seems to be incomplete (https://github.com/protocolbuffers/protobuf/issues/17247).

#31

PiperOrigin-RevId: 653514325
Change-Id: I10ac3cab3a8856864052619569e6be0492dca274
(cherry picked from commit 9fdb4e2faf56af8a8bcf46863452551d691efd18)
---
 maven/tink-java.pom.xml |  2 +-
 tink_java_deps.bzl      | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/maven/tink-java.pom.xml b/maven/tink-java.pom.xml
index abcf06c8..3d366100 100644
--- a/maven/tink-java.pom.xml
+++ b/maven/tink-java.pom.xml
@@ -88,7 +88,7 @@
     <gson.version>2.10.1</gson.version>
     <error_prone_annotations.version>2.22.0</error_prone_annotations.version>
     <google-http-client.version>1.43.3</google-http-client.version>
-    <protobuf-java.version>4.27.0</protobuf-java.version>
+    <protobuf-java.version>3.25.3</protobuf-java.version>
   </properties>
 
   <dependencies>
diff --git a/tink_java_deps.bzl b/tink_java_deps.bzl
index aaef1fbc..d63af3b0 100644
--- a/tink_java_deps.bzl
+++ b/tink_java_deps.bzl
@@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 TINK_MAVEN_ARTIFACTS = [
-    "com.google.protobuf:protobuf-java:4.27.0",
-    "com.google.protobuf:protobuf-javalite:4.27.0",
+    "com.google.protobuf:protobuf-java:3.25.3",
+    "com.google.protobuf:protobuf-javalite:3.25.3",
     "androidx.annotation:annotation:1.5.0",
     "com.google.api-client:google-api-client:2.2.0",
     "com.google.code.findbugs:jsr305:3.0.2",
@@ -38,19 +38,13 @@ def tink_java_deps():
     # -------------------------------------------------------------------------
     # Protobuf.
     # -------------------------------------------------------------------------
-    # proto_library, cc_proto_library and java_proto_library rules implicitly
-    # depend respectively on:
-    #   * @com_google_protobuf//:proto
-    #   * @com_google_protobuf//:cc_toolchain
-    #   * @com_google_protobuf//:java_toolchain
-    # This statement defines the @com_google_protobuf repo.
-    # Release May 23rd, 2024.
+    # Release from 2024-02-16.
     maybe(
         http_archive,
         name = "com_google_protobuf",
-        strip_prefix = "protobuf-27.0",
-        urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v27.0.zip"],
-        sha256 = "a7e735f510520b41962d07459f6f5b99dd594c7ed4690bf1191b9924bec094a2",
+        strip_prefix = "protobuf-25.3",
+        urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v25.3.zip"],
+        sha256 = "5156b22536feaa88cf95503153a6b2cd67cc80f20f1218f154b84a12c288a220",
     )
 
     # -------------------------------------------------------------------------
@@ -93,7 +87,7 @@ def tink_java_deps():
     # Rules Python.
     # -------------------------------------------------------------------------
     # Required by protobuf.
-    # Release from Aug 22, 2023
+    # Release from 2023-08-22.
     maybe(
         http_archive,
         name = "rules_python",

From decd0e0baf6c5ddb9d87cd98f4a1e8b55e43472c Mon Sep 17 00:00:00 2001
From: Moreno Ambrosin <ambrosin@google.com>
Date: Thu, 18 Jul 2024 06:39:53 -0700
Subject: [PATCH 2/2] Bump tink-java version to 1.14.1

PiperOrigin-RevId: 653600637
Change-Id: If24cfa9e90ab77b03d01b0c906aa00ace41e523b
(cherry picked from commit 17e7243585259d28d29f98519b142e2755a6f825)
---
 tink_version.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tink_version.bzl b/tink_version.bzl
index a38e60ae..77082c9c 100644
--- a/tink_version.bzl
+++ b/tink_version.bzl
@@ -1,2 +1,2 @@
 """Version of the current release of Tink Java."""
-TINK_VERSION_LABEL = "1.14.0"
+TINK_VERSION_LABEL = "1.14.1"