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 026cb9ba9 Revert "[AMORO-3352]Add mysql-connector-j dependency by
maven profile“ (#3405)
026cb9ba9 is described below
commit 026cb9ba902c93be085ecd24aef2200db551627b
Author: Congxian Qiu <[email protected]>
AuthorDate: Wed Jan 15 10:32:25 2025 +0800
Revert "[AMORO-3352]Add mysql-connector-j dependency by maven profile“
(#3405)
Revert "[AMORO-3352]Add mysql-connector-j dependency by maven profile
(#3380)"
This reverts commit 4be9821704521f8c8a2c9db7e305bae55d1fdccd.
The license of MySQL is incompatible with the Apache License.
Please see https://github.com/apache/amoro/issues/3352 for more information
---
amoro-ams/pom.xml | 16 ++++++++--------
pom.xml | 14 ++++++--------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index b46859a22..ebc862e40 100644
--- a/amoro-ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -200,6 +200,12 @@
<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>
@@ -397,13 +403,6 @@
<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>
@@ -452,7 +451,8 @@
<version>1.19.6</version>
<scope>test</scope>
</dependency>
-
+
+
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 130552a4a..97a882b18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,12 +151,10 @@
<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>
@@ -628,6 +626,12 @@
<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>
@@ -1373,11 +1377,5 @@
<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>
