Feature change version (#234)

* change springboot version * change springboot version Co-authored-by: hujun3 <hujun3@xiaomi.com>
nacos-group · Mar 21, 2022 · e54e0cd · e54e0cd
1 parent a8d6a80
commit e54e0cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/...va/com/alibaba/boot/nacos/actuate/autoconfigure/NacosConfigEndpointAutoConfiguration.java b/...va/com/alibaba/boot/nacos/actuate/autoconfigure/NacosConfigEndpointAutoConfiguration.java
@@ -17,8 +17,7 @@
 package com.alibaba.boot.nacos.actuate.autoconfigure;
 
 import com.alibaba.boot.nacos.actuate.endpoint.NacosConfigEndpoint;
-
-import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
+import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
@@ -35,7 +34,7 @@ public class NacosConfigEndpointAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnEnabledEndpoint
+	@ConditionalOnAvailableEndpoint
 	public NacosConfigEndpoint nacosEndpoint() {
 		return new NacosConfigEndpoint();
 	}

diff --git a/.../boot/nacos/discovery/actuate/autoconfigure/NacosDiscoveryEndpointsAutoConfiguration.java b/.../boot/nacos/discovery/actuate/autoconfigure/NacosDiscoveryEndpointsAutoConfiguration.java
@@ -17,8 +17,7 @@
 package com.alibaba.boot.nacos.discovery.actuate.autoconfigure;
 
 import com.alibaba.boot.nacos.discovery.actuate.endpoint.NacosDiscoveryEndpoint;
-
-import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
+import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
@@ -35,7 +34,7 @@ public class NacosDiscoveryEndpointsAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnEnabledEndpoint
+	@ConditionalOnAvailableEndpoint
 	public NacosDiscoveryEndpoint nacosDiscoveryEndpoint() {
 		return new NacosDiscoveryEndpoint();
 	}

diff --git a/nacos-spring-boot-parent/pom.xml b/nacos-spring-boot-parent/pom.xml
@@ -35,7 +35,7 @@
         <java.target.version>1.8</java.target.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
+        <spring-boot.version>2.6.3</spring-boot.version>
         <nacos-spring-context.version>1.1.1</nacos-spring-context.version>
         <!-- Build args -->
         <argline>-server -Xms256m -Xmx512m -XX:PermSize=64m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8
@@ -169,6 +169,16 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
     <build>
         <!-- Used for packaging NOTICE & LICENSE to each sub-module jar-->
         <resources>