From 8f565100fbb4f939f1ee09e6a06528545b9c34d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Tue, 21 Nov 2023 21:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=BC=BA=E4=BE=9D=E8=B5=96=E4=BA=8Emy?=
 =?UTF-8?q?sql=E9=A9=B1=E5=8A=A8=E5=8C=85=E7=9A=84=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=85=A5seata-plugin=EF=BC=8C=E7=94=B1?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=87=AA=E8=A1=8C=E6=89=93=E5=8C=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 all/pom.xml                                            | 10 ----------
 bom/pom.xml                                            | 10 ----------
 .../io/seata/common/loader/DependsOnException.java     |  2 +-
 pom.xml                                                |  2 --
 .../sql/struct/cache/MysqlTableMetaCache.java          |  1 +
 seata-plugin/pom.xml                                   |  2 ++
 .../seata-rm-datasource-mysql5}/pom.xml                |  3 ++-
 .../sql/struct/cache/Mysql5ColumnMetaProcessor.java    |  0
 .../seata-rm-datasource-mysql5/reflect-config.json     |  0
 ...rm.datasource.sql.struct.cache.IColumnMetaProcessor |  0
 .../seata-rm-datasource-mysql8}/pom.xml                |  3 ++-
 .../sql/struct/cache/Mysql8ColumnMetaProcessor.java    |  0
 ...rm.datasource.sql.struct.cache.IColumnMetaProcessor |  0
 13 files changed, 8 insertions(+), 25 deletions(-)
 rename {rm-datasource-mysql5 => seata-plugin/seata-rm-datasource-mysql5}/pom.xml (95%)
 rename {rm-datasource-mysql5 => seata-plugin/seata-rm-datasource-mysql5}/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql5ColumnMetaProcessor.java (100%)
 rename {rm-datasource-mysql5 => seata-plugin/seata-rm-datasource-mysql5}/src/main/resources/META-INF/native-image/io.seata/seata-rm-datasource-mysql5/reflect-config.json (100%)
 rename {rm-datasource-mysql5 => seata-plugin/seata-rm-datasource-mysql5}/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor (100%)
 rename {rm-datasource-mysql8 => seata-plugin/seata-rm-datasource-mysql8}/pom.xml (95%)
 rename {rm-datasource-mysql8 => seata-plugin/seata-rm-datasource-mysql8}/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql8ColumnMetaProcessor.java (100%)
 rename {rm-datasource-mysql8 => seata-plugin/seata-rm-datasource-mysql8}/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor (100%)

diff --git a/all/pom.xml b/all/pom.xml
index dbab7592517..597a6a20e77 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -189,16 +189,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-rm-datasource-mysql5</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-rm-datasource-mysql8</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-sqlparser-core</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 68c81b7eadd..f60d4b034f6 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -198,16 +198,6 @@
                 <artifactId>seata-rm-datasource</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-rm-datasource-mysql5</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.seata</groupId>
-                <artifactId>seata-rm-datasource-mysql8</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <!-- the 'seata-server' is an application, not a dependency
             <dependency>
                 <groupId>io.seata</groupId>
diff --git a/common/src/main/java/io/seata/common/loader/DependsOnException.java b/common/src/main/java/io/seata/common/loader/DependsOnException.java
index 1f87d1fa10c..68a5e1596f9 100644
--- a/common/src/main/java/io/seata/common/loader/DependsOnException.java
+++ b/common/src/main/java/io/seata/common/loader/DependsOnException.java
@@ -20,7 +20,7 @@
  *
  * @author wang.liang
  */
-public class DependsOnException extends Exception {
+class DependsOnException extends Exception {
 
     public DependsOnException(String message) {
         super(message);
diff --git a/pom.xml b/pom.xml
index eb48e34ea5e..4b3240fa900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,8 +53,6 @@
         <module>integration/brpc</module>
         <module>rm</module>
         <module>rm-datasource</module>
-        <module>rm-datasource-mysql5</module>
-        <module>rm-datasource-mysql8</module>
         <module>spring</module>
         <module>tcc</module>
         <module>test</module>
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java
index 29167eae14c..b8a45fb0fe5 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java
@@ -121,6 +121,7 @@ protected TableMeta resultSetMetaToSchema(Connection connection, Statement stmt,
          * 1. show full columns from xxx from xxx(normal)
          * 2. select xxx from xxx where catalog_name like ? and table_name like ?(informationSchema=true)
          */
+
         try (ResultSet rsColumns = dbmd.getColumns(catalogName, schemaName, tableName, "%");
              ResultSet rsIndex = dbmd.getIndexInfo(catalogName, schemaName, tableName, false, true);
              ResultSet onUpdateColumns = dbmd.getVersionColumns(catalogName, schemaName, tableName)) {
diff --git a/seata-plugin/pom.xml b/seata-plugin/pom.xml
index cfb9f5e6f5a..f78281129d9 100644
--- a/seata-plugin/pom.xml
+++ b/seata-plugin/pom.xml
@@ -32,6 +32,8 @@
 
     <modules>
         <module>seata-jackson-parser-oracle</module>
+        <module>seata-rm-datasource-mysql5</module>
+        <module>seata-rm-datasource-mysql8</module>
     </modules>
 
     <repositories>
diff --git a/rm-datasource-mysql5/pom.xml b/seata-plugin/seata-rm-datasource-mysql5/pom.xml
similarity index 95%
rename from rm-datasource-mysql5/pom.xml
rename to seata-plugin/seata-rm-datasource-mysql5/pom.xml
index 6d167885ab4..dde3a32ff44 100644
--- a/rm-datasource-mysql5/pom.xml
+++ b/seata-plugin/seata-rm-datasource-mysql5/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.seata</groupId>
-        <artifactId>seata-parent</artifactId>
+        <artifactId>seata-plugin</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -39,6 +39,7 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql5.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/rm-datasource-mysql5/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql5ColumnMetaProcessor.java b/seata-plugin/seata-rm-datasource-mysql5/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql5ColumnMetaProcessor.java
similarity index 100%
rename from rm-datasource-mysql5/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql5ColumnMetaProcessor.java
rename to seata-plugin/seata-rm-datasource-mysql5/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql5ColumnMetaProcessor.java
diff --git a/rm-datasource-mysql5/src/main/resources/META-INF/native-image/io.seata/seata-rm-datasource-mysql5/reflect-config.json b/seata-plugin/seata-rm-datasource-mysql5/src/main/resources/META-INF/native-image/io.seata/seata-rm-datasource-mysql5/reflect-config.json
similarity index 100%
rename from rm-datasource-mysql5/src/main/resources/META-INF/native-image/io.seata/seata-rm-datasource-mysql5/reflect-config.json
rename to seata-plugin/seata-rm-datasource-mysql5/src/main/resources/META-INF/native-image/io.seata/seata-rm-datasource-mysql5/reflect-config.json
diff --git a/rm-datasource-mysql5/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor b/seata-plugin/seata-rm-datasource-mysql5/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor
similarity index 100%
rename from rm-datasource-mysql5/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor
rename to seata-plugin/seata-rm-datasource-mysql5/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor
diff --git a/rm-datasource-mysql8/pom.xml b/seata-plugin/seata-rm-datasource-mysql8/pom.xml
similarity index 95%
rename from rm-datasource-mysql8/pom.xml
rename to seata-plugin/seata-rm-datasource-mysql8/pom.xml
index 79d5e7ad5bb..cbc54e7a2c0 100644
--- a/rm-datasource-mysql8/pom.xml
+++ b/seata-plugin/seata-rm-datasource-mysql8/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.seata</groupId>
-        <artifactId>seata-parent</artifactId>
+        <artifactId>seata-plugin</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -39,6 +39,7 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql8.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/rm-datasource-mysql8/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql8ColumnMetaProcessor.java b/seata-plugin/seata-rm-datasource-mysql8/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql8ColumnMetaProcessor.java
similarity index 100%
rename from rm-datasource-mysql8/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql8ColumnMetaProcessor.java
rename to seata-plugin/seata-rm-datasource-mysql8/src/main/java/io/seata/rm/datasource/sql/struct/cache/Mysql8ColumnMetaProcessor.java
diff --git a/rm-datasource-mysql8/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor b/seata-plugin/seata-rm-datasource-mysql8/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor
similarity index 100%
rename from rm-datasource-mysql8/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor
rename to seata-plugin/seata-rm-datasource-mysql8/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.struct.cache.IColumnMetaProcessor