Greenwich

.gitignore

@@ -31,6 +31,7 @@ hs_err_pid*
 .settings
 target
 .DS_Store
+.flattened-pom.xml
 
 # temp ignore
 *.cache

README-zh.md

@@ -70,7 +70,7 @@ Spring Cloud 使用 Maven 来构建，最快的使用方式是将本项目 clone
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.2.5.RELEASE</version>
+                <version>2.1.4.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.1.11.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -18,7 +18,7 @@
     <packaging>pom</packaging>
     <name>Spring Cloud Alibaba</name>
     <description>Spring Cloud Alibaba</description>
-    <url>https://github.com/alibaba/spring-cloud-alibaba</url>
+    <url>https://github.com/alibaba/spring-cloud-alibaba/tree/greenwich</url>
 
     <licenses>
         <license>
@@ -80,18 +80,22 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>2.2.5.RC2</revision>
+        <revision>2.1.4.RELEASE</revision>
 
         <!-- Dependency Versions -->
-        <spring-cloud-commons.version>2.2.5.RELEASE</spring-cloud-commons.version>
-        <spring-cloud-netflix.version>2.2.5.RELEASE</spring-cloud-netflix.version>
-        <spring-cloud-openfeign.version>2.2.5.RELEASE</spring-cloud-openfeign.version>
-        <spring-cloud-bus.version>2.2.3.RELEASE</spring-cloud-bus.version>
-        <spring-cloud-gateway.version>2.2.5.RELEASE</spring-cloud-gateway.version>
-        <spring-cloud-stream.version>Horsham.SR3</spring-cloud-stream.version>
-        <spring-cloud-consul.version>2.2.4.RELEASE</spring-cloud-consul.version>
-        <spring-cloud-config.version>2.2.5.RELEASE</spring-cloud-config.version>
-        <spring-cloud-zookeeper.version>2.2.3.RELEASE</spring-cloud-zookeeper.version>
+        <spring-cloud-commons.version>2.1.6.RELEASE</spring-cloud-commons.version>
+        <spring-cloud-config.version>2.1.9.RELEASE</spring-cloud-config.version>
+        <spring-cloud-consul.version>2.1.5.RELEASE</spring-cloud-consul.version>
+        <spring-cloud-gateway.version>2.1.5.RELEASE</spring-cloud-gateway.version>
+        <spring-cloud-netflix.version>2.1.6.RELEASE</spring-cloud-netflix.version>
+        <spring-cloud-openfeign.version>2.1.5.RELEASE</spring-cloud-openfeign.version>
+        <spring-cloud-bus.version>2.1.4.RELEASE</spring-cloud-bus.version>
+        <spring-cloud-stream.version>Fishtown.SR4</spring-cloud-stream.version>
+        <spring-cloud-zookeeper.version>2.1.4.RELEASE</spring-cloud-zookeeper.version>
+
+        <junit.version>4.12</junit.version>
+        <javax-servlet-api>3.0</javax-servlet-api>
+        <slf4j-api.version>1.7.25</slf4j-api.version>
 
         <!-- Apache Dubbo -->
         <dubbo.version>2.7.8</dubbo.version>
@@ -445,4 +449,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>

spring-cloud-alibaba-coverage/pom.xml

@@ -28,12 +28,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-circuitbreaker-sentinel</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-seata</artifactId>

spring-cloud-alibaba-dependencies/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies-parent</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>2.1.11.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -18,7 +18,9 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <revision>2.2.5.RC2</revision>
+        <!-- Project revision -->
+        <revision>2.1.4.RELEASE</revision>
+
         <sentinel.version>1.8.0</sentinel.version>
         <seata.version>1.3.0</seata.version>
         <nacos.client.version>1.4.1</nacos.client.version>
@@ -185,6 +187,7 @@
                 <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
                 <version>${revision}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>

spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc

@@ -10,7 +10,7 @@ Spring Cloud Alibaba BOM 包含了它所使用的所有依赖的版本。
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>2.2.4.RELEASE</version>
+            <version>2.1.4.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc

@@ -8,7 +8,7 @@ If you’re a Maven Central user, add our BOM to your pom.xml <dependencyManagem
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>2.2.4.RELEASE</version>
+            <version>2.1.4.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java

@@ -57,8 +57,7 @@ public static void main(String[] args) {
 		SpringApplication.run(ConsumerApplication.class, args);
 	}
 
-	@FeignClient(name = "service-provider", fallback = EchoServiceFallback.class,
-			configuration = FeignConfiguration.class)
+	@FeignClient(name = "service-provider", fallback = EchoServiceFallback.class, configuration = FeignConfiguration.class)
 	public interface EchoService {
 
 		@GetMapping("/echo/{str}")