This is an automated email from the ASF dual-hosted git repository.
gongchao 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 c1abc7bd7b Upgrade sofa rpc version support #5517 (#5526)
c1abc7bd7b is described below
commit c1abc7bd7bf50c03e9c2850c235574fb90223770
Author: aias00 <[email protected]>
AuthorDate: Mon Apr 1 21:59:34 2024 +0800
Upgrade sofa rpc version support #5517 (#5526)
* Upgrade sofa rpc version support #5517
* Upgrade sofa rpc version support #5517
* Upgrade sofa rpc version support #5517
* Upgrade sofa rpc version support #5517
* Upgrade sofa rpc version support #5517
* Upgrade sofa rpc version support #5517
* Upgrade sofa rpc version support #5517
* Upgrade sofa rpc version support, undo something #5517
* Upgrade sofa rpc version support #5517
---------
Co-authored-by: moremind <[email protected]>
---
pom.xml | 2 +-
shenyu-bootstrap/pom.xml | 9 ++++-
shenyu-client/shenyu-client-sofa/pom.xml | 14 +++++++-
.../shenyu-examples-sofa-service/pom.xml | 40 +++++++++++++---------
shenyu-integrated-test/pom.xml | 2 +-
.../shenyu-integrated-test-combination/pom.xml | 1 -
.../shenyu-integrated-test-sofa/pom.xml | 1 -
.../shenyu-spring-boot-starter-client-sofa/pom.xml | 6 +++-
8 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index caff8d24f3..70035d8d94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<prometheus-java-client.version>0.15.0</prometheus-java-client.version>
<prometheus-jmx.version>0.15.0</prometheus-jmx.version>
<springdoc.version>1.7.0</springdoc.version>
- <sofa.rpc.version>5.7.6</sofa.rpc.version>
+ <sofa.rpc.version>5.12.0</sofa.rpc.version>
<tars.version>1.7.2</tars.version>
<curator.version>4.3.0</curator.version>
<wiremock.version>2.18.0</wiremock.version>
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index d2397f4cc3..977ff9ca80 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -243,7 +243,6 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
- <version>5.7.6</version>
<exclusions>
<exclusion>
<groupId>net.jcip</groupId>
@@ -253,6 +252,14 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>commons-io</artifactId>
+ <groupId>commons-io</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>okio</artifactId>
+ <groupId>com.squareup.okio</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/shenyu-client/shenyu-client-sofa/pom.xml
b/shenyu-client/shenyu-client-sofa/pom.xml
index 4a61953408..3a56776d95 100644
--- a/shenyu-client/shenyu-client-sofa/pom.xml
+++ b/shenyu-client/shenyu-client-sofa/pom.xml
@@ -26,7 +26,7 @@
<artifactId>shenyu-client-sofa</artifactId>
<properties>
-
<runtime-sofa-boot-starter.version>3.1.4</runtime-sofa-boot-starter.version>
+
<runtime-sofa-boot-starter.version>3.22.0</runtime-sofa-boot-starter.version>
</properties>
<dependencies>
@@ -46,11 +46,23 @@
<artifactId>runtime-sofa-boot-starter</artifactId>
<version>${runtime-sofa-boot-starter.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>sofa-common-tools</artifactId>
+ <groupId>com.alipay.sofa.common</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>sofa-common-tools</artifactId>
+ <groupId>com.alipay.sofa.common</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
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 cc33d3b9fd..cd9c6430d7 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
@@ -28,36 +28,40 @@
<artifactId>shenyu-examples-sofa-service</artifactId>
<properties>
- <rpc-sofa-boot-starter.version>3.12.1</rpc-sofa-boot-starter.version>
+ <rpc-sofa-boot-starter.version>3.22.0</rpc-sofa-boot-starter.version>
+
<healthcheck-sofa-boot-starter.version>3.22.0</healthcheck-sofa-boot-starter.version>
<curator.version>4.3.0</curator.version>
<micrometer.version>1.8.6</micrometer.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.alipay.sofa</groupId>
- <artifactId>sofaboot-dependencies</artifactId>
- <version>${rpc-sofa-boot-starter.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
+ <dependency>
+ <groupId>com.alipay.sofa</groupId>
+ <artifactId>healthcheck-sofa-boot-starter</artifactId>
+ <version>${healthcheck-sofa-boot-starter.version}</version>
+ </dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>rpc-sofa-boot-starter</artifactId>
<version>${rpc-sofa-boot-starter.version}</version>
<exclusions>
<exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-core</artifactId>
+ <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>1.3.11</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
@@ -96,6 +100,10 @@
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>snakeyaml</artifactId>
+ <groupId>org.yaml</groupId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/shenyu-integrated-test/pom.xml b/shenyu-integrated-test/pom.xml
index b0b40d2560..b86e44ac13 100644
--- a/shenyu-integrated-test/pom.xml
+++ b/shenyu-integrated-test/pom.xml
@@ -62,7 +62,7 @@
<gson.version>2.9.0</gson.version>
<okhttp3.version>4.9.3</okhttp3.version>
<tars-client.version>1.7.2</tars-client.version>
- <sofa-rpc-all.version>5.7.6</sofa-rpc-all.version>
+ <sofa-rpc-all.version>5.12.0</sofa-rpc-all.version>
<curator.version>4.0.1</curator.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
</properties>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
index bc20dc3e95..d04c193e35 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
@@ -156,7 +156,6 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
- <version>5.7.6</version>
<exclusions>
<exclusion>
<groupId>net.jcip</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
index 3c3f4a2d87..8d55af88aa 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
- <version>5.7.6</version>
<exclusions>
<exclusion>
<groupId>net.jcip</groupId>
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/pom.xml
index d7515345eb..4eef658754 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/pom.xml
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/pom.xml
@@ -25,6 +25,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-spring-boot-starter-client-sofa</artifactId>
+ <properties>
+
<runtime-sofa-boot-starter.version>3.22.0</runtime-sofa-boot-starter.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
@@ -39,7 +43,7 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>runtime-sofa-boot-starter</artifactId>
- <version>3.1.4</version>
+ <version>${runtime-sofa-boot-starter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
