将强依赖于mysql驱动包的模块，移入seata-plugin，由用户自行打包。

wangliang181230 · Nov 21, 2023 · 8f56510 · 8f56510
1 parent 6595e6b
commit 8f56510
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → ...plugin/seata-rm-datasource-mysql5/pom.xml b/rm-datasource-mysql5/pom.xml → ...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/...ruct/cache/Mysql5ColumnMetaProcessor.java → ...ruct/cache/Mysql5ColumnMetaProcessor.java b/...ruct/cache/Mysql5ColumnMetaProcessor.java → ...ruct/cache/Mysql5ColumnMetaProcessor.java
diff --git a/...-rm-datasource-mysql5/reflect-config.json → ...-rm-datasource-mysql5/reflect-config.json b/...-rm-datasource-mysql5/reflect-config.json → ...-rm-datasource-mysql5/reflect-config.json
diff --git a/...rce.sql.struct.cache.IColumnMetaProcessor → ...rce.sql.struct.cache.IColumnMetaProcessor b/...rce.sql.struct.cache.IColumnMetaProcessor → ...rce.sql.struct.cache.IColumnMetaProcessor
diff --git a/rm-datasource-mysql8/pom.xml → ...plugin/seata-rm-datasource-mysql8/pom.xml b/rm-datasource-mysql8/pom.xml → ...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/...ruct/cache/Mysql8ColumnMetaProcessor.java → ...ruct/cache/Mysql8ColumnMetaProcessor.java b/...ruct/cache/Mysql8ColumnMetaProcessor.java → ...ruct/cache/Mysql8ColumnMetaProcessor.java
diff --git a/...rce.sql.struct.cache.IColumnMetaProcessor → ...rce.sql.struct.cache.IColumnMetaProcessor b/...rce.sql.struct.cache.IColumnMetaProcessor → ...rce.sql.struct.cache.IColumnMetaProcessor