fix alibaba#8169: Upgrade spring-boot version to 2.6.6

liqipeng · Apr 17, 2022 · 0202957 · 0202957
1 parent d0d8c26
commit 0202957
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git a/console/src/main/resources/application.properties b/console/src/main/resources/application.properties
@@ -18,6 +18,8 @@
 ### Default web context path:
 server.servlet.contextPath=/nacos
 ### Default web server port:
+# to allow circular references in spring boot 2.6
+spring.main.allow-circular-references=true
 
 #*************** Network Related Configurations ***************#
 ### If prefer hostname over ip for Nacos server addresses in cluster.conf:
@@ -193,4 +195,3 @@ nacos.istio.mcp.server.enabled=false
 # nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe
 ### rpc request timeout, default 5 seconds
 # nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000
-
diff --git a/core/src/main/java/com/alibaba/nacos/core/code/SpringApplicationRunListener.java b/core/src/main/java/com/alibaba/nacos/core/code/SpringApplicationRunListener.java
@@ -19,6 +19,7 @@
 import com.alibaba.nacos.core.listener.LoggingApplicationListener;
 import com.alibaba.nacos.core.listener.NacosApplicationListener;
 import com.alibaba.nacos.core.listener.StartingApplicationListener;
+import org.springframework.boot.ConfigurableBootstrapContext;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.context.event.EventPublishingRunListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -53,14 +54,15 @@ public SpringApplicationRunListener(SpringApplication application, String[] args
     }
 
     @Override
-    public void starting() {
+    public void starting(ConfigurableBootstrapContext bootstrapContext) {
         for (NacosApplicationListener nacosApplicationListener : nacosApplicationListeners) {
             nacosApplicationListener.starting();
         }
     }
 
     @Override
-    public void environmentPrepared(ConfigurableEnvironment environment) {
+    public void environmentPrepared(ConfigurableBootstrapContext bootstrapContext,
+            ConfigurableEnvironment environment) {
         for (NacosApplicationListener nacosApplicationListener : nacosApplicationListeners) {
             nacosApplicationListener.environmentPrepared(environment);
         }

diff --git a/distribution/conf/application.properties b/distribution/conf/application.properties
@@ -19,6 +19,8 @@
 server.servlet.contextPath=/nacos
 ### Default web server port:
 server.port=8848
+# to allow circular references in spring boot 2.6
+spring.main.allow-circular-references=true
 
 #*************** Network Related Configurations ***************#
 ### If prefer hostname over ip for Nacos server addresses in cluster.conf:

diff --git a/distribution/conf/application.properties.example b/distribution/conf/application.properties.example
@@ -19,6 +19,8 @@
 server.servlet.contextPath=/nacos
 ### Default web server port:
 server.port=8848
+# to allow circular references in spring boot 2.6
+spring.main.allow-circular-references=true
 
 #*************** Network Related Configurations ***************#
 ### If prefer hostname over ip for Nacos server addresses in cluster.conf:

diff --git a/pom.xml b/pom.xml
@@ -128,7 +128,7 @@
         <p3c-pmd.version>1.3.0</p3c-pmd.version>
 
         <!-- dependency version -->
-        <spring-boot-dependencies.version>2.1.17.RELEASE</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.6.6</spring-boot-dependencies.version>
         <servlet-api.version>3.0</servlet-api.version>
         <commons-io.version>2.7</commons-io.version>
         <commons-collections.version>3.2.2</commons-collections.version>

diff --git a/test/config-test/src/test/resources/application.properties b/test/config-test/src/test/resources/application.properties
@@ -17,7 +17,8 @@
 # spring
 server.port=8848
 nacos.standalone=true
-
+# to allow circular references in spring boot 2.6
+spring.main.allow-circular-references=true
 
 management.metrics.export.elastic.enabled=false
 #management.metrics.export.elastic.host=http://localhost:9200

diff --git a/test/core-test/src/test/resources/application.properties b/test/core-test/src/test/resources/application.properties
@@ -17,7 +17,8 @@
 # spring
 server.port=8848
 nacos.standalone=true
-
+# to allow circular references in spring boot 2.6
+spring.main.allow-circular-references=true
 
 management.metrics.export.elastic.enabled=false
 #management.metrics.export.elastic.host=http://localhost:9200

diff --git a/test/naming-test/src/test/resources/application.properties b/test/naming-test/src/test/resources/application.properties
@@ -17,7 +17,8 @@
 # spring
 server.port=8848
 nacos.standalone=true
-
+# to allow circular references in spring boot 2.6
+spring.main.allow-circular-references=true
 
 management.metrics.export.elastic.enabled=false
 #management.metrics.export.elastic.host=http://localhost:9200