From 551e5e766fb2f9def334c4db1e61a0dd3841d788 Mon Sep 17 00:00:00 2001
From: Mark Prins <1165786+mprins@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:22:47 +0100
Subject: [PATCH] [GEOS-11631] Update MySQL driver to 9.1.0 (#8088)

---
 src/pom.xml                                  | 13 ++++++++++---
 src/release/ext-mysql.xml                    |  2 +-
 src/release/extensions/mysql/mysql-README.md |  2 +-
 src/security/jdbc/pom.xml                    |  4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/pom.xml b/src/pom.xml
index 9796de0a8da..4653f48db6d 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -145,7 +145,7 @@
     <postgresql.jdbc.version>42.7.3</postgresql.jdbc.version>
     <postgis.jdbc.version>1.3.3</postgis.jdbc.version>
     <oracle.jdbc.version>19.18.0.0</oracle.jdbc.version>
-    <mysql.jdbc.version>8.0.28</mysql.jdbc.version>
+    <mysql.jdbc.version>9.1.0</mysql.jdbc.version>
     <solrj.version>8.11.3</solrj.version>
     <mockito.version>5.12.0</mockito.version>
     <jacoco.version>0.8.6</jacoco.version>
@@ -922,9 +922,16 @@
         <version>1.8</version>
       </dependency>
       <dependency>
-        <groupId>mysql</groupId>
-        <artifactId>mysql-connector-java</artifactId>
+        <groupId>com.mysql</groupId>
+        <artifactId>mysql-connector-j</artifactId>
         <version>${mysql.jdbc.version}</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>protobuf-java</artifactId>
+            <!-- only required for using X DevAPI -->
+            <groupId>com.google.protobuf</groupId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.jdom</groupId>
diff --git a/src/release/ext-mysql.xml b/src/release/ext-mysql.xml
index f792a2e66f1..bd980a756dd 100644
--- a/src/release/ext-mysql.xml
+++ b/src/release/ext-mysql.xml
@@ -17,7 +17,7 @@
       <outputDirectory></outputDirectory>
       <includes>
         <include>gt-jdbc-mysql*.jar</include>
-        <include>mysql-connector-java-*.jar</include>
+        <include>mysql-connector-j-*.jar</include>
       </includes>
     </fileSet>
     <fileSet>
diff --git a/src/release/extensions/mysql/mysql-README.md b/src/release/extensions/mysql/mysql-README.md
index 5d9d03e40e6..cb05fc22b5a 100644
--- a/src/release/extensions/mysql/mysql-README.md
+++ b/src/release/extensions/mysql/mysql-README.md
@@ -13,7 +13,7 @@ Contains the following data stores:
 
 INSTALLATION
 
-1. Copy included gt2-jdbc-mysql and mysql-connector-java jars included to your 
+1. Copy included gt2-jdbc-mysql and mysql-connector-j jars included to your 
    GeoServer library directory.  In a binary install this is at 
    [GEOSERVER_HOME]/server/geoserver/WEB-INF/lib/
    In a war install this is [container]/webapps/geoserver/WEB-INF/lib/
diff --git a/src/security/jdbc/pom.xml b/src/security/jdbc/pom.xml
index 5175f0cf3fb..e386de12aee 100644
--- a/src/security/jdbc/pom.xml
+++ b/src/security/jdbc/pom.xml
@@ -39,8 +39,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>