Merge pull request #13 from alibaba/master

update

pom.xml

@@ -106,7 +106,7 @@
         <module>spring-cloud-alibaba-dependencies</module>
         <module>spring-cloud-alibaba-examples</module>
         <module>spring-cloud-alibaba-docs</module>
-        <module>spring-cloud-starter-alibaba</module>
+        <module>spring-cloud-alibaba-starters</module>
         <module>spring-cloud-alibaba-coverage</module>
     </modules>
 

spring-cloud-alibaba-starters/pom.xml

@@ -9,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>spring-cloud-starter-alibaba</artifactId>
+    <artifactId>spring-cloud-alibaba-starters</artifactId>
     <packaging>pom</packaging>
     <name>Spring Cloud Alibaba Starters</name>
     <description>Spring Cloud Alibaba Starters</description>

spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-starter-alibaba</artifactId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-starter-alibaba</artifactId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-starter-alibaba</artifactId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config-server/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-starter-alibaba</artifactId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-starter-alibaba</artifactId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java

@@ -21,6 +21,7 @@ import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
+import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -52,8 +53,7 @@ public class NacosConfigEndpointAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(name = "spring.cloud.nacos.config.health.enabled",
+	@ConditionalOnEnabledHealthIndicator("nacos-config")
-			matchIfMissing = true)
 	public NacosConfigHealthIndicator nacosConfigHealthIndicator() {
 		return new NacosConfigHealthIndicator(nacosConfigManager.getConfigService());
 	}

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -55,12 +55,6 @@
       "type": "java.util.List",
       "description": "a set of extensional configurations .e.g: spring.cloud.nacos.config.extension-configs[0]=xxx ."
     },
-    {
-      "name": "spring.cloud.nacos.config.health.enabled",
-      "type": "java.lang.Boolean",
-      "defaultValue": true,
-      "description": "the switch for health check, it default enabled(true)."
-    },
     {
       "name": "spring.cloud.nacos.config.refresh-enabled",
       "type": "java.lang.Boolean",

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>com.alibaba.cloud</groupId>
-        <artifactId>spring-cloud-starter-alibaba</artifactId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
         <version>2.2.1.BUILD-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>