From aee7807ca748b07a694a0b460623feeee194c199 Mon Sep 17 00:00:00 2001
From: Harshit Gangal <harshit@planetscale.com>
Date: Wed, 8 Jan 2025 17:50:01 +0530
Subject: [PATCH 1/3] same protobuf java and protoc version

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
---
 java/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 6742258a6b8..e68bbd5574e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -72,8 +72,8 @@
     <netty.handler.version>4.1.110.Final</netty.handler.version>
     <tcnative.boring.ssl.version>2.0.65.Final</tcnative.boring.ssl.version>
 
-    <protobuf.java.version>4.28.3</protobuf.java.version>
-    <protobuf.protoc.version>3.24.3</protobuf.protoc.version>
+    <protobuf.java.version>3.25.5</protobuf.java.version>
+    <protobuf.protoc.version>3.25.5</protobuf.protoc.version>
     <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
     <log4j2.version>2.24.1</log4j2.version>
   </properties>

From 3988db8c4bc7fcbc7222808b6a40381c154c2996 Mon Sep 17 00:00:00 2001
From: Harshit Gangal <harshit@planetscale.com>
Date: Wed, 8 Jan 2025 17:51:18 +0530
Subject: [PATCH 2/3] update mysql connector version to remove open
 vulnerability

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
---
 java/example/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/example/pom.xml b/java/example/pom.xml
index fa3220f51bd..fabab27dd77 100644
--- a/java/example/pom.xml
+++ b/java/example/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>8.0.28</version>
+      <version>8.0.33</version>
       <optional>false</optional>
     </dependency>
 

From 82052618f28b93c214c51682d19a95ee4a600053 Mon Sep 17 00:00:00 2001
From: Harshit Gangal <harshit@planetscale.com>
Date: Wed, 8 Jan 2025 17:51:38 +0530
Subject: [PATCH 3/3] test: fix grpc tls tests

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
---
 java/grpc-client/src/test/resources/ca.config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/grpc-client/src/test/resources/ca.config b/java/grpc-client/src/test/resources/ca.config
index e0955f28ccf..c5758831e06 100644
--- a/java/grpc-client/src/test/resources/ca.config
+++ b/java/grpc-client/src/test/resources/ca.config
@@ -2,6 +2,7 @@
  default_bits           = 1024
  default_keyfile        = keyfile.pem
  distinguished_name     = req_distinguished_name
+ x509_extensions        = v3_ca
  attributes             = req_attributes
  prompt                 = no
  output_password        = mypass
@@ -15,3 +16,5 @@
  emailAddress           = test@email.address
 [ req_attributes ]
  challengePassword      = A challenge password
+[ v3_ca ]
+ basicConstraints       = CA:TRUE