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
commit 46379811f2cf580ee2f1913dca62fd0b74f57304 Author: liubao <bi...@qq.com> AuthorDate: Sat May 30 15:11:48 2020 +0800 [SCB-1960]remove all spring cloud related dependencies --- .../servicecomb/demo/localRegistryClient/Application.java | 6 ++++++ .../demo/localRegistryClient/LocalRegistryServerTest.java | 4 ---- demo/demo-local-registry/demo-local-registry-server/pom.xml | 12 ------------ .../demo-multi-registries-server/pom.xml | 12 ------------ .../demo-register-url-prefix-server/pom.xml | 12 ------------ .../demo-spring-boot-jaxrs-server/pom.xml | 12 ------------ .../demo-spring-boot-pojo-client/pom.xml | 12 ------------ .../demo-spring-boot-pojo-server/pom.xml | 12 ------------ dependencies/default/pom.xml | 9 --------- 9 files changed, 6 insertions(+), 85 deletions(-) diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java index 9ee37a8..fd40c66 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java @@ -18,6 +18,7 @@ package org.apache.servicecomb.demo.localRegistryClient; import org.apache.servicecomb.demo.CategorizedTestCaseRunner; +import org.apache.servicecomb.demo.TestMgr; import org.apache.servicecomb.springboot2.starter.EnableServiceComb; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -30,6 +31,11 @@ public class Application { new SpringApplicationBuilder().sources(Application.class).web(WebApplicationType.SERVLET).build().run(args); runTest(); + + TestMgr.summary(); + if (!TestMgr.errors().isEmpty()) { + throw new IllegalStateException("tests failed"); + } } public static void runTest() throws Exception { diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java index f0920bd..cee8dd9 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java @@ -55,10 +55,6 @@ public class LocalRegistryServerTest implements CategorizedTestCase { TestMgr.check("2", template .getForObject("cse://demo-local-registry-server/register/url/prefix/getName?name=2", String.class)); - TestMgr.summary(); - if (!TestMgr.errors().isEmpty()) { - throw new IllegalStateException("tests failed"); - } } @Override diff --git a/demo/demo-local-registry/demo-local-registry-server/pom.xml b/demo/demo-local-registry/demo-local-registry-server/pom.xml index f4f092e..3b5f386 100644 --- a/demo/demo-local-registry/demo-local-registry-server/pom.xml +++ b/demo/demo-local-registry/demo-local-registry-server/pom.xml @@ -33,18 +33,6 @@ </properties> <dependencies> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-commons</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-netflix-core</artifactId> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> diff --git a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml index 41961ec..57bc902 100644 --- a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml +++ b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml @@ -33,18 +33,6 @@ </properties> <dependencies> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-commons</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-netflix-core</artifactId> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> diff --git a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml index d4c1b24..0844116 100644 --- a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml +++ b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml @@ -37,18 +37,6 @@ <artifactId>registry-service-center</artifactId> </dependency> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-commons</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-netflix-core</artifactId> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml index 87915d9..2832faa 100644 --- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml @@ -42,18 +42,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-commons</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-netflix-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.servicecomb</groupId> <artifactId>inspector</artifactId> </dependency> diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml index a7d83f0..1b699e5 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml @@ -32,18 +32,6 @@ <demo.main>org.apache.servicecomb.springboot.pojo.client.PojoClient</demo.main> </properties> <dependencies> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-commons</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-netflix-core</artifactId> - </dependency> </dependencies> <build> <plugins> diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml index cb40652..08239cb 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml @@ -33,18 +33,6 @@ </properties> <dependencies> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-commons</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-context</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-netflix-core</artifactId> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index a18a0e4..1ec1c2f 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -102,7 +102,6 @@ <spectator.version>0.83.0</spectator.version> <spring.version>5.1.8.RELEASE</spring.version> <spring-boot.version>2.1.6.RELEASE</spring-boot.version> - <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version> <stax2-api.version>4.2</stax2-api.version> <swagger.version>1.5.22</swagger.version> <swagger2markup.version>1.3.3</swagger2markup.version> @@ -879,14 +878,6 @@ </dependency> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-dependencies</artifactId> - <version>${spring-cloud.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> <version>${snakeyaml.version}</version>