Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aggregate version declaration to root pom #28837

Merged
merged 5 commits into from
Oct 23, 2023
Merged

Aggregate version declaration to root pom #28837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0985ba9
Aggregate version to root pom
terrymanu Oct 22, 2023
ed6ed44
Aggregate version to root pom
terrymanu Oct 22, 2023
6ccd848
Aggregate version to root pom
terrymanu Oct 22, 2023
4b9291c
Aggregate version to root pom
terrymanu Oct 22, 2023
d30a660
Merge branch 'master' into dev
terrymanu Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions agent/plugins/metrics/type/prometheus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions agent/plugins/tracing/type/opentelemetry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>

<checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions infra/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions infra/expr/type/espresso/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions kernel/sql-translator/provider/jooq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions kernel/transaction/type/base/seata-at/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 7 additions & 5 deletions ...he/shardingsphere/transaction/xa/jta/connection/dialect/MySQLXAConnectionWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -34,8 +35,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;

Expand All @@ -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() {
Expand All @@ -56,7 +58,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(JdbcConnection.class)).thenReturn(mock(JdbcConnection.class, RETURNS_DEEP_STUBS));
return result;
}
}
4 changes: 0 additions & 4 deletions kernel/transaction/type/xa/provider/atomikos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions kernel/transaction/type/xa/provider/narayana/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions mode/type/cluster/repository/provider/consul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions mode/type/cluster/repository/provider/etcd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
27 changes: 26 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/agent/plugins/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion test/e2e/agent/plugins/logging/file/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion test/e2e/agent/plugins/metrics/prometheus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion test/e2e/agent/plugins/tracing/jaeger/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion test/e2e/agent/plugins/tracing/zipkin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions test/e2e/fixture/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions test/e2e/operation/transaction/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions test/it/parser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>

<commons-csv.version>1.9.0</commons-csv.version>
</properties>

<dependencies>
Expand Down
2 changes: 0 additions & 2 deletions test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>

<testcontainers.version>1.17.3</testcontainers.version>
</properties>

<dependencyManagement>
Expand Down
Loading