From 0c73d6e6afaad21600903f3ca6918bb1b143e6e8 Mon Sep 17 00:00:00 2001
From: mercyblitz <mercyblitz@gmail.com>
Date: Sat, 13 Apr 2019 08:55:57 +0800
Subject: [PATCH] Polish spring-cloud-incubator/spring-cloud-alibaba#549 :
 Update samples

---
 ...BalancedRestTemplateAutoConfiguration.java |   1 -
 .../pom.xml                                   | 118 +++++++-----------
 2 files changed, 44 insertions(+), 75 deletions(-)

diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
index 978a73fc..23de850a 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
+++ b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
@@ -95,7 +95,6 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
      */
     private ClientHttpRequestInterceptor loadBalancerInterceptorBean;
 
-
     @Override
     public void afterSingletonsInstantiated() {
         loadBalancerInterceptorBean = retryLoadBalancerInterceptor != null ?
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
index d520efff..e4d358d5 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
+++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
@@ -96,87 +96,57 @@
             <version>${project.version}</version>
         </dependency>
 
-    </dependencies>
+        <!-- Spring Cloud Nacos Service Discovery -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
 
-    <profiles>
+        <!-- Spring Cloud Eureka Service Discovery -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
 
-        <!-- Nacos -->
-        <profile>
-            <id>nacos</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <!-- Nacos Service Discovery -->
-                <dependency>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>eureka</id>
-            <dependencies>
-                <!-- Eureka Service Discovery -->
-                <dependency>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- Zookeeper -->
-        <profile>
-            <id>zookeeper</id>
-            <dependencies>
-                <!-- Zookeeper Service Discovery -->
-                <dependency>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
-                    <version>${spring-cloud-zookeeper.version}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.apache.zookeeper</groupId>
-                            <artifactId>zookeeper</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-
-                <dependency>
+        <!-- Spring Cloud Zookeeper Service Discovery -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
+            <version>${spring-cloud-zookeeper.version}</version>
+            <exclusions>
+                <exclusion>
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
-                    <version>3.4.12</version>
-                    <optional>true</optional>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-log4j12</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-                <dependency>
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                    <version>${curator.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.4.12</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-        <profile>
-            <id>consul</id>
-            <dependencies>
-                <!-- Spring Cloud Consul -->
-                <dependency>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-consul-discovery</artifactId>
-                    <version>${spring-cloud-consul.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
 
-    </profiles>
+        <!-- Spring Cloud Consul Service Discovery -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+            <version>${spring-cloud-consul.version}</version>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>