This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 50a43f290e [type:feature] arrange sofa common tools dependencies
(#5609)
50a43f290e is described below
commit 50a43f290e20d9d34601c5f32d330b1c37f5a965
Author: aias00 <rok...@163.com>
AuthorDate: Wed Aug 7 17:08:42 2024 +0800
[type:feature] arrange sofa common tools dependencies (#5609)
* [type:feature] arrange bootstrap dependencies
* [type:feature] arrange sofa dependencies
* [type:feature] arrange sofa dependencies
* [type:feature] arrange sofa dependencies
* [type:feature] arrange sofa dependencies
---------
Co-authored-by: xiaoyu <xia...@apache.org>
---
pom.xml | 1 +
shenyu-bootstrap/pom.xml | 15 +++++++++
shenyu-client/shenyu-client-sofa/pom.xml | 2 +-
.../src/main/release-docs/LICENSE | 2 +-
.../shenyu-examples-sofa-service/pom.xml | 37 +++++++++++-----------
.../shenyu-integrated-test-combination/pom.xml | 9 ++++++
.../pom.xml | 9 ++++++
.../shenyu-integrated-test-sofa/pom.xml | 9 ++++++
8 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 210184c5dd..9531b12c38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@
<prometheus-jmx.version>0.15.0</prometheus-jmx.version>
<springdoc.version>2.5.0</springdoc.version>
<sofa.rpc.version>5.13.0</sofa.rpc.version>
+ <sofa-common-tools.version>2.1.1</sofa-common-tools.version>
<tars.version>1.7.2</tars.version>
<curator.version>5.7.0</curator.version>
<wiremock.version>3.0.1</wiremock.version>
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index e3f8edbdb1..d1d69d3bf4 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -260,6 +260,21 @@
<artifactId>okio</artifactId>
<groupId>com.squareup.okio</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>sofa-common-tools</artifactId>
+ <groupId>com.alipay.sofa.common</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.alipay.sofa.common</groupId>
+ <artifactId>sofa-common-tools</artifactId>
+ <version>${sofa-common-tools.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/shenyu-client/shenyu-client-sofa/pom.xml
b/shenyu-client/shenyu-client-sofa/pom.xml
index fdb74f0fd5..10cdc1a0aa 100644
--- a/shenyu-client/shenyu-client-sofa/pom.xml
+++ b/shenyu-client/shenyu-client-sofa/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>com.alipay.sofa.common</groupId>
<artifactId>sofa-common-tools</artifactId>
- <version>2.1.1</version>
+ <version>${sofa-common-tools.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
b/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
index 44fd3fd788..bf7f9cc0be 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
+++ b/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
@@ -432,7 +432,7 @@ The text of each license is the standard Apache 2.0 license.
simpleclient 0.15.0: https://github.com/prometheus/client_java, Apache 2.0
snakeyaml 1.30: http://www.snakeyaml.org, Apache 2.0
snappy-java 1.1.8.4: https://github.com/xerial/snappy-java, Apache 2.0
- sofa-common-tools 1.0.18:
https://github.com/sofastack/sofa-common-tools/sofa-common-tools, Apache 2.0
+ sofa-common-tools 2.1.1:
https://github.com/sofastack/sofa-common-tools/sofa-common-tools, Apache 2.0
sofa-rpc-all 5.7.6: http://github.com/sofastack/sofa-rpc, Apache 2.0
spring-aop 5.3.30:
https://mvnrepository.com/artifact/org.springframework/spring-aop, Apache 2.0
spring-beans 5.3.30:
https://mvnrepository.com/artifact/org.springframework/spring-beans, Apache 2.0
diff --git
a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
index 40c1a06c76..6cef108616 100644
--- a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
+++ b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
@@ -32,6 +32,14 @@
<runtime-sofa-boot-starter.version>4.3.0</runtime-sofa-boot-starter.version>
<curator.version>4.3.0</curator.version>
<micrometer.version>1.13.1</micrometer.version>
+ <sofa-common-tools.version>2.1.1</sofa-common-tools.version>
+ <commons-io.version>2.15.1</commons-io.version>
+ <httpclient.version>4.5.13</httpclient.version>
+ <protobuf-java.version>3.21.7</protobuf-java.version>
+ <zookeeper.version>3.5.7</zookeeper.version>
+ <guava.version>32.1.2-jre</guava.version>
+ <grpc.version>1.53.0</grpc.version>
+ <auto-value-annotations.version>1.9</auto-value-annotations.version>
</properties>
<dependencies>
@@ -90,7 +98,7 @@
<dependency>
<groupId>com.alipay.sofa.common</groupId>
<artifactId>sofa-common-tools</artifactId>
- <version>2.1.1</version>
+ <version>${sofa-common-tools.version}</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@@ -101,12 +109,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.15.1</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.13</version>
+ <version>${httpclient.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
@@ -117,7 +125,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.21.7</version>
+ <version>${protobuf-java.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -127,7 +135,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.5.7</version>
+ <version>${zookeeper.version}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-reload4j</artifactId>
@@ -138,24 +146,23 @@
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
- <version>1.9</version>
+ <version>${auto-value-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>32.1.2-jre</version>
- <scope>compile</scope>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
- <version>1.53.0</version>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>1.53.0</version>
+ <version>${grpc.version}</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@@ -166,7 +173,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>1.53.0</version>
+ <version>${grpc.version}</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@@ -201,13 +208,6 @@
<version>${curator.version}</version>
</dependency>
- <!--shenyu consul register center -->
- <!--<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-consul-discovery</artifactId>
- <version>2.2.6.RELEASE</version>
- </dependency>-->
-
<dependency>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples-sofa-api</artifactId>
@@ -264,7 +264,6 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>${micrometer.version}</version>
- <scope>compile</scope>
</dependency>
</dependencies>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
index 0e25eb8ae8..9bc2f71cb1 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
@@ -165,8 +165,17 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>sofa-common-tools</artifactId>
+ <groupId>com.alipay.sofa.common</groupId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.alipay.sofa.common</groupId>
+ <artifactId>sofa-common-tools</artifactId>
+ <version>${sofa-common-tools.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-spring-boot-starter-plugin-sofa</artifactId>
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/pom.xml
index 9c2620a830..0ac0f6c895 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-sofa/pom.xml
@@ -52,8 +52,17 @@
<artifactId>grpc-context</artifactId>
<groupId>io.grpc</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>sofa-common-tools</artifactId>
+ <groupId>com.alipay.sofa.common</groupId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.alipay.sofa.common</groupId>
+ <artifactId>sofa-common-tools</artifactId>
+ <version>${sofa-common-tools.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
index a6a25f1aa1..cb8ea8e5ad 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
@@ -83,8 +83,17 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>sofa-common-tools</artifactId>
+ <groupId>com.alipay.sofa.common</groupId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.alipay.sofa.common</groupId>
+ <artifactId>sofa-common-tools</artifactId>
+ <version>${sofa-common-tools.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-spring-boot-starter-plugin-sofa</artifactId>
