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 24f988d7198 Update dependencies and reorganize pom structure (#35365) 24f988d7198 is described below commit 24f988d71988e9559a246e52e34c84d9e53098d6 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sun May 11 18:31:52 2025 +0800 Update dependencies and reorganize pom structure (#35365) * Update dependencies and reorganize pom structure - Add new dependencies for PostgreSQL, MySQL, and OpenGauss - Update existing dependencies to include version and scope - Remove redundant dependencies from proxy/bootstrap/pom.xml - Reorganize pom.xml structure for better readability and maintainability * Update dependencies and reorganize pom structure - Add new dependencies for PostgreSQL, MySQL, and OpenGauss - Update existing dependencies to include version and scope - Remove redundant dependencies from proxy/bootstrap/pom.xml - Reorganize pom.xml structure for better readability and maintainability * Update dependencies and reorganize pom structure - Add new dependencies for PostgreSQL, MySQL, and OpenGauss - Update existing dependencies to include version and scope - Remove redundant dependencies from proxy/bootstrap/pom.xml - Reorganize pom.xml structure for better readability and maintainability * Update dependencies and reorganize pom structure - Add new dependencies for PostgreSQL, MySQL, and OpenGauss - Update existing dependencies to include version and scope - Remove redundant dependencies from proxy/bootstrap/pom.xml - Reorganize pom.xml structure for better readability and maintainability * Update dependencies and reorganize pom structure - Add new dependencies for PostgreSQL, MySQL, and OpenGauss - Update existing dependencies to include version and scope - Remove redundant dependencies from proxy/bootstrap/pom.xml - Reorganize pom.xml structure for better readability and maintainability --- agent/plugins/metrics/core/pom.xml | 12 +++++ distribution/pom.xml | 97 +++++++++++++++++++++++++++++++++- proxy/bootstrap/pom.xml | 25 +-------- test/e2e/fixture/pom.xml | 41 +++++++++++++- test/e2e/operation/pipeline/pom.xml | 41 +++++++++++++- test/e2e/operation/transaction/pom.xml | 41 +++++++++++++- test/it/spi/pom.xml | 40 ++++++++++++++ test/native/pom.xml | 43 ++++++++++++++- 8 files changed, 310 insertions(+), 30 deletions(-) diff --git a/agent/plugins/metrics/core/pom.xml b/agent/plugins/metrics/core/pom.xml index 48065bc4a00..8211b2fb346 100644 --- a/agent/plugins/metrics/core/pom.xml +++ b/agent/plugins/metrics/core/pom.xml @@ -92,6 +92,18 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-mysql-protocol</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>com.h2database</groupId> diff --git a/distribution/pom.xml b/distribution/pom.xml index 328c4743422..02eba54b8e0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -80,6 +80,25 @@ <activeByDefault>true</activeByDefault> </activation> <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-postgresql-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-mysql</artifactId> @@ -88,16 +107,17 @@ </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <artifactId>shardingsphere-mysql-protocol</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-opengauss</artifactId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-oracle</artifactId> @@ -111,6 +131,25 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-opengauss</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-opengauss-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> @@ -133,6 +172,18 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-postgresql-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> @@ -149,6 +200,18 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-mysql-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>com.mysql</groupId> <artifactId>mysql-connector-j</artifactId> @@ -187,6 +250,18 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-opengauss-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.opengauss</groupId> <artifactId>opengauss-jdbc</artifactId> @@ -284,6 +359,24 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-mysql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-mysql-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> diff --git a/proxy/bootstrap/pom.xml b/proxy/bootstrap/pom.xml index e417b27bd59..2e486e0f8ef 100644 --- a/proxy/bootstrap/pom.xml +++ b/proxy/bootstrap/pom.xml @@ -29,33 +29,12 @@ <dependencies> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-mysql-protocol</artifactId> + <artifactId>shardingsphere-db-protocol-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-postgresql-protocol</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-opengauss-protocol</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <artifactId>shardingsphere-proxy-frontend-core</artifactId> <version>${project.version}</version> </dependency> diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml index a5472b7844f..1a95c4a70ea 100644 --- a/test/e2e/fixture/pom.xml +++ b/test/e2e/fixture/pom.xml @@ -48,6 +48,25 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-postgresql-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-mysql</artifactId> @@ -56,16 +75,36 @@ </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <artifactId>shardingsphere-mysql-protocol</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-opengauss</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-opengauss-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-oracle</artifactId> diff --git a/test/e2e/operation/pipeline/pom.xml b/test/e2e/operation/pipeline/pom.xml index b5d8b7ab660..3b1c326ad3d 100644 --- a/test/e2e/operation/pipeline/pom.xml +++ b/test/e2e/operation/pipeline/pom.xml @@ -52,6 +52,25 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-postgresql-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-mysql</artifactId> @@ -60,16 +79,36 @@ </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <artifactId>shardingsphere-mysql-protocol</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-opengauss</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-opengauss-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-oracle</artifactId> diff --git a/test/e2e/operation/transaction/pom.xml b/test/e2e/operation/transaction/pom.xml index 701383e6d7b..97cd0e6b6d4 100644 --- a/test/e2e/operation/transaction/pom.xml +++ b/test/e2e/operation/transaction/pom.xml @@ -52,6 +52,25 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-postgresql-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-mysql</artifactId> @@ -60,16 +79,36 @@ </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <artifactId>shardingsphere-mysql-protocol</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-opengauss</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-opengauss-protocol</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-oracle</artifactId> diff --git a/test/it/spi/pom.xml b/test/it/spi/pom.xml index 0417abff838..7fe046aea8e 100644 --- a/test/it/spi/pom.xml +++ b/test/it/spi/pom.xml @@ -45,24 +45,64 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-mysql-protocol</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-postgresql</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-postgresql-protocol</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-opengauss</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-opengauss-protocol</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-oracle</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-sqlserver</artifactId> diff --git a/test/native/pom.xml b/test/native/pom.xml index 499c0ed6da3..0fd05d80c09 100644 --- a/test/native/pom.xml +++ b/test/native/pom.xml @@ -40,24 +40,63 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-postgresql-protocol</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-postgresql</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-mysql</artifactId> <version>${project.version}</version> - <scope>runtime</scope> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-mysql-protocol</artifactId> + <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <artifactId>shardingsphere-proxy-frontend-mysql</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-opengauss</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-opengauss-protocol</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-proxy-frontend-opengauss</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>shardingsphere-parser-sql-oracle</artifactId>