From 0985ba9001220cf63785238fd93000b851902340 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 22 Oct 2023 21:08:49 +0800 Subject: [PATCH 1/4] Aggregate version to root pom --- agent/plugins/metrics/type/prometheus/pom.xml | 5 ---- .../tracing/type/opentelemetry/pom.xml | 6 ----- distribution/pom.xml | 2 -- infra/common/pom.xml | 5 ---- infra/expr/type/espresso/pom.xml | 4 --- kernel/sql-translator/provider/jooq/pom.xml | 4 --- kernel/transaction/type/base/seata-at/pom.xml | 4 --- .../type/xa/provider/atomikos/pom.xml | 4 --- .../type/xa/provider/narayana/pom.xml | 6 ----- .../repository/provider/consul/pom.xml | 5 ---- .../cluster/repository/provider/etcd/pom.xml | 4 --- pom.xml | 25 +++++++++++++++++++ test/e2e/agent/plugins/common/pom.xml | 4 --- test/e2e/agent/plugins/tracing/zipkin/pom.xml | 1 - test/e2e/fixture/pom.xml | 3 --- test/e2e/operation/transaction/pom.xml | 5 ---- test/it/parser/pom.xml | 2 -- test/pom.xml | 2 -- 18 files changed, 25 insertions(+), 66 deletions(-) diff --git a/agent/plugins/metrics/type/prometheus/pom.xml b/agent/plugins/metrics/type/prometheus/pom.xml index 3bcd05c7edef1..3134c8c02d9ae 100644 --- a/agent/plugins/metrics/type/prometheus/pom.xml +++ b/agent/plugins/metrics/type/prometheus/pom.xml @@ -26,11 +26,6 @@ shardingsphere-agent-metrics-prometheus ${project.artifactId} - - 0.11.0 - 0.16.1 - - org.apache.shardingsphere diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml b/agent/plugins/tracing/type/opentelemetry/pom.xml index 534f38bb65aff..bf11374dff2de 100644 --- a/agent/plugins/tracing/type/opentelemetry/pom.xml +++ b/agent/plugins/tracing/type/opentelemetry/pom.xml @@ -26,12 +26,6 @@ shardingsphere-agent-tracing-opentelemetry ${project.artifactId} - - 1.31.0 - 4.12.0 - 1.9.10 - - diff --git a/distribution/pom.xml b/distribution/pom.xml index 7441862989309..65ba928155278 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -37,8 +37,6 @@ true - - 1.10 diff --git a/infra/common/pom.xml b/infra/common/pom.xml index 6861b2573e3ae..479cd2fdeed87 100644 --- a/infra/common/pom.xml +++ b/infra/common/pom.xml @@ -26,11 +26,6 @@ shardingsphere-infra-common ${project.artifactId} - - 1.0.0 - 4.9.10 - - org.apache.shardingsphere diff --git a/infra/expr/type/espresso/pom.xml b/infra/expr/type/espresso/pom.xml index 8d407a19f930e..dc79f259360d2 100644 --- a/infra/expr/type/espresso/pom.xml +++ b/infra/expr/type/espresso/pom.xml @@ -26,10 +26,6 @@ shardingsphere-infra-expr-espresso ${project.artifactId} - - 21.2.0 - - org.apache.shardingsphere diff --git a/kernel/sql-translator/provider/jooq/pom.xml b/kernel/sql-translator/provider/jooq/pom.xml index 795c161b9ad95..5b5ab693d07a1 100644 --- a/kernel/sql-translator/provider/jooq/pom.xml +++ b/kernel/sql-translator/provider/jooq/pom.xml @@ -26,10 +26,6 @@ shardingsphere-sql-translator-jooq-provider ${project.artifactId} - - 3.14.15 - - org.apache.shardingsphere diff --git a/kernel/transaction/type/base/seata-at/pom.xml b/kernel/transaction/type/base/seata-at/pom.xml index 7f888cc45b5ac..e6ef1c98ee45d 100644 --- a/kernel/transaction/type/base/seata-at/pom.xml +++ b/kernel/transaction/type/base/seata-at/pom.xml @@ -26,10 +26,6 @@ shardingsphere-transaction-base-seata-at ${project.artifactId} - - 1.6.1 - - org.apache.shardingsphere diff --git a/kernel/transaction/type/xa/provider/atomikos/pom.xml b/kernel/transaction/type/xa/provider/atomikos/pom.xml index e0f8f3967dde8..610676709d6fe 100644 --- a/kernel/transaction/type/xa/provider/atomikos/pom.xml +++ b/kernel/transaction/type/xa/provider/atomikos/pom.xml @@ -26,10 +26,6 @@ shardingsphere-transaction-xa-atomikos ${project.artifactId} - - 6.0.0 - - diff --git a/kernel/transaction/type/xa/provider/narayana/pom.xml b/kernel/transaction/type/xa/provider/narayana/pom.xml index 918b9adf6836b..5d53c349f67b1 100644 --- a/kernel/transaction/type/xa/provider/narayana/pom.xml +++ b/kernel/transaction/type/xa/provider/narayana/pom.xml @@ -26,12 +26,6 @@ shardingsphere-transaction-xa-narayana ${project.artifactId} - - 5.12.4.Final - 7.6.0.Final - 3.2.1.Final - - org.apache.shardingsphere diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml index 8822b875db8e9..ef9be694cd132 100644 --- a/mode/type/cluster/repository/provider/consul/pom.xml +++ b/mode/type/cluster/repository/provider/consul/pom.xml @@ -26,11 +26,6 @@ shardingsphere-cluster-mode-repository-consul ${project.artifactId} - - 1.4.1 - 4.5.13 - - diff --git a/mode/type/cluster/repository/provider/etcd/pom.xml b/mode/type/cluster/repository/provider/etcd/pom.xml index faf4162e868e8..5ee4b8281080c 100644 --- a/mode/type/cluster/repository/provider/etcd/pom.xml +++ b/mode/type/cluster/repository/provider/etcd/pom.xml @@ -26,10 +26,6 @@ shardingsphere-cluster-mode-repository-etcd ${project.artifactId} - - 0.7.6 - - diff --git a/pom.xml b/pom.xml index 3928a75a5e9cf..a3c209684bd19 100644 --- a/pom.xml +++ b/pom.xml @@ -91,14 +91,24 @@ 2.9.3 1.1 + 6.0.0 + 5.12.4.Final + 7.6.0.Final + 3.2.1.Final + 1.6.1 4.1.99.Final 1.70 3.9.0 5.5.0 + 0.7.6 + 1.4.1 + 1.58.0 3.21.12 + 4.5.13 + 4.12.0 3.0.4 @@ -118,10 +128,22 @@ 4.0.3 + 3.14.15 + + 0.11.0 + 0.16.1 + 1.31.0 + 4.12.0 + 1.9.10 + 5.10.0 2.2 4.11.0 4.2.0 + 1.17.3 + 1.9.0 + + 21.2.0 0.6.1 @@ -131,6 +153,8 @@ 0.9.27 + 1.0.0 + 4.9.10 3.2.1 3.11.0 3.3.1 @@ -147,6 +171,7 @@ 3.0.0 3.5.0 3.4.1 + 1.10 0.15 diff --git a/test/e2e/agent/plugins/common/pom.xml b/test/e2e/agent/plugins/common/pom.xml index fe08d01dc23ae..508e7693e6b09 100644 --- a/test/e2e/agent/plugins/common/pom.xml +++ b/test/e2e/agent/plugins/common/pom.xml @@ -26,10 +26,6 @@ shardingsphere-test-e2e-agent-plugins-common ${project.artifactId} - - 4.12.0 - - org.apache.shardingsphere diff --git a/test/e2e/agent/plugins/tracing/zipkin/pom.xml b/test/e2e/agent/plugins/tracing/zipkin/pom.xml index adfee2e22cdc6..15e627e5481e5 100644 --- a/test/e2e/agent/plugins/tracing/zipkin/pom.xml +++ b/test/e2e/agent/plugins/tracing/zipkin/pom.xml @@ -28,7 +28,6 @@ true - 8.0.31 target/proxy ${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml index f39d53c376691..b4a19efe4e300 100644 --- a/test/e2e/fixture/pom.xml +++ b/test/e2e/fixture/pom.xml @@ -29,9 +29,6 @@ true true - 5.12.4.Final - 7.6.0.Final - 3.2.1.Final diff --git a/test/e2e/operation/transaction/pom.xml b/test/e2e/operation/transaction/pom.xml index 44814ec0338dc..318cf530b3a14 100644 --- a/test/e2e/operation/transaction/pom.xml +++ b/test/e2e/operation/transaction/pom.xml @@ -28,11 +28,6 @@ true - - 6.0.0 - 5.12.4.Final - 7.6.0.Final - 3.2.1.Final diff --git a/test/it/parser/pom.xml b/test/it/parser/pom.xml index 2346de0725f0d..4691c9ea3a419 100644 --- a/test/it/parser/pom.xml +++ b/test/it/parser/pom.xml @@ -28,8 +28,6 @@ true - - 1.9.0 diff --git a/test/pom.xml b/test/pom.xml index 5d44311bf1013..0bd3555cb7819 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -37,8 +37,6 @@ true - - 1.17.3 From ed6ed44d600909f91adf63734d35dd2034f2be6f Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 22 Oct 2023 21:15:28 +0800 Subject: [PATCH 2/4] Aggregate version to root pom --- examples/pom.xml | 2 +- pom.xml | 3 +-- test/e2e/agent/plugins/logging/file/pom.xml | 1 - test/e2e/agent/plugins/metrics/prometheus/pom.xml | 1 - test/e2e/agent/plugins/tracing/jaeger/pom.xml | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index c73abf5946f84..2d23f78bad8af 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -41,7 +41,7 @@ 5.2.15.RELEASE 2.3.12.RELEASE 3.4.2 - 5.1.49 + 8.0.31 42.4.3 2.2.224 1.7.7 diff --git a/pom.xml b/pom.xml index a3c209684bd19..d9f9a645413da 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 1.18.30 42.4.3 - 5.1.49 + 8.0.31 6.1.7.jre8-preview 1.7.1 2.2.224 @@ -133,7 +133,6 @@ 0.11.0 0.16.1 1.31.0 - 4.12.0 1.9.10 5.10.0 diff --git a/test/e2e/agent/plugins/logging/file/pom.xml b/test/e2e/agent/plugins/logging/file/pom.xml index 994014bbff1c2..7581a9390cf76 100644 --- a/test/e2e/agent/plugins/logging/file/pom.xml +++ b/test/e2e/agent/plugins/logging/file/pom.xml @@ -28,7 +28,6 @@ true - 8.0.31 target/proxy ${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml diff --git a/test/e2e/agent/plugins/metrics/prometheus/pom.xml b/test/e2e/agent/plugins/metrics/prometheus/pom.xml index cf47efa087b7f..bfe0fd51569f6 100644 --- a/test/e2e/agent/plugins/metrics/prometheus/pom.xml +++ b/test/e2e/agent/plugins/metrics/prometheus/pom.xml @@ -28,7 +28,6 @@ true - 8.0.31 target/proxy ${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml diff --git a/test/e2e/agent/plugins/tracing/jaeger/pom.xml b/test/e2e/agent/plugins/tracing/jaeger/pom.xml index 237302d604077..073d42af90084 100644 --- a/test/e2e/agent/plugins/tracing/jaeger/pom.xml +++ b/test/e2e/agent/plugins/tracing/jaeger/pom.xml @@ -28,7 +28,6 @@ true - 8.0.31 target/proxy ${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml From 6ccd848dd76df46db5b36f5e0e1f6b733ec63664 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 22 Oct 2023 21:35:27 +0800 Subject: [PATCH 3/4] Aggregate version to root pom --- .../dialect/MySQLXAConnectionWrapperTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java index dc12cc374bf35..a0958acdcc3bd 100644 --- a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java +++ b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.transaction.xa.jta.connection.dialect; -import com.mysql.jdbc.jdbc2.optional.JDBC4MysqlXAConnection; +import com.mysql.cj.jdbc.MysqlXAConnection; import com.zaxxer.hikari.HikariDataSource; -import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; +import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.transaction.xa.fixture.DataSourceUtils; import org.apache.shardingsphere.transaction.xa.jta.connection.XAConnectionWrapper; @@ -34,8 +34,9 @@ import java.sql.Connection; import java.sql.SQLException; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -46,7 +47,7 @@ class MySQLXAConnectionWrapperTest { @Test void assertWrap() throws SQLException { XAConnection actual = DatabaseTypedSPILoader.getService(XAConnectionWrapper.class, databaseType).wrap(createXADataSource(), mockConnection()); - assertThat(actual.getXAResource(), instanceOf(JDBC4MysqlXAConnection.class)); + assertThat(actual.getXAResource().getClass(), is(MysqlXAConnection.class)); } private XADataSource createXADataSource() { @@ -56,7 +57,7 @@ private XADataSource createXADataSource() { private Connection mockConnection() throws SQLException { Connection result = mock(Connection.class); - when(result.unwrap(com.mysql.jdbc.Connection.class)).thenReturn(mock(com.mysql.jdbc.Connection.class)); + when(result.unwrap(com.mysql.cj.jdbc.JdbcConnection.class)).thenReturn(mock(com.mysql.cj.jdbc.JdbcConnection.class, RETURNS_DEEP_STUBS)); return result; } } From 4b9291c6b779d64b23faf246679d3286f4f5d621 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Sun, 22 Oct 2023 22:17:03 +0800 Subject: [PATCH 4/4] Aggregate version to root pom --- .../jta/connection/dialect/MySQLXAConnectionWrapperTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java index a0958acdcc3bd..03a5fe17bcf74 100644 --- a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java +++ b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java @@ -17,6 +17,7 @@ package org.apache.shardingsphere.transaction.xa.jta.connection.dialect; +import com.mysql.cj.jdbc.JdbcConnection; import com.mysql.cj.jdbc.MysqlXAConnection; import com.zaxxer.hikari.HikariDataSource; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; @@ -57,7 +58,7 @@ private XADataSource createXADataSource() { private Connection mockConnection() throws SQLException { Connection result = mock(Connection.class); - when(result.unwrap(com.mysql.cj.jdbc.JdbcConnection.class)).thenReturn(mock(com.mysql.cj.jdbc.JdbcConnection.class, RETURNS_DEEP_STUBS)); + when(result.unwrap(JdbcConnection.class)).thenReturn(mock(JdbcConnection.class, RETURNS_DEEP_STUBS)); return result; } }