This is an automated email from the ASF dual-hosted git repository.
panjuan 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 edbd026 Unify declaration of bytebuddy (#16033)
edbd026 is described below
commit edbd02672960d51a988ce788b4dddd6cfa72c84b
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 13 20:35:41 2022 +0800
Unify declaration of bytebuddy (#16033)
---
pom.xml | 23 +++++++++++------
shardingsphere-agent/pom.xml | 3 ---
.../shardingsphere-agent-tracing-test/pom.xml | 30 +++++++++++-----------
.../pom.xml | 10 +++++---
4 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7977a4e..fb002cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,31 +61,29 @@
<commons-collections4.version>4.2</commons-collections4.version>
<commons-codec.version>1.15</commons-codec.version>
- <jaxb.version>2.3.0</jaxb.version>
- <annotation-api.version>1.3.2</annotation-api.version>
- <activation-api.version>1.2.0</activation-api.version>
-
- <bytebuddy.version>1.11.18</bytebuddy.version>
-
<antlr4.version>4.9.2</antlr4.version>
<snakeyaml.version>1.30</snakeyaml.version>
<gson.version>2.8.6</gson.version>
<groovy.version>4.0.0</groovy.version>
+ <jaxb.version>2.3.0</jaxb.version>
+ <annotation-api.version>1.3.2</annotation-api.version>
+ <activation-api.version>1.2.0</activation-api.version>
+
<calcite.version>1.27.0</calcite.version>
<vertx.version>4.2.3</vertx.version>
<netty.version>4.1.73.Final</netty.version>
<javax.transaction.version>1.1</javax.transaction.version>
<atomikos.version>5.0.8</atomikos.version>
- <seata.version>1.4.2</seata.version>
<narayana.version>5.9.1.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>
<btm.version>2.1.3</btm.version>
+ <seata.version>1.4.2</seata.version>
- <curator.version>5.1.0</curator.version>
<zookeeper.version>3.6.0</zookeeper.version>
+ <curator.version>5.1.0</curator.version>
<jetcd.version>0.5.0</jetcd.version>
<elasticjob.version>3.0.1</elasticjob.version>
@@ -93,6 +91,8 @@
<springframework.version>[4.3.6.RELEASE,5.0.0.M1)</springframework.version>
<spring-boot.version>[1.5.20.RELEASE,2.0.0.M1)</spring-boot.version>
+ <bytebuddy.version>1.11.18</bytebuddy.version>
+
<cosid.version>1.8.6</cosid.version>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
@@ -157,6 +157,13 @@
<version>${bytebuddy.version}</version>
</dependency>
<dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>${bytebuddy.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
diff --git a/shardingsphere-agent/pom.xml b/shardingsphere-agent/pom.xml
index 9c1f4ef..8f643c9 100644
--- a/shardingsphere-agent/pom.xml
+++ b/shardingsphere-agent/pom.xml
@@ -46,13 +46,10 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>${bytebuddy.version}</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>${bytebuddy.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
index 5fb2fdb..285b5e3 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
@@ -27,31 +27,20 @@
</parent>
<artifactId>shardingsphere-agent-tracing-test</artifactId>
<name>${project.artifactId}</name>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-proxy-frontend-core</artifactId>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>${bytebuddy.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
@@ -64,8 +53,19 @@
<version>${opentracing.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/pom.xml
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/pom.xml
index 607d292..f0a891f 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/pom.xml
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/pom.xml
@@ -38,10 +38,7 @@
<artifactId>shardingsphere-infra-binder</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-sql-parser-sql92</artifactId>
@@ -78,5 +75,10 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
+ </dependency>
</dependencies>
</project>
