This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 9b8066914d2 Aggregate version declaration to root pom (#28837)
9b8066914d2 is described below
commit 9b8066914d2e1a51cbfd9bc2603c1208b8fcf8d6
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Oct 23 19:11:09 2023 +0800
Aggregate version declaration to root pom (#28837)
* Aggregate version to root pom
* Aggregate version to root pom
* Aggregate version to root pom
* Aggregate version to root pom
---
agent/plugins/metrics/type/prometheus/pom.xml | 5 ----
agent/plugins/tracing/type/opentelemetry/pom.xml | 6 -----
distribution/pom.xml | 2 --
examples/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 ----
.../dialect/MySQLXAConnectionWrapperTest.java | 12 ++++++----
.../transaction/type/xa/provider/atomikos/pom.xml | 4 ----
.../transaction/type/xa/provider/narayana/pom.xml | 6 -----
.../cluster/repository/provider/consul/pom.xml | 5 ----
mode/type/cluster/repository/provider/etcd/pom.xml | 4 ----
pom.xml | 27 +++++++++++++++++++++-
test/e2e/agent/plugins/common/pom.xml | 4 ----
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 -
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 --
23 files changed, 34 insertions(+), 76 deletions(-)
diff --git a/agent/plugins/metrics/type/prometheus/pom.xml
b/agent/plugins/metrics/type/prometheus/pom.xml
index 3bcd05c7ede..3134c8c02d9 100644
--- a/agent/plugins/metrics/type/prometheus/pom.xml
+++ b/agent/plugins/metrics/type/prometheus/pom.xml
@@ -26,11 +26,6 @@
<artifactId>shardingsphere-agent-metrics-prometheus</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <prometheus.version>0.11.0</prometheus.version>
- <prometheus.jmx.version>0.16.1</prometheus.jmx.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml
b/agent/plugins/tracing/type/opentelemetry/pom.xml
index 534f38bb65a..bf11374dff2 100644
--- a/agent/plugins/tracing/type/opentelemetry/pom.xml
+++ b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -26,12 +26,6 @@
<artifactId>shardingsphere-agent-tracing-opentelemetry</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <opentelemetry-bom.version>1.31.0</opentelemetry-bom.version>
- <okhttp.version>4.12.0</okhttp.version>
- <kotlin-stdlib.version>1.9.10</kotlin-stdlib.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 74418629893..65ba9281552 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -37,8 +37,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
-
- <checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
</properties>
<build>
diff --git a/examples/pom.xml b/examples/pom.xml
index c73abf5946f..2d23f78bad8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -41,7 +41,7 @@
<spring-framework.version>5.2.15.RELEASE</spring-framework.version>
<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<hikari-cp.version>3.4.2</hikari-cp.version>
- <mysql-connector-java.version>5.1.49</mysql-connector-java.version>
+ <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<postgresql.version>42.4.3</postgresql.version>
<h2.version>2.2.224</h2.version>
<slf4j.version>1.7.7</slf4j.version>
diff --git a/infra/common/pom.xml b/infra/common/pom.xml
index 6861b2573e3..479cd2fdeed 100644
--- a/infra/common/pom.xml
+++ b/infra/common/pom.xml
@@ -26,11 +26,6 @@
<artifactId>shardingsphere-infra-common</artifactId>
<name>${project.artifactId}</name>
- <properties>
-
<templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>
- <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/infra/expr/type/espresso/pom.xml b/infra/expr/type/espresso/pom.xml
index 8d407a19f93..dc79f259360 100644
--- a/infra/expr/type/espresso/pom.xml
+++ b/infra/expr/type/espresso/pom.xml
@@ -26,10 +26,6 @@
<artifactId>shardingsphere-infra-expr-espresso</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <graalvm.version>21.2.0</graalvm.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/kernel/sql-translator/provider/jooq/pom.xml
b/kernel/sql-translator/provider/jooq/pom.xml
index 795c161b9ad..5b5ab693d07 100644
--- a/kernel/sql-translator/provider/jooq/pom.xml
+++ b/kernel/sql-translator/provider/jooq/pom.xml
@@ -26,10 +26,6 @@
<artifactId>shardingsphere-sql-translator-jooq-provider</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <jooq.version>3.14.15</jooq.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/kernel/transaction/type/base/seata-at/pom.xml
b/kernel/transaction/type/base/seata-at/pom.xml
index 7f888cc45b5..e6ef1c98ee4 100644
--- a/kernel/transaction/type/base/seata-at/pom.xml
+++ b/kernel/transaction/type/base/seata-at/pom.xml
@@ -26,10 +26,6 @@
<artifactId>shardingsphere-transaction-base-seata-at</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <seata.version>1.6.1</seata.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
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 dc12cc374bf..03a5fe17bcf 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,11 @@
package org.apache.shardingsphere.transaction.xa.jta.connection.dialect;
-import com.mysql.jdbc.jdbc2.optional.JDBC4MysqlXAConnection;
+import com.mysql.cj.jdbc.JdbcConnection;
+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 +35,9 @@ import javax.sql.XADataSource;
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 +48,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 +58,7 @@ class MySQLXAConnectionWrapperTest {
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(JdbcConnection.class)).thenReturn(mock(JdbcConnection.class,
RETURNS_DEEP_STUBS));
return result;
}
}
diff --git a/kernel/transaction/type/xa/provider/atomikos/pom.xml
b/kernel/transaction/type/xa/provider/atomikos/pom.xml
index e0f8f3967dd..610676709d6 100644
--- a/kernel/transaction/type/xa/provider/atomikos/pom.xml
+++ b/kernel/transaction/type/xa/provider/atomikos/pom.xml
@@ -26,10 +26,6 @@
<artifactId>shardingsphere-transaction-xa-atomikos</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <atomikos.version>6.0.0</atomikos.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/kernel/transaction/type/xa/provider/narayana/pom.xml
b/kernel/transaction/type/xa/provider/narayana/pom.xml
index 918b9adf683..5d53c349f67 100644
--- a/kernel/transaction/type/xa/provider/narayana/pom.xml
+++ b/kernel/transaction/type/xa/provider/narayana/pom.xml
@@ -26,12 +26,6 @@
<artifactId>shardingsphere-transaction-xa-narayana</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <narayana.version>5.12.4.Final</narayana.version>
-
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
- <jboss-logging.version>3.2.1.Final</jboss-logging.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/mode/type/cluster/repository/provider/consul/pom.xml
b/mode/type/cluster/repository/provider/consul/pom.xml
index 8822b875db8..ef9be694cd1 100644
--- a/mode/type/cluster/repository/provider/consul/pom.xml
+++ b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -26,11 +26,6 @@
<artifactId>shardingsphere-cluster-mode-repository-consul</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <consul.api.version>1.4.1</consul.api.version>
- <httpclient.version>4.5.13</httpclient.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/mode/type/cluster/repository/provider/etcd/pom.xml
b/mode/type/cluster/repository/provider/etcd/pom.xml
index faf4162e868..5ee4b828108 100644
--- a/mode/type/cluster/repository/provider/etcd/pom.xml
+++ b/mode/type/cluster/repository/provider/etcd/pom.xml
@@ -26,10 +26,6 @@
<artifactId>shardingsphere-cluster-mode-repository-etcd</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <jetcd.version>0.7.6</jetcd.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index f2caa18f101..a3e4ac7048a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,14 +91,24 @@
<immutables.version>2.9.3</immutables.version>
<javax.transaction.version>1.1</javax.transaction.version>
+ <atomikos.version>6.0.0</atomikos.version>
+ <narayana.version>5.12.4.Final</narayana.version>
+
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
+ <jboss-logging.version>3.2.1.Final</jboss-logging.version>
+ <seata.version>1.6.1</seata.version>
<netty.version>4.1.99.Final</netty.version>
<bouncycastle.version>1.70</bouncycastle.version>
<zookeeper.version>3.9.0</zookeeper.version>
<curator.version>5.5.0</curator.version>
+ <jetcd.version>0.7.6</jetcd.version>
+ <consul.api.version>1.4.1</consul.api.version>
+
<grpc.version>1.58.0</grpc.version>
<protobuf.version>3.21.12</protobuf.version>
+ <httpclient.version>4.5.13</httpclient.version>
+ <okhttp.version>4.12.0</okhttp.version>
<elasticjob.version>3.0.4</elasticjob.version>
@@ -109,7 +119,7 @@
<lombok.version>1.18.30</lombok.version>
<postgresql.version>42.4.3</postgresql.version>
- <mysql-connector-java.version>5.1.49</mysql-connector-java.version>
+ <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<mssql.version>6.1.7.jre8-preview</mssql.version>
<hbase.client.version>1.7.1</hbase.client.version>
<h2.version>2.2.224</h2.version>
@@ -118,10 +128,21 @@
<hikari-cp.version>4.0.3</hikari-cp.version>
+ <jooq.version>3.14.15</jooq.version>
+
+ <prometheus.version>0.11.0</prometheus.version>
+ <prometheus.jmx.version>0.16.1</prometheus.jmx.version>
+ <opentelemetry-bom.version>1.31.0</opentelemetry-bom.version>
+ <kotlin-stdlib.version>1.9.10</kotlin-stdlib.version>
+
<junit.version>5.10.0</junit.version>
<hamcrest.version>2.2</hamcrest.version>
<mockito.version>4.11.0</mockito.version>
<awaitility.version>4.2.0</awaitility.version>
+ <testcontainers.version>1.17.3</testcontainers.version>
+ <commons-csv.version>1.9.0</commons-csv.version>
+
+ <graalvm.version>21.2.0</graalvm.version>
<!-- 3rd party library plugin versions -->
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
@@ -131,6 +152,8 @@
<native-maven-plugin.version>0.9.27</native-maven-plugin.version>
<!-- Compile plugin versions -->
+
<templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>
+ <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
@@ -146,7 +169,9 @@
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-release-plugin.version>3.0.0</maven-release-plugin.version>
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
+
<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
+ <checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
<!-- Check plugin versions -->
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
diff --git a/test/e2e/agent/plugins/common/pom.xml
b/test/e2e/agent/plugins/common/pom.xml
index fe08d01dc23..508e7693e6b 100644
--- a/test/e2e/agent/plugins/common/pom.xml
+++ b/test/e2e/agent/plugins/common/pom.xml
@@ -26,10 +26,6 @@
<artifactId>shardingsphere-test-e2e-agent-plugins-common</artifactId>
<name>${project.artifactId}</name>
- <properties>
- <okhttp.version>4.12.0</okhttp.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/test/e2e/agent/plugins/logging/file/pom.xml
b/test/e2e/agent/plugins/logging/file/pom.xml
index 994014bbff1..7581a9390cf 100644
--- a/test/e2e/agent/plugins/logging/file/pom.xml
+++ b/test/e2e/agent/plugins/logging/file/pom.xml
@@ -28,7 +28,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
- <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<docker.proxy.context.directory>target/proxy</docker.proxy.context.directory>
<docker.proxy.compose.file>${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml</docker.proxy.compose.file>
diff --git a/test/e2e/agent/plugins/metrics/prometheus/pom.xml
b/test/e2e/agent/plugins/metrics/prometheus/pom.xml
index cf47efa087b..bfe0fd51569 100644
--- a/test/e2e/agent/plugins/metrics/prometheus/pom.xml
+++ b/test/e2e/agent/plugins/metrics/prometheus/pom.xml
@@ -28,7 +28,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
- <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<docker.proxy.context.directory>target/proxy</docker.proxy.context.directory>
<docker.proxy.compose.file>${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml</docker.proxy.compose.file>
diff --git a/test/e2e/agent/plugins/tracing/jaeger/pom.xml
b/test/e2e/agent/plugins/tracing/jaeger/pom.xml
index 237302d6040..073d42af900 100644
--- a/test/e2e/agent/plugins/tracing/jaeger/pom.xml
+++ b/test/e2e/agent/plugins/tracing/jaeger/pom.xml
@@ -28,7 +28,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
- <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<docker.proxy.context.directory>target/proxy</docker.proxy.context.directory>
<docker.proxy.compose.file>${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml</docker.proxy.compose.file>
diff --git a/test/e2e/agent/plugins/tracing/zipkin/pom.xml
b/test/e2e/agent/plugins/tracing/zipkin/pom.xml
index adfee2e22cd..15e627e5481 100644
--- a/test/e2e/agent/plugins/tracing/zipkin/pom.xml
+++ b/test/e2e/agent/plugins/tracing/zipkin/pom.xml
@@ -28,7 +28,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
- <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
<docker.proxy.context.directory>target/proxy</docker.proxy.context.directory>
<docker.proxy.compose.file>${project.basedir}/src/test/resources/docker/proxy/docker-compose.yml</docker.proxy.compose.file>
diff --git a/test/e2e/fixture/pom.xml b/test/e2e/fixture/pom.xml
index f39d53c3766..b4a19efe4e3 100644
--- a/test/e2e/fixture/pom.xml
+++ b/test/e2e/fixture/pom.xml
@@ -29,9 +29,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<dockerfile.skip.build>true</dockerfile.skip.build>
- <narayana.version>5.12.4.Final</narayana.version>
-
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
- <jboss-logging.version>3.2.1.Final</jboss-logging.version>
</properties>
<dependencies>
diff --git a/test/e2e/operation/transaction/pom.xml
b/test/e2e/operation/transaction/pom.xml
index 44814ec0338..318cf530b3a 100644
--- a/test/e2e/operation/transaction/pom.xml
+++ b/test/e2e/operation/transaction/pom.xml
@@ -28,11 +28,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
-
- <atomikos.version>6.0.0</atomikos.version>
- <narayana.version>5.12.4.Final</narayana.version>
-
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
- <jboss-logging.version>3.2.1.Final</jboss-logging.version>
</properties>
<dependencies>
diff --git a/test/it/parser/pom.xml b/test/it/parser/pom.xml
index 2346de0725f..4691c9ea3a4 100644
--- a/test/it/parser/pom.xml
+++ b/test/it/parser/pom.xml
@@ -28,8 +28,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
-
- <commons-csv.version>1.9.0</commons-csv.version>
</properties>
<dependencies>
diff --git a/test/pom.xml b/test/pom.xml
index 5d44311bf10..0bd3555cb78 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -37,8 +37,6 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
-
- <testcontainers.version>1.17.3</testcontainers.version>
</properties>
<dependencyManagement>
