polish #761 update pkg name & maven coordinate for Greenwich

spring-cloud-alicloud-acm/pom.xml

@@ -3,9 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.9.1.BUILD-SNAPSHOT</version>
     </parent>
@@ -16,7 +15,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alicloud-context</artifactId>
         </dependency>
 

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java

@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
 
 import org.springframework.beans.BeansException;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.alicloud.acm.refresh.AcmContextRefresher;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
 import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.alibaba.alicloud.acm.refresh.AcmContextRefresher;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+
 import com.taobao.diamond.client.Diamond;
 
 /**

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
+
+import java.util.ArrayList;
+import java.util.List;
 
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySource;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.PropertySource;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource;
 
 /**
  * @author juven.xuxb, 5/17/16.

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.bootstrap;
-
-import org.springframework.core.env.MapPropertySource;
+package com.alibaba.alicloud.acm.bootstrap;
 
 import java.util.Date;
 import java.util.Map;
 
+import org.springframework.core.env.MapPropertySource;
+
 /**
  * @author juven.xuxb
  * @author xiaolongzuo

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java

@@ -14,15 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.bootstrap;
-
-import com.alibaba.edas.acm.ConfigService;
-import com.alibaba.edas.acm.exception.ConfigException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.util.StringUtils;
+package com.alibaba.alicloud.acm.bootstrap;
 
 import java.io.StringReader;
 import java.util.Date;
@@ -31,6 +23,15 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.util.StringUtils;
+
+import com.alibaba.edas.acm.ConfigService;
+import com.alibaba.edas.acm.exception.ConfigException;
+
 /**
  * @author juven.xuxb
  * @author xiaolongzuo

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.bootstrap;
+package com.alibaba.alicloud.acm.bootstrap;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
 import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+
 /**
  * @author juven.xuxb
  * @author xiaolongzuo

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java

@@ -14,14 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.endpoint;
-
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySource;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
+package com.alibaba.alicloud.acm.endpoint;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -30,6 +23,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
+
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmProperties;
+
 /**
  * Created on 01/10/2017.
  *

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java

@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.endpoint;
+package com.alibaba.alicloud.acm.endpoint;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
 import org.springframework.context.annotation.Bean;
 
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmProperties;
+
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java

@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.endpoint;
-
-import com.alibaba.edas.acm.ConfigService;
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySource;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
-import org.springframework.util.StringUtils;
+package com.alibaba.alicloud.acm.endpoint;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.util.StringUtils;
+
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource;
+import com.alibaba.alicloud.context.acm.AcmProperties;
+import com.alibaba.edas.acm.ConfigService;
+
 /**
  * @author leijuan
  * @author juven

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java

@@ -14,23 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.refresh;
-
-import com.alibaba.edas.acm.ConfigService;
-import com.alibaba.edas.acm.listener.ConfigChangeListener;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
-import org.springframework.cloud.context.refresh.ContextRefresher;
-import org.springframework.cloud.endpoint.event.RefreshEvent;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationListener;
-import org.springframework.util.StringUtils;
+package com.alibaba.alicloud.acm.refresh;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
@@ -39,6 +23,22 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.cloud.context.refresh.ContextRefresher;
+import org.springframework.cloud.endpoint.event.RefreshEvent;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationListener;
+import org.springframework.util.StringUtils;
+
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+import com.alibaba.edas.acm.ConfigService;
+import com.alibaba.edas.acm.listener.ConfigChangeListener;
+
 /**
  * On application start up, AcmContextRefresher add diamond listeners to all application
  * level dataIds, when there is a change in the data, listeners will refresh

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.refresh;
+package com.alibaba.alicloud.acm.refresh;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories

@@ -1,6 +1,6 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySourceLocator
+com.alibaba.alicloud.acm.bootstrap.AcmPropertySourceLocator
 
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alicloud.acm.AcmAutoConfiguration,\
-org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration
+com.alibaba.alicloud.acm.AcmAutoConfiguration,\
+com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -24,8 +24,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
-import com.alibaba.edas.acm.ConfigService;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,15 +36,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySourceLocator;
-import org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySourceLocator;
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+import com.alibaba.alicloud.context.acm.AcmProperties;
+import com.alibaba.edas.acm.ConfigService;
+
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
 
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
 
@@ -33,12 +33,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
 import com.alibaba.edas.acm.ConfigService;
 
 /**

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
-import com.alibaba.edas.acm.ConfigService;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,13 +33,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.edas.acm.ConfigService;
 
 /**
  * @author xiaojing

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm.endpoint;
+package com.alibaba.alicloud.acm.endpoint;
 
 import static org.junit.Assert.assertEquals;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
@@ -38,14 +38,14 @@ import org.springframework.boot.actuate.health.Health.Builder;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.AcmAutoConfiguration;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.acm.AcmAutoConfiguration;
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.context.acm.AcmProperties;
 import com.alibaba.edas.acm.ConfigService;
 
 /**