This is an automated email from the ASF dual-hosted git repository.
zhangzicheng 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 5595432c61 Upgrade apache dubbo version (#5527)
5595432c61 is described below
commit 5595432c61751023b7693f9ea70c02e0a8a767c6
Author: aias00 <rok...@163.com>
AuthorDate: Tue Apr 9 11:33:56 2024 +0800
Upgrade apache dubbo version (#5527)
* Upgrade apache dubbo version support #5523
* Upgrade apache dubbo version support #5523
* Upgrade apache dubbo version support #5523
* Upgrade apache dubbo version support, revert something #5523
* Upgrade apache dubbo version support #5523
* Upgrade apache dubbo version support #5523
* Upgrade apache dubbo version support #5523
---------
Co-authored-by: tomsun28 <tomsu...@outlook.com>
Co-authored-by: moremind <hefen...@apache.org>
Co-authored-by: loongs-zhang <zhangzich...@apache.org>
---
.github/filters.yml | 2 +-
.github/workflows/e2e-k8s.yml | 1 -
pom.xml | 2 +-
shenyu-bootstrap/pom.xml | 1 +
.../pom.xml | 15 ++++++++++++---
.../shenyu-examples-apache-dubbo-service-xml/pom.xml | 9 +++++++--
.../shenyu-examples-apache-dubbo-service/pom.xml | 17 ++++++++++++++---
.../shenyu-examples-sdk-apache-dubbo-provider/pom.xml | 17 ++++++++++++++---
.../shenyu-integrated-test-combination/pom.xml | 4 ++--
.../shenyu-integrated-test-rewrite/pom.xml | 4 ++--
.../shenyu-integrated-test-sdk-apache-dubbo/pom.xml | 19 +++++++++++++------
.../shenyu-plugin-apache-dubbo/pom.xml | 1 +
12 files changed, 68 insertions(+), 24 deletions(-)
diff --git a/.github/filters.yml b/.github/filters.yml
index 4b69840bdd..e84cb866f9 100644
--- a/.github/filters.yml
+++ b/.github/filters.yml
@@ -18,4 +18,4 @@ e2e:
LICENSE,NOTICE,\
Makefile,\
.github/(ISSUE_TEMPLATE/**|PULL_REQUEST_TEMPLATE)\
- }"
+ }"
\ No newline at end of file
diff --git a/.github/workflows/e2e-k8s.yml b/.github/workflows/e2e-k8s.yml
index dd161a6167..061b889b2f 100644
--- a/.github/workflows/e2e-k8s.yml
+++ b/.github/workflows/e2e-k8s.yml
@@ -281,7 +281,6 @@ jobs:
sudo k3s ctr images import /tmp/shenyu/apache-shenyu-admin.tar
sudo k3s ctr images import /tmp/shenyu/apache-shenyu-bootstrap.tar
-
# - name: Setup Debug Session
# uses: mxschmitt/action-tmate@v3
# timeout-minutes: 15
diff --git a/pom.xml b/pom.xml
index 70035d8d94..cae1b98685 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<protostuff.version>1.0.8</protostuff.version>
<kryo.version>4.0.0</kryo.version>
<pagehelper.version>5.3.3</pagehelper.version>
- <apache.dubbo.version>3.2.5</apache.dubbo.version>
+ <apache.dubbo.version>3.2.11</apache.dubbo.version>
<gson.version>2.9.0</gson.version>
<okhttp.version>4.9.3</okhttp.version>
<prometheus-java-client.version>0.15.0</prometheus-java-client.version>
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index 977ff9ca80..8d0a710a71 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -332,6 +332,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
+ <version>${apache.dubbo.version}</version>
</dependency>
<!-- Dubbo Nacos registry dependency -->
<!-- <dependency>
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/pom.xml
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/pom.xml
index 7d590cb97f..fda118e903 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/pom.xml
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/pom.xml
@@ -29,8 +29,8 @@
<properties>
<curator.version>5.2.1</curator.version>
- <nacos-client.version>2.0.4</nacos-client.version>
- <apache.dubbo.version>2.7.15</apache.dubbo.version>
+ <nacos-client.version>2.2.4</nacos-client.version>
+ <apache.dubbo.version>3.2.11</apache.dubbo.version>
<zookeeper.version>3.7.2</zookeeper.version>
</properties>
@@ -78,7 +78,16 @@
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${apache.dubbo.version}</version>
</dependency>
-
+
+ <!-- Dubbo Nacos registry dependency -->
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-registry-nacos</artifactId>
+ <version>${apache.dubbo.version}</version>
+ </dependency>
+
+
+
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml
index 1a48c6f4e6..aedfcdfb13 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/pom.xml
@@ -28,8 +28,8 @@
<properties>
<curator.version>5.2.1</curator.version>
- <nacos-client.version>2.0.4</nacos-client.version>
- <apache.dubbo.version>2.7.15</apache.dubbo.version>
+ <nacos-client.version>2.2.4</nacos-client.version>
+ <apache.dubbo.version>3.2.11</apache.dubbo.version>
<zookeeper.version>3.7.2</zookeeper.version>
</properties>
@@ -112,6 +112,11 @@
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-x-discovery</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
index ef2e68a1ff..00191401b5 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/pom.xml
@@ -28,9 +28,9 @@
<artifactId>shenyu-examples-apache-dubbo-service</artifactId>
<properties>
- <curator.version>4.0.1</curator.version>
- <nacos-client.version>2.0.4</nacos-client.version>
- <apache.dubbo.version>2.7.15</apache.dubbo.version>
+ <curator.version>5.2.1</curator.version>
+ <nacos-client.version>2.2.4</nacos-client.version>
+ <apache.dubbo.version>3.2.11</apache.dubbo.version>
<zookeeper.version>3.7.2</zookeeper.version>
</properties>
@@ -102,6 +102,12 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>zookeeper</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -113,6 +119,11 @@
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-x-discovery</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git
a/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-dubbo/shenyu-examples-sdk-apache-dubbo-provider/pom.xml
b/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-dubbo/shenyu-examples-sdk-apache-dubbo-provider/pom.xml
index 0a745a8422..c7e8636f5e 100644
---
a/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-dubbo/shenyu-examples-sdk-apache-dubbo-provider/pom.xml
+++
b/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-dubbo/shenyu-examples-sdk-apache-dubbo-provider/pom.xml
@@ -28,9 +28,9 @@
<properties>
<curator.version>5.2.1</curator.version>
- <nacos-client.version>2.0.4</nacos-client.version>
- <apache.dubbo.version>2.7.15</apache.dubbo.version>
- <zookeeper.version>3.6.3</zookeeper.version>
+ <nacos-client.version>2.2.4</nacos-client.version>
+ <apache.dubbo.version>3.2.11</apache.dubbo.version>
+ <zookeeper.version>3.7.2</zookeeper.version>
</properties>
<dependencies>
@@ -95,6 +95,12 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>zookeeper</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -106,6 +112,11 @@
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-x-discovery</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
index d04c193e35..0e25eb8ae8 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
@@ -66,12 +66,12 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>3.1.1</version>
+ <version>${apache.dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper</artifactId>
- <version>3.1.1</version>
+ <version>${apache.dubbo.version}</version>
<type>pom</type>
</dependency>
<!--shenyu apache dubbo plugin end-->
diff --git a/shenyu-integrated-test/shenyu-integrated-test-rewrite/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-rewrite/pom.xml
index 62eb495f44..3238b04faf 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-rewrite/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-rewrite/pom.xml
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>3.1.1</version>
+ <version>${apache.dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper</artifactId>
- <version>3.1.1</version>
+ <version>${apache.dubbo.version}</version>
<type>pom</type>
</dependency>
<!--shenyu apache dubbo plugin end-->
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
index 37514d44b4..ec2cc33598 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
@@ -27,7 +27,14 @@
<artifactId>shenyu-integrated-test-sdk-apache-dubbo</artifactId>
<name>shenyu-integrated-test-sdk-apache-dubbo</name>
-
+
+ <properties>
+ <curator.version>5.2.1</curator.version>
+ <nacos-client.version>2.2.4</nacos-client.version>
+ <apache.dubbo.version>3.2.11</apache.dubbo.version>
+ <zookeeper.version>3.7.2</zookeeper.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
@@ -55,19 +62,19 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
- <version>3.1.1</version>
+ <version>${apache.dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
- <version>5.1.0</version>
+ <version>${curator.version}</version>
</dependency>
<!-- Dubbo zookeeper registry dependency start -->
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
- <version>4.0.1</version>
+ <version>${curator.version}</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
@@ -78,12 +85,12 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>4.0.1</version>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>4.0.1</version>
+ <version>${curator.version}</version>
</dependency>
</dependencies>
diff --git
a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/pom.xml
b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/pom.xml
index 4f61e246f3..1cb2e449f7 100644
---
a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/pom.xml
+++
b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-rpc/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/pom.xml
@@ -34,6 +34,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
+ <version>${apache.dubbo.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
