This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 670eaec3fca Refactor usage of shardingsphere-standalone-mode-core and
shardingsphere-cluster-mode-core (#36139)
670eaec3fca is described below
commit 670eaec3fcac3a26c0d1014f9d5f99e92d464a9a
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jul 31 23:03:51 2025 +0800
Refactor usage of shardingsphere-standalone-mode-core and
shardingsphere-cluster-mode-core (#36139)
---
jdbc/pom.xml | 12 ------------
kernel/data-pipeline/core/pom.xml | 5 -----
mode/type/cluster/repository/provider/etcd/pom.xml | 5 +++++
mode/type/standalone/repository/provider/jdbc/pom.xml | 5 +++++
mode/type/standalone/repository/provider/memory/pom.xml | 6 ++++++
proxy/bootstrap/pom.xml | 6 ------
test/e2e/agent/fixture/jdbc-fixture/pom.xml | 12 ------------
test/e2e/driver/pom.xml | 12 ------------
test/it/pipeline/pom.xml | 10 ----------
9 files changed, 16 insertions(+), 57 deletions(-)
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index eafa854b173..7f1598fc0d2 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -112,18 +112,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-standalone-mode-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-cluster-mode-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-sharding-core</artifactId>
diff --git a/kernel/data-pipeline/core/pom.xml
b/kernel/data-pipeline/core/pom.xml
index 7dc3f03bec0..b4f10f476ed 100644
--- a/kernel/data-pipeline/core/pom.xml
+++ b/kernel/data-pipeline/core/pom.xml
@@ -58,11 +58,6 @@
<version>${project.version}</version>
</dependency>
<!-- TODO remove cluster mode dependency after 3 modes have equivalent
features -->
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-cluster-mode-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
diff --git a/mode/type/cluster/repository/provider/etcd/pom.xml
b/mode/type/cluster/repository/provider/etcd/pom.xml
index d3093493621..24090af7ad2 100644
--- a/mode/type/cluster/repository/provider/etcd/pom.xml
+++ b/mode/type/cluster/repository/provider/etcd/pom.xml
@@ -52,6 +52,11 @@
<artifactId>shardingsphere-cluster-mode-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-cluster-mode-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/mode/type/standalone/repository/provider/jdbc/pom.xml
b/mode/type/standalone/repository/provider/jdbc/pom.xml
index ade47d9620a..f82c4b41e43 100644
--- a/mode/type/standalone/repository/provider/jdbc/pom.xml
+++ b/mode/type/standalone/repository/provider/jdbc/pom.xml
@@ -32,6 +32,11 @@
<artifactId>shardingsphere-standalone-mode-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-standalone-mode-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/mode/type/standalone/repository/provider/memory/pom.xml
b/mode/type/standalone/repository/provider/memory/pom.xml
index 5c02de5172e..9b49242a2b4 100644
--- a/mode/type/standalone/repository/provider/memory/pom.xml
+++ b/mode/type/standalone/repository/provider/memory/pom.xml
@@ -31,6 +31,12 @@
<artifactId>shardingsphere-standalone-mode-repository-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-standalone-mode-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-util</artifactId>
diff --git a/proxy/bootstrap/pom.xml b/proxy/bootstrap/pom.xml
index edbfb359d84..9e1dd4e6396 100644
--- a/proxy/bootstrap/pom.xml
+++ b/proxy/bootstrap/pom.xml
@@ -33,12 +33,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-standalone-mode-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-parser-sql-sql92</artifactId>
diff --git a/test/e2e/agent/fixture/jdbc-fixture/pom.xml
b/test/e2e/agent/fixture/jdbc-fixture/pom.xml
index d097d6d60f9..ea2fc16c42f 100644
--- a/test/e2e/agent/fixture/jdbc-fixture/pom.xml
+++ b/test/e2e/agent/fixture/jdbc-fixture/pom.xml
@@ -39,18 +39,6 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-standalone-mode-core</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-cluster-mode-core</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-standalone-mode-repository-memory</artifactId>
diff --git a/test/e2e/driver/pom.xml b/test/e2e/driver/pom.xml
index 7d76e4c6eba..8feca737bce 100644
--- a/test/e2e/driver/pom.xml
+++ b/test/e2e/driver/pom.xml
@@ -63,18 +63,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-standalone-mode-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-cluster-mode-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/test/it/pipeline/pom.xml b/test/it/pipeline/pom.xml
index ae720684c06..219dedfbcce 100644
--- a/test/it/pipeline/pom.xml
+++ b/test/it/pipeline/pom.xml
@@ -57,16 +57,6 @@
<artifactId>shardingsphere-jdbc</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-standalone-mode-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-cluster-mode-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>