You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2022/06/09 20:18:33 UTC
[incubator-shenyu] branch master updated: [type:optimize] fix springboot upgrade question (#3510)
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/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new a84c14214 [type:optimize] fix springboot upgrade question (#3510)
a84c14214 is described below
commit a84c14214f49a3fce8ca0f289c12a2fa2f725c98
Author: moremind <he...@hotmail.com>
AuthorDate: Fri Jun 10 04:18:25 2022 +0800
[type:optimize] fix springboot upgrade question (#3510)
* [type:fix-bug] fix pom.xml
* [type:fix-bug] upgrade shenyu-plugin-sentinel sentinel upgrade to 1.8.3
* [type:fix-bug] set grpc version 1.33.1
* [type:fix-bug] fix spring cloud conflict
* [type:fix-bug] fix spring cloud conflict
* [type:fix-bug] fix spring cloud conflict
* [type:fix-bug] update sentinel version to 1.8.4
---
pom.xml | 21 ++++++++++++++++++++-
shenyu-bootstrap/pom.xml | 6 ++++++
shenyu-examples/shenyu-examples-grpc/pom.xml | 2 +-
shenyu-examples/shenyu-examples-springcloud/pom.xml | 12 +++++++++++-
.../shenyu-integrated-test-spring-cloud/pom.xml | 4 ++++
shenyu-plugin/shenyu-plugin-sentinel/pom.xml | 2 +-
shenyu-plugin/shenyu-plugin-springcloud/pom.xml | 2 +-
.../shenyu-register-client-etcd/pom.xml | 6 +++---
.../pom.xml | 4 ++++
9 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 222f327e1..5f7ddbb17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,9 +149,10 @@
<mail.version>1.6.2</mail.version>
<dockerfile-maven-plugin.version>1.4.6</dockerfile-maven-plugin.version>
<ojdbc8.version>19.3.0.0</ojdbc8.version>
- <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+ <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
<spring-cloud-netflix-ribbon.version>2.2.10.RELEASE</spring-cloud-netflix-ribbon.version>
<spring-cloud-commons.version>3.1.2</spring-cloud-commons.version>
+ <spring-cloud.version>3.1.2</spring-cloud.version>
</properties>
<dependencyManagement>
@@ -454,6 +455,24 @@
<version>${spring-cloud-commons.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-context</artifactId>
+ <version>${spring-cloud.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ <version>${spring-cloud.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+ <version>${spring-cloud.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index d1134ae82..328ce122f 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -270,6 +270,12 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<version>${spring-cloud-netflix-ribbon.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--shenyu springCloud plugin start-->
diff --git a/shenyu-examples/shenyu-examples-grpc/pom.xml b/shenyu-examples/shenyu-examples-grpc/pom.xml
index d5e7e813e..05b80afd7 100644
--- a/shenyu-examples/shenyu-examples-grpc/pom.xml
+++ b/shenyu-examples/shenyu-examples-grpc/pom.xml
@@ -28,7 +28,7 @@
<artifactId>shenyu-examples-grpc</artifactId>
<properties>
- <grpc.version>1.46.0</grpc.version>
+ <grpc.version>1.33.1</grpc.version>
<protobuf.version>3.13.0</protobuf.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
</properties>
diff --git a/shenyu-examples/shenyu-examples-springcloud/pom.xml b/shenyu-examples/shenyu-examples-springcloud/pom.xml
index febb0844a..142ff8c80 100644
--- a/shenyu-examples/shenyu-examples-springcloud/pom.xml
+++ b/shenyu-examples/shenyu-examples-springcloud/pom.xml
@@ -39,7 +39,7 @@
<artifactId>shenyu-spring-boot-starter-client-springcloud</artifactId>
<version>${project.version}</version>
</dependency>
- <!--spring boot的核心启动器-->
+ <!--spring bootstrap-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -54,6 +54,16 @@
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
<version>${nacos-discovery.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-cloud-context</artifactId>
+ <groupId>org.springframework.cloud</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-cloud-commons</artifactId>
+ <groupId>org.springframework.cloud</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml
index f7e20d99d..dc54216d3 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/pom.xml
@@ -62,6 +62,10 @@
<artifactId>spring-cloud-context</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/shenyu-plugin/shenyu-plugin-sentinel/pom.xml b/shenyu-plugin/shenyu-plugin-sentinel/pom.xml
index bec9ebbb4..03740610f 100644
--- a/shenyu-plugin/shenyu-plugin-sentinel/pom.xml
+++ b/shenyu-plugin/shenyu-plugin-sentinel/pom.xml
@@ -26,7 +26,7 @@
<artifactId>shenyu-plugin-sentinel</artifactId>
<properties>
- <sentinel.version>1.8.0</sentinel.version>
+ <sentinel.version>1.8.4</sentinel.version>
</properties>
<dependencies>
diff --git a/shenyu-plugin/shenyu-plugin-springcloud/pom.xml b/shenyu-plugin/shenyu-plugin-springcloud/pom.xml
index 72b557ff9..98bb22b14 100644
--- a/shenyu-plugin/shenyu-plugin-springcloud/pom.xml
+++ b/shenyu-plugin/shenyu-plugin-springcloud/pom.xml
@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-loadbalancer</artifactId>
+ <artifactId>spring-cloud-starter-loadbalancer</artifactId>
<version>${spring-cloud-commons.version}</version>
</dependency>
</dependencies>
diff --git a/shenyu-register-center/shenyu-register-client/shenyu-register-client-etcd/pom.xml b/shenyu-register-center/shenyu-register-client/shenyu-register-client-etcd/pom.xml
index 93874bd75..579752a66 100644
--- a/shenyu-register-center/shenyu-register-client/shenyu-register-client-etcd/pom.xml
+++ b/shenyu-register-center/shenyu-register-client/shenyu-register-client-etcd/pom.xml
@@ -50,17 +50,17 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
- <version>1.28.0</version>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
<artifactId>grpc-protobuf</artifactId>
<groupId>io.grpc</groupId>
- <version>1.28.0</version>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
<artifactId>grpc-stub</artifactId>
<groupId>io.grpc</groupId>
- <version>1.28.0</version>
+ <version>${grpc.version}</version>
</dependency>
<dependency>
diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/pom.xml b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/pom.xml
index c728a1845..4ff1fb3d1 100644
--- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/pom.xml
+++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/pom.xml
@@ -24,6 +24,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-spring-boot-starter-plugin-springcloud</artifactId>
+
+ <properties>
+ <spring-cloud-commons.version>3.1.2</spring-cloud-commons.version>
+ </properties>
<dependencies>
<dependency>