[servicecomb-java-chassis] branch master updated: [SCB-1157]Remove discovery's dependence on zuul

[wujimin]

This is an automated email from the ASF dual-hosted git repository.

wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new f2d04d4  [SCB-1157]Remove discovery's dependence on zuul
f2d04d4 is described below

commit f2d04d4153c2eabc9909aea069109da51c8caacc
Author: yangshaoqin <yangshaoq...@huawei.com>
AuthorDate: Wed Feb 20 15:12:43 2019 +0800

    [SCB-1157]Remove discovery's dependence on zuul
---
 .../src/main/java/org/apache/servicecomb/it/deploy/NormalDeploy.java  | 3 ++-
 .../spring-boot-starter/spring-boot-starter-discovery/pom.xml         | 4 ----
 .../spring-boot2-starter-discovery/pom.xml                            | 4 ----
 .../spring-boot2-starter-parent/spring-boot2-starter-gateway/pom.xml  | 4 ----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git 
a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/NormalDeploy.java
 
b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/NormalDeploy.java
index bb91446..90bbd49 100644
--- 
a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/NormalDeploy.java
+++ 
b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/NormalDeploy.java
@@ -25,6 +25,7 @@ import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.servicecomb.foundation.common.utils.JsonUtils;
 import org.apache.servicecomb.it.junit.ITJUnitUtils;
 import org.slf4j.Logger;
@@ -52,7 +53,7 @@ public class NormalDeploy {
     cmds = addArgs(cmds);
 
     this.prevFailCount = ITJUnitUtils.getFailures().size();
-
+    LOGGER.info("createProcessBuilder: " + StringUtils.join(cmds, " ") + 
"\nWorkDir: " + deployDefinition.getWorkDir());
     subProcess = createProcessBuilder(cmds).start();
     subProcessCommandWriter = new BufferedWriter(new 
OutputStreamWriter(subProcess.getOutputStream()));
     subProcessLogger = new SubProcessLogger(deployDefinition.getDisplayName(), 
subProcess.getInputStream(),
diff --git 
a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml
 
b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml
index d67d753..f805678 100644
--- 
a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml
+++ 
b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml
@@ -55,10 +55,6 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-zuul</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-ribbon</artifactId>
       <exclusions>
         <exclusion>
diff --git 
a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml
 
b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml
index e1446c2..9fb08f1 100644
--- 
a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml
+++ 
b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml
@@ -55,10 +55,6 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
       <exclusions>
         <exclusion>
diff --git 
a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-gateway/pom.xml
 
b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-gateway/pom.xml
index f2a50ff..29428d0 100644
--- 
a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-gateway/pom.xml
+++ 
b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-gateway/pom.xml
@@ -55,10 +55,6 @@
           <groupId>org.apache.servicecomb</groupId>
           <artifactId>provider-springmvc</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.springframework.cloud</groupId>
-          <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>