You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2020/05/29 08:14:43 UTC
[servicecomb-java-chassis] branch master updated (bc6afcb ->
199f850)
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.
from bc6afcb [SCB-1953] tiny code improve
new 54b40d6 [SCB-1954]coverage report dependencies update and remove no use test project
new 538ca8d [SCB-1954]fix artifact name error
new 199f850 [SCB-1954]coverage do not include tests code itself and some minor fix
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
coverage-reports/pom.xml | 461 ++++++++++++++++++---
demo/demo-pojo/pojo-tests/pom.xml | 47 ---
.../integration/PojoReferenceIntegrationTest.java | 43 --
.../demo/integration/SomePojoService.java | 36 --
.../demo/integration/SomePojoTestMain.java | 40 --
.../src/test/resources/microservice.yaml | 29 --
demo/demo-pojo/pom.xml | 1 -
.../demo-spring-boot-springmvc-client/pom.xml | 2 +-
.../demo-spring-boot-springmvc-server/pom.xml | 2 +-
distribution/pom.xml | 7 +-
.../servicecomb/registry/RegistrationManager.java | 2 +-
integration-tests/it-common-service/enable-it-jar | 16 -
integration-tests/it-common-service/pom.xml | 41 --
.../apache/servicecomb/it/CommonServiceMain.java | 23 -
integration-tests/pom.xml | 1 -
.../schemadiscovery/SchemaDiscoveryEndpoint.java | 3 +-
16 files changed, 402 insertions(+), 352 deletions(-)
delete mode 100644 demo/demo-pojo/pojo-tests/pom.xml
delete mode 100644 demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/PojoReferenceIntegrationTest.java
delete mode 100644 demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoService.java
delete mode 100644 demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoTestMain.java
delete mode 100644 demo/demo-pojo/pojo-tests/src/test/resources/microservice.yaml
delete mode 100644 integration-tests/it-common-service/enable-it-jar
delete mode 100644 integration-tests/it-common-service/pom.xml
delete mode 100644 integration-tests/it-common-service/src/main/java/org/apache/servicecomb/it/CommonServiceMain.java
[servicecomb-java-chassis] 02/03: [SCB-1954]fix artifact name error
Posted by wu...@apache.org.
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 538ca8dbb0094124bae56b8d8506a062f5ea5a97
Author: liubao <bi...@qq.com>
AuthorDate: Fri May 29 09:44:25 2020 +0800
[SCB-1954]fix artifact name error
---
coverage-reports/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index 514cd21..b6f20a2 100644
--- a/coverage-reports/pom.xml
+++ b/coverage-reports/pom.xml
@@ -527,7 +527,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
- <artifactId>pojo-tests</artifactId>
+ <artifactId>pojo-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
[servicecomb-java-chassis] 01/03: [SCB-1954]coverage report
dependencies update and remove no use test project
Posted by wu...@apache.org.
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 54b40d6d575770c93859c67b2c7e3e7781468974
Author: liubao <bi...@qq.com>
AuthorDate: Thu May 28 21:38:41 2020 +0800
[SCB-1954]coverage report dependencies update and remove no use test project
---
coverage-reports/pom.xml | 415 +++++++++++++++++----
demo/demo-pojo/pojo-tests/pom.xml | 47 ---
.../integration/PojoReferenceIntegrationTest.java | 43 ---
.../demo/integration/SomePojoService.java | 36 --
.../demo/integration/SomePojoTestMain.java | 40 --
.../src/test/resources/microservice.yaml | 29 --
demo/demo-pojo/pom.xml | 1 -
.../demo-spring-boot-springmvc-client/pom.xml | 2 +-
.../demo-spring-boot-springmvc-server/pom.xml | 2 +-
distribution/pom.xml | 7 +-
integration-tests/it-common-service/enable-it-jar | 16 -
integration-tests/it-common-service/pom.xml | 41 --
.../apache/servicecomb/it/CommonServiceMain.java | 23 --
integration-tests/pom.xml | 1 -
14 files changed, 352 insertions(+), 351 deletions(-)
diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index 9e7a09a..514cd21 100644
--- a/coverage-reports/pom.xml
+++ b/coverage-reports/pom.xml
@@ -30,33 +30,93 @@
<packaging>jar</packaging>
<dependencies>
+ <!-- sort by project directory name, easy to check if the module is missed -->
+ <!-- archetypes -->
+ <dependency>
+ <groupId>org.apache.servicecomb.archetypes</groupId>
+ <artifactId>business-service-jaxrs-archetype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.archetypes</groupId>
+ <artifactId>business-service-pojo-archetype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.archetypes</groupId>
+ <artifactId>business-service-spring-boot2-starter-archetype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.archetypes</groupId>
+ <artifactId>business-service-springmvc-archetype</artifactId>
+ </dependency>
+
+ <!-- clients -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-common</artifactId>
+ <artifactId>kie-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-protobuf</artifactId>
+ <artifactId>service-center-client</artifactId>
</dependency>
+
+ <!-- common -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-registry</artifactId>
+ <artifactId>common-access-log</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-ssl</artifactId>
+ <artifactId>common-protobuf</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-config</artifactId>
+ <artifactId>common-rest</artifactId>
+ </dependency>
+
+ <!-- core -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-core</artifactId>
</dependency>
+
+ <!-- deployment -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>deployment</artifactId>
</dependency>
+
+ <!-- dynamic-config -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>config-apollo</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>foundation-vertx</artifactId>
+ <artifactId>config-cc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>config-kie</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>config-nacos</artifactId>
+ </dependency>
+
+ <!-- edge -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>edge-core</artifactId>
+ </dependency>
+
+ <!-- foundations -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>foundation-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>foundation-config</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
@@ -64,18 +124,40 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>metrics-core</artifactId>
+ <artifactId>foundation-protobuf</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-core</artifactId>
+ <artifactId>foundation-registry</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>foundation-ssl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>foundation-test-scaffolding</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>foundation-vertx</artifactId>
</dependency>
+
+ <!-- handlers -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>handler-bizkeeper</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
+ <artifactId>handler-fault-injection</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>handler-flowcontrol-qps</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
<artifactId>handler-loadbalance</artifactId>
</dependency>
<dependency>
@@ -84,42 +166,107 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
+ <artifactId>handler-router</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-fault-injection</artifactId>
+ <artifactId>handler-tracing-zipkin</artifactId>
</dependency>
+
+ <!-- inspector -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>common-rest</artifactId>
+ <artifactId>inspector</artifactId>
</dependency>
+
+ <!-- metrics -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-common</artifactId>
+ <artifactId>metrics-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-client</artifactId>
+ <artifactId>metrics-prometheus</artifactId>
</dependency>
+
+ <!-- providers -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
+ <artifactId>provider-jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-servlet</artifactId>
+ <artifactId>provider-pojo</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
+ <artifactId>provider-rest-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>common-protobuf</artifactId>
+ <artifactId>provider-springmvc</artifactId>
+ </dependency>
+
+ <!-- service registry -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-local</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-schema-discovery</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-zero-config</artifactId>
+ </dependency>
+
+ <!-- solutions -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>solution-basic</artifactId>
+ </dependency>
+
+ <!-- spring boot -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-spring-boot-common</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-spring-boot-starter-discovery</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-spring-boot-starter-gateway</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-spring-boot-starter-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-spring-boot-starter-standalone</artifactId>
+ </dependency>
+
+ <!-- ServiceComb ServiceStage extension -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>servicestage</artifactId>
+ </dependency>
+
+ <!-- swagger -->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
<artifactId>swagger-generator-core</artifactId>
</dependency>
<dependency>
@@ -128,12 +275,13 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>swagger-generator-springmvc</artifactId>
+ <artifactId>swagger-generator-spring-data</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>swagger-generator-spring-data</artifactId>
+ <artifactId>swagger-generator-springmvc</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>swagger-invocation-core</artifactId>
@@ -148,166 +296,295 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>registry-service-center</artifactId>
+ <artifactId>swagger-invocation-validator</artifactId>
</dependency>
+
+ <!-- tracing -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-pojo</artifactId>
+ <artifactId>tracing-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-rest-common</artifactId>
+ <artifactId>tracing-zipkin</artifactId>
</dependency>
+
+ <!-- transports -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-jaxrs</artifactId>
+ <artifactId>transport-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-springmvc</artifactId>
+ <artifactId>transport-highway</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-tracing-zipkin</artifactId>
+ <artifactId>transport-rest-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-router</artifactId>
+ <artifactId>transport-rest-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>config-apollo</artifactId>
+ <artifactId>transport-rest-vertx</artifactId>
</dependency>
+
+ <!-- test cases in demo folder, sort by folder name -->
+ <!-- demo-crossapp -->
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>config-cc</artifactId>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>crossapp-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>config-kie</artifactId>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>crossapp-server</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <!-- demo-edge -->
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>edge-core</artifactId>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>authentication</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>inspector</artifactId>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>business-1-0-0</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>pojo-client</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>business-1-1-0</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>pojo-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>business-2-0-0</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>consumer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>edge-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>model</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <!-- demo-jaxrs -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>jaxrs-client</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>jaxrs-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
+ <!-- demo-local-registry -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>springmvc-client</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>demo-local-registry-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>springmvc-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>demo-local-registry-server</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <!-- demo-multi-registries -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>crossapp-client</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>demo-multi-registries-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>crossapp-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>demo-multi-registries-server</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <!-- demo-pojo -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>demo-spring-boot-jaxrs-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>pojo-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>pojo-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- demo-register-url-prefix -->
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>demo-register-url-prefix-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>demo-register-url-prefix-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- demo schema -->
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>demo-schema</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- demo spring boot provider -->
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-jaxrs-client</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>demo-spring-boot-jaxrs-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>demo-spring-boot-springmvc-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>demo-spring-boot-springmvc-server</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <!-- demo spring boot transport-->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-pojo-client</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-pojo-server</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- demo springmvc -->
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>springmvc-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.demo</groupId>
+ <artifactId>springmvc-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- test cases in integration-test folder, sort by folder name -->
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>dynamic-config-tests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>it-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>it-consumer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>it-edge</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>it-producer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>it-producer-deploy-springboot2-servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>it-producer-deploy-springboot2-standalone</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>jaxrs-tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
- <artifactId>pojo-test</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>pojo-tests</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>spring-jaxrs-tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>spring-pojo-connection-limit-test</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>spring-pojo-tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
+ <!-- springmvc-tests -->
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
- <artifactId>spring-pojo-connection-limit-test</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>springmvc-tests-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.tests</groupId>
+ <artifactId>springmvc-tests-connection-limit</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-general</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-general-with-springboot</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-simplified-mapping</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
- <artifactId>springmvc-tests-connection-limit</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>springmvc-tests-simplified-mapping-with-springboot</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
- <artifactId>springmvc-tests-simplified-mapping-with-springboot</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>test-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>tracing-tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/demo/demo-pojo/pojo-tests/pom.xml b/demo/demo-pojo/pojo-tests/pom.xml
deleted file mode 100644
index d8aa838..0000000
--- a/demo/demo-pojo/pojo-tests/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>demo-pojo</artifactId>
- <groupId>org.apache.servicecomb.demo</groupId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>pojo-tests</artifactId>
- <name>Java Chassis::Demo::POJO::Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>demo-schema</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>provider-pojo</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/PojoReferenceIntegrationTest.java b/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/PojoReferenceIntegrationTest.java
deleted file mode 100644
index 9efa4f5..0000000
--- a/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/PojoReferenceIntegrationTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.demo.integration;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.seanyinx.github.unit.scaffolding.Randomness;
-
-public class PojoReferenceIntegrationTest {
-
- private final int expected = Randomness.nextInt();
-
- @BeforeClass
- public static void setUp() throws Exception {
-// System.setProperty(LOCAL_REGISTRY_FILE_KEY, "notExistJustForceLocal");
- // TODO: add local registry
- SomePojoTestMain.main(new String[0]);
- }
-
- @Test
- public void startsUpAsUsualWhenRpcReferenceIsNotReachable() {
- assertThat(SomePojoTestMain.pojoService.localIdentity(expected), is(expected));
- }
-}
diff --git a/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoService.java b/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoService.java
deleted file mode 100644
index 12b2bd8..0000000
--- a/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.demo.integration;
-
-import org.apache.servicecomb.demo.CodeFirstPojoIntf;
-import org.apache.servicecomb.provider.pojo.RpcReference;
-import org.springframework.stereotype.Component;
-
-@Component
-class SomePojoService {
- @RpcReference(microserviceName = "pojo", schemaId = "org.apache.servicecomb.demo.CodeFirstPojoIntf")
- private CodeFirstPojoIntf codeFirstPojo;
-
- int localIdentity(int expected) {
- return expected;
- }
-
- String remoteSayHi(String username) {
- return codeFirstPojo.sayHi(username);
- }
-}
diff --git a/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoTestMain.java b/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoTestMain.java
deleted file mode 100644
index 30c298d..0000000
--- a/demo/demo-pojo/pojo-tests/src/test/java/org/apache/servicecomb/demo/integration/SomePojoTestMain.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.demo.integration;
-
-import javax.inject.Inject;
-
-import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
-import org.springframework.stereotype.Component;
-
-@Component
-class SomePojoTestMain {
-
- static SomePojoService pojoService;
-
- public static void main(String[] args) throws Exception {
- Log4jUtils.init();
- BeanUtils.init();
- }
-
- @Inject
- public void setPojoService(SomePojoService pojoService) {
- SomePojoTestMain.pojoService = pojoService;
- }
-}
diff --git a/demo/demo-pojo/pojo-tests/src/test/resources/microservice.yaml b/demo/demo-pojo/pojo-tests/src/test/resources/microservice.yaml
deleted file mode 100644
index 12e0ac5..0000000
--- a/demo/demo-pojo/pojo-tests/src/test/resources/microservice.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-APPLICATION_ID: pojotest
-service_description:
- name: pojo-test
- version: 0.0.4
- rest:
- address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
-
-servicecomb:
- rpcReference:
- loadingMode: eager
diff --git a/demo/demo-pojo/pom.xml b/demo/demo-pojo/pom.xml
index 666fe4d..aad9f85 100644
--- a/demo/demo-pojo/pom.xml
+++ b/demo/demo-pojo/pom.xml
@@ -30,7 +30,6 @@
<modules>
<module>pojo-server</module>
<module>pojo-client</module>
- <module>pojo-tests</module>
</modules>
<dependencies>
<dependency>
diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-client/pom.xml b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-client/pom.xml
index b744083..e9de71d 100644
--- a/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-client/pom.xml
+++ b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-client/pom.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.servicecomb.springboot.springmvc.client</groupId>
+
<artifactId>demo-spring-boot-springmvc-client</artifactId>
<name>Java Chassis::Demo::Spring Boot::Spring MVC Client</name>
<parent>
diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-server/pom.xml b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-server/pom.xml
index d71aab3..8d8674f 100644
--- a/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-server/pom.xml
+++ b/demo/demo-spring-boot-provider/demo-spring-boot-springmvc-server/pom.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.servicecomb.springboot.springmvc.server</groupId>
+
<artifactId>demo-spring-boot-springmvc-server</artifactId>
<name>Java Chassis::Demo::Spring Boot::Spring MVC Client</name>
<parent>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8720061..183d94e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -209,17 +209,18 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>registry-local</artifactId>
- <version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-schema-discovery</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>registry-service-center</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>registry-zero-config</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- solutions -->
diff --git a/integration-tests/it-common-service/enable-it-jar b/integration-tests/it-common-service/enable-it-jar
deleted file mode 100644
index 2944f98..0000000
--- a/integration-tests/it-common-service/enable-it-jar
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
diff --git a/integration-tests/it-common-service/pom.xml b/integration-tests/it-common-service/pom.xml
deleted file mode 100644
index e656830..0000000
--- a/integration-tests/it-common-service/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>integration-tests</artifactId>
- <groupId>org.apache.servicecomb.tests</groupId>
- <version>2.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>it-common-service</artifactId>
- <name>Java Chassis::IT::CommonService</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb.tests</groupId>
- <artifactId>it-common</artifactId>
- </dependency>
- </dependencies>
-
- <properties>
- <it.main>org.apache.servicecomb.it.CommonServiceMain</it.main>
- </properties>
-</project>
\ No newline at end of file
diff --git a/integration-tests/it-common-service/src/main/java/org/apache/servicecomb/it/CommonServiceMain.java b/integration-tests/it-common-service/src/main/java/org/apache/servicecomb/it/CommonServiceMain.java
deleted file mode 100644
index 7dfb147..0000000
--- a/integration-tests/it-common-service/src/main/java/org/apache/servicecomb/it/CommonServiceMain.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicecomb.it;
-
-public class CommonServiceMain {
- public static void main(String[] args) {
- ITMain.main(args);
- }
-}
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 5f3ec4f..7fa0061 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -44,7 +44,6 @@
<module>it-common</module>
<module>it-producer</module>
<module>it-edge</module>
- <module>it-common-service</module>
<module>it-producer-deploy-springboot2-standalone</module>
<module>it-producer-deploy-springboot2-servlet</module>
[servicecomb-java-chassis] 03/03: [SCB-1954]coverage do not include
tests code itself and some minor fix
Posted by wu...@apache.org.
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 199f8508f6bd210f27e0a699314464f667b5872d
Author: liubao <bi...@qq.com>
AuthorDate: Fri May 29 12:05:28 2020 +0800
[SCB-1954]coverage do not include tests code itself and some minor fix
---
coverage-reports/pom.xml | 48 ++++++++++++++++++++++
.../servicecomb/registry/RegistrationManager.java | 2 +-
.../schemadiscovery/SchemaDiscoveryEndpoint.java | 3 +-
3 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index b6f20a2..f42cca4 100644
--- a/coverage-reports/pom.xml
+++ b/coverage-reports/pom.xml
@@ -337,151 +337,179 @@
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>crossapp-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>crossapp-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo-edge -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>authentication</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>business-1-0-0</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>business-1-1-0</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>business-2-0-0</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>consumer</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>edge-service</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>model</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo-jaxrs -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>jaxrs-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>jaxrs-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo-local-registry -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-local-registry-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-local-registry-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo-multi-registries -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-multi-registries-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-multi-registries-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo-pojo -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>pojo-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>pojo-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo-register-url-prefix -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-register-url-prefix-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-register-url-prefix-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo schema -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-schema</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo spring boot provider -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-jaxrs-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-jaxrs-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-springmvc-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-springmvc-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo spring boot transport-->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-pojo-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>demo-spring-boot-pojo-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- demo springmvc -->
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>springmvc-client</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
<artifactId>springmvc-server</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- test cases in integration-test folder, sort by folder name -->
@@ -489,102 +517,122 @@
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>dynamic-config-tests</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-common</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-consumer</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-edge</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-producer</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-producer-deploy-springboot2-servlet</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>it-producer-deploy-springboot2-standalone</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>jaxrs-tests</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>pojo-test</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>spring-jaxrs-tests</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>spring-pojo-connection-limit-test</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>spring-pojo-tests</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- springmvc-tests -->
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-common</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-connection-limit</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-general</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-general-with-springboot</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-simplified-mapping</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>springmvc-tests-simplified-mapping-with-springboot</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>test-common</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.tests</groupId>
<artifactId>tracing-tests</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
index 7c44daa..2f2ae48 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistrationManager.java
@@ -115,7 +115,7 @@ public class RegistrationManager {
public void init() {
- registrationList.forEach(discovery -> discovery.init());
+ registrationList.forEach(registration -> registration.init());
}
public static String getPublishAddress() {
diff --git a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java
index c74f637..b6a69da 100644
--- a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java
+++ b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java
@@ -20,6 +20,7 @@ package org.apache.servicecomb.schemadiscovery;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.apache.servicecomb.provider.rest.common.RestSchema;
@@ -31,7 +32,7 @@ import org.apache.servicecomb.registry.RegistrationManager;
public class SchemaDiscoveryEndpoint {
@Path("/getSchema")
@GET
- public String getSchema(String schemaId) {
+ public String getSchema(@QueryParam("schemaId") String schemaId) {
return RegistrationManager.INSTANCE.getMicroservice().getSchemaMap().get(schemaId);
}
}