(amoro) branch master updated: [AMORO-3352]Add mysql-connector-j dependency by maven profile (#3380)

[jinsongzhou]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 4be982170 [AMORO-3352]Add mysql-connector-j dependency by maven 
profile (#3380)
4be982170 is described below

commit 4be9821704521f8c8a2c9db7e305bae55d1fdccd
Author: zhangwl9 <1298877...@qq.com>
AuthorDate: Fri Jan 10 15:29:24 2025 +0800

    [AMORO-3352]Add mysql-connector-j dependency by maven profile (#3380)
    
    Add mysql-connector-j dependency by maven profile
    
    Co-authored-by: 张文领 <zhang...@chinatelecom.cn>
    Co-authored-by: big face cat <731030...@qq.com>
---
 amoro-ams/pom.xml | 16 ++++++++--------
 pom.xml           | 14 ++++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index ebc862e40..b46859a22 100644
--- a/amoro-ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -200,12 +200,6 @@
             <artifactId>derby</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
@@ -403,6 +397,13 @@
             <version>${pagehelper.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${mysql-connector-j.version}</version>
+            <scope>${mysql-j-dependency-scope}</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.iceberg</groupId>
             <artifactId>iceberg-data</artifactId>
@@ -451,8 +452,7 @@
             <version>1.19.6</version>
             <scope>test</scope>
         </dependency>
-
-
+        
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 97a882b18..130552a4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,10 +151,12 @@
         <guava.version>32.1.1-jre</guava.version>
         <hudi.version>0.14.1</hudi.version>
         <pagehelper.version>6.1.0</pagehelper.version>
+        <mysql-connector-j.version>9.1.0</mysql-connector-j.version>
 
         <rocksdb-dependency-scope>compile</rocksdb-dependency-scope>
         <lucene-dependency-scope>compile</lucene-dependency-scope>
         <aliyun-sdk-dependency-scope>provided</aliyun-sdk-dependency-scope>
+        <mysql-j-dependency-scope>provided</mysql-j-dependency-scope>
     </properties>
 
     <dependencies>
@@ -626,12 +628,6 @@
                 <version>${derby-jdbc.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>${mysql-jdbc.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
@@ -1377,5 +1373,11 @@
                 
<aliyun-sdk-dependency-scope>compile</aliyun-sdk-dependency-scope>
             </properties>
         </profile>
+        <profile>
+            <id>mysql-j</id>
+            <properties>
+                <mysql-j-dependency-scope>compile</mysql-j-dependency-scope>
+            </properties>
+        </profile>
     </profiles>
 </project>