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 dfb32d1939f Add mode repository dependencies and create separate profiles (#35379) dfb32d1939f is described below commit dfb32d1939f4d15198b04d480d11027b30988ba9 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Tue May 13 21:08:50 2025 +0800 Add mode repository dependencies and create separate profiles (#35379) * Add mode repository dependencies and create separate profiles - Add dependencies for standalone and cluster mode repositories to distribution pom.xml - Create separate profiles for each mode repository in distribution pom.xml- Remove mode repository dependencies from proxy/bootstrap pom.xml * Add mode repository dependencies and create separate profiles - Add dependencies for standalone and cluster mode repositories to distribution pom.xml - Create separate profiles for each mode repository in distribution pom.xml- Remove mode repository dependencies from proxy/bootstrap pom.xml * Add mode repository dependencies and create separate profiles - Add dependencies for standalone and cluster mode repositories to distribution pom.xml - Create separate profiles for each mode repository in distribution pom.xml- Remove mode repository dependencies from proxy/bootstrap pom.xml * Add mode repository dependencies and create separate profiles - Add dependencies for standalone and cluster mode repositories to distribution pom.xml - Create separate profiles for each mode repository in distribution pom.xml- Remove mode repository dependencies from proxy/bootstrap pom.xml * Add mode repository dependencies and create separate profiles - Add dependencies for standalone and cluster mode repositories to distribution pom.xml - Create separate profiles for each mode repository in distribution pom.xml- Remove mode repository dependencies from proxy/bootstrap pom.xml * Add mode repository dependencies and create separate profiles - Add dependencies for standalone and cluster mode repositories to distribution pom.xml - Create separate profiles for each mode repository in distribution pom.xml- Remove mode repository dependencies from proxy/bootstrap pom.xml --- distribution/pom.xml | 53 +++++++++++++++++++++++++++++ jdbc/pom.xml | 11 +++--- kernel/data-pipeline/core/pom.xml | 5 +++ proxy/bootstrap/pom.xml | 15 -------- test/e2e/agent/fixture/jdbc-fixture/pom.xml | 6 ++++ test/e2e/driver/pom.xml | 6 ++++ test/e2e/fixture/pom.xml | 7 ++++ 7 files changed, 83 insertions(+), 20 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index dbc2b98141e..618289cc6e5 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -168,6 +168,25 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-cluster-mode-repository-etcd</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> @@ -405,5 +424,39 @@ </dependency> </dependencies> </profile> + + <profile> + <id>mode-repo-jdbc</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>mode-repo-zookeeper</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>mode-repo-etcd</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-cluster-mode-repository-etcd</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 3c54df4b10c..ce3c156ba84 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -78,11 +78,6 @@ <artifactId>shardingsphere-standalone-mode-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-cluster-mode-core</artifactId> @@ -175,6 +170,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> diff --git a/kernel/data-pipeline/core/pom.xml b/kernel/data-pipeline/core/pom.xml index 0a72da740ab..3174b959353 100644 --- a/kernel/data-pipeline/core/pom.xml +++ b/kernel/data-pipeline/core/pom.xml @@ -57,6 +57,11 @@ <artifactId>shardingsphere-sharding-core</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> + <version>${project.version}</version> + </dependency> <!-- TODO remove cluster mode dependency after 3 modes have equivalent features --> <dependency> <groupId>org.apache.shardingsphere</groupId> diff --git a/proxy/bootstrap/pom.xml b/proxy/bootstrap/pom.xml index 3fc35572dee..b25e8452ebc 100644 --- a/proxy/bootstrap/pom.xml +++ b/proxy/bootstrap/pom.xml @@ -38,21 +38,6 @@ <artifactId>shardingsphere-standalone-mode-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-cluster-mode-repository-etcd</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-logging-type-logback</artifactId> diff --git a/test/e2e/agent/fixture/jdbc-fixture/pom.xml b/test/e2e/agent/fixture/jdbc-fixture/pom.xml index 66b9415ebab..4b0715688be 100644 --- a/test/e2e/agent/fixture/jdbc-fixture/pom.xml +++ b/test/e2e/agent/fixture/jdbc-fixture/pom.xml @@ -39,6 +39,12 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>com.mysql</groupId> diff --git a/test/e2e/driver/pom.xml b/test/e2e/driver/pom.xml index 7b2b99ea4d9..4cce8c1a221 100644 --- a/test/e2e/driver/pom.xml +++ b/test/e2e/driver/pom.xml @@ -51,6 +51,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.postgresql</groupId> diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml index 1a95c4a70ea..237453cb861 100644 --- a/test/e2e/fixture/pom.xml +++ b/test/e2e/fixture/pom.xml @@ -118,6 +118,13 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-standalone-mode-repository-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId>