From 6da7534acaa466d372e4091f13a4ff5c73e0fa58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kraus?= <tomas.kraus@oracle.com>
Date: Thu, 16 Nov 2023 16:57:56 +0100
Subject: [PATCH] Upgrade to mysql-connector-j 8.2.0 (#8016)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
---
 .../helidon/src/main/archetype/mp/custom/database.xml     | 4 ++--
 .../helidon/src/main/archetype/se/custom/database.xml     | 4 ++--
 dependencies/pom.xml                                      | 8 ++++----
 examples/dbclient/jdbc/pom.xml                            | 4 ++--
 examples/dbclient/pokemons/pom.xml                        | 4 ++--
 .../integrations/cdi/datasource-hikaricp-mysql/pom.xml    | 4 ++--
 integrations/db/mysql/pom.xml                             | 4 ++--
 tests/integration/dbclient/appl/pom.xml                   | 4 ++--
 tests/integration/dbclient/jdbc/pom.xml                   | 4 ++--
 tests/integration/jpa/appl/pom.xml                        | 4 ++--
 tests/integration/tools/example/pom.xml                   | 4 ++--
 tests/integration/vault/mp/pom.xml                        | 4 ++--
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/archetypes/helidon/src/main/archetype/mp/custom/database.xml b/archetypes/helidon/src/main/archetype/mp/custom/database.xml
index 292c64e8b18..4a7ef9bb2ed 100644
--- a/archetypes/helidon/src/main/archetype/mp/custom/database.xml
+++ b/archetypes/helidon/src/main/archetype/mp/custom/database.xml
@@ -303,8 +303,8 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
                                     </list>
                                     <list key="dependencies">
                                         <map>
-                                            <value key="groupId">mysql</value>
-                                            <value key="artifactId">mysql-connector-java</value>
+                                            <value key="groupId">com.mysql</value>
+                                            <value key="artifactId">mysql-connector-j</value>
                                             <value key="scope">runtime</value>
                                         </map>
                                     </list>
diff --git a/archetypes/helidon/src/main/archetype/se/custom/database.xml b/archetypes/helidon/src/main/archetype/se/custom/database.xml
index 293591d9bf4..4b727191dd6 100644
--- a/archetypes/helidon/src/main/archetype/se/custom/database.xml
+++ b/archetypes/helidon/src/main/archetype/se/custom/database.xml
@@ -175,8 +175,8 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
                                     </list>
                                     <list key="dependencies">
                                         <map>
-                                            <value key="groupId">mysql</value>
-                                            <value key="artifactId">mysql-connector-java</value>
+                                            <value key="groupId">com.mysql</value>
+                                            <value key="artifactId">mysql-connector-j</value>
                                             <value key="scope">runtime</value>
                                         </map>
                                         <map>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 0660fbe0d15..73fbb74f456 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -125,7 +125,7 @@
         <version.lib.microstream>05.00.02-MS-GA</version.lib.microstream>
         <version.lib.mongodb.reactivestreams>1.11.0</version.lib.mongodb.reactivestreams>
         <version.lib.mssql-jdbc>8.4.1.jre8</version.lib.mssql-jdbc>
-        <version.lib.mysql-connector-java>8.0.28</version.lib.mysql-connector-java>
+        <version.lib.mysql-connector-j>8.2.0</version.lib.mysql-connector-j>
         <version.lib.narayana>5.12.0.Final</version.lib.narayana>
         <version.lib.neo4j>5.12.0</version.lib.neo4j>
         <version.lib.netty>4.1.100.Final</version.lib.netty>
@@ -759,9 +759,9 @@
                 <version>${version.lib.h2}</version>
             </dependency>
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${version.lib.mysql-connector-java}</version>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
+                <version>${version.lib.mysql-connector-j}</version>
             </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
diff --git a/examples/dbclient/jdbc/pom.xml b/examples/dbclient/jdbc/pom.xml
index da6e5e4b125..d30225e768e 100644
--- a/examples/dbclient/jdbc/pom.xml
+++ b/examples/dbclient/jdbc/pom.xml
@@ -76,8 +76,8 @@
         </dependency>
 <!--
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 -->
 <!--
diff --git a/examples/dbclient/pokemons/pom.xml b/examples/dbclient/pokemons/pom.xml
index b98f09d9d3b..bdd65aaba80 100644
--- a/examples/dbclient/pokemons/pom.xml
+++ b/examples/dbclient/pokemons/pom.xml
@@ -91,8 +91,8 @@
 -->
 <!--
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 -->
         <dependency>
diff --git a/examples/integrations/cdi/datasource-hikaricp-mysql/pom.xml b/examples/integrations/cdi/datasource-hikaricp-mysql/pom.xml
index 41eb5b1d28d..114aacf94c9 100644
--- a/examples/integrations/cdi/datasource-hikaricp-mysql/pom.xml
+++ b/examples/integrations/cdi/datasource-hikaricp-mysql/pom.xml
@@ -51,8 +51,8 @@
 
         <!-- Runtime-scoped dependencies. -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
diff --git a/integrations/db/mysql/pom.xml b/integrations/db/mysql/pom.xml
index 5e0748a0801..dc0d3558299 100644
--- a/integrations/db/mysql/pom.xml
+++ b/integrations/db/mysql/pom.xml
@@ -36,8 +36,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/tests/integration/dbclient/appl/pom.xml b/tests/integration/dbclient/appl/pom.xml
index 3894c4ed18b..21173eba00c 100644
--- a/tests/integration/dbclient/appl/pom.xml
+++ b/tests/integration/dbclient/appl/pom.xml
@@ -250,8 +250,8 @@
                     <version>${project.version}</version>
                 </dependency>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
diff --git a/tests/integration/dbclient/jdbc/pom.xml b/tests/integration/dbclient/jdbc/pom.xml
index 7b6bacd40ea..b550dfba94c 100644
--- a/tests/integration/dbclient/jdbc/pom.xml
+++ b/tests/integration/dbclient/jdbc/pom.xml
@@ -199,8 +199,8 @@
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
diff --git a/tests/integration/jpa/appl/pom.xml b/tests/integration/jpa/appl/pom.xml
index 1006ebdfc65..3a152e31446 100644
--- a/tests/integration/jpa/appl/pom.xml
+++ b/tests/integration/jpa/appl/pom.xml
@@ -407,8 +407,8 @@
                     <version>${project.version}</version>
                 </dependency>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
diff --git a/tests/integration/tools/example/pom.xml b/tests/integration/tools/example/pom.xml
index 3ab2bb6b76e..3ddb0cb3368 100644
--- a/tests/integration/tools/example/pom.xml
+++ b/tests/integration/tools/example/pom.xml
@@ -217,8 +217,8 @@
                     <version>${project.version}</version>
                 </dependency>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
diff --git a/tests/integration/vault/mp/pom.xml b/tests/integration/vault/mp/pom.xml
index 8522de43ae4..e47a5e66b6d 100644
--- a/tests/integration/vault/mp/pom.xml
+++ b/tests/integration/vault/mp/pom.xml
@@ -81,8 +81,8 @@
             <artifactId>helidon-integrations-vault-sys</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>