This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit d9ed37716d2bac28e4a72dfb0814bd65aa6c24f0 Author: seanyinx <[email protected]> AuthorDate: Mon Jan 22 10:51:09 2018 +0800 SCB-238 removed org.json from dependency to comply with APL Signed-off-by: seanyinx <[email protected]> --- alpha/alpha-server/pom.xml | 12 ++++++++++++ integration-tests/pack-tests/pom.xml | 12 ++++++++++++ omega/pom.xml | 12 ++++++++++++ pom.xml | 6 ------ saga-core/pom.xml | 4 ---- .../saga/core/CompositeSagaResponseTest.java | 18 ++++++++---------- .../conditional-transaction-demo-tests/pom.xml | 5 ----- .../conditional-transaction-demo/inventory/pom.xml | 5 ----- .../conditional-transaction-demo/payment/pom.xml | 5 ----- .../demo-tests/pom.xml | 5 ----- .../hotel-reservation-service/pom.xml | 5 ----- .../payment-service/pom.xml | 5 ----- saga-demo/pom.xml | 20 ++++++++++++++++++++ saga-discovery/saga-discovery-servicecenter/pom.xml | 16 ++++++++++++++-- saga-spring/pom.xml | 12 ++++++++++++ 15 files changed, 90 insertions(+), 52 deletions(-) diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml index a05177a..9efdf78 100644 --- a/alpha/alpha-server/pom.xml +++ b/alpha/alpha-server/pom.xml @@ -33,6 +33,18 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> <version>${spring.boot.version}</version> <type>pom</type> diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml index 5c31c79..75b7292 100644 --- a/integration-tests/pack-tests/pom.xml +++ b/integration-tests/pack-tests/pom.xml @@ -34,6 +34,18 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> <version>${spring.boot.version}</version> <type>pom</type> diff --git a/omega/pom.xml b/omega/pom.xml index cf1a54b..fd4e657 100644 --- a/omega/pom.xml +++ b/omega/pom.xml @@ -44,6 +44,18 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> <version>${spring.boot.version}</version> <type>pom</type> diff --git a/pom.xml b/pom.xml index 42b0a63..dbd748e 100755 --- a/pom.xml +++ b/pom.xml @@ -439,12 +439,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>uk.co.datumedge</groupId> - <artifactId>hamcrest-json</artifactId> - <version>0.2</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <version>${spring.version}</version> diff --git a/saga-core/pom.xml b/saga-core/pom.xml index bdf06e1..f9ba426 100644 --- a/saga-core/pom.xml +++ b/saga-core/pom.xml @@ -98,10 +98,6 @@ <groupId>com.github.seanyinx</groupId> <artifactId>unit-scaffolding</artifactId> </dependency> - <dependency> - <groupId>uk.co.datumedge</groupId> - <artifactId>hamcrest-json</artifactId> - </dependency> </dependencies> </project> diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java index 885224f..be4b9f4 100644 --- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java +++ b/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java @@ -21,7 +21,6 @@ import static java.util.Arrays.asList; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.when; -import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; import org.junit.Test; import org.mockito.Mockito; @@ -61,15 +60,14 @@ public class CompositeSagaResponseTest { + " \"body\" : \"blah\"\n" + "}\n"); - assertThat(compositeSagaResponse.body(), sameJSONAs("[\n" - + " {\n" - + " \"status\": 500,\n" - + " \"body\": \"oops\"\n" - + " },\n" - + " {\n" - + " \"status\": 200,\n" - + " \"body\": \"blah\"\n" - + " }\n" + assertThat(compositeSagaResponse.body(), is("[{\n" + + " \"status\": 500,\n" + + " \"body\" : \"oops\"\n" + + "}\n" + + ", {\n" + + " \"status\": 200,\n" + + " \"body\" : \"blah\"\n" + + "}\n" + "]")); } } diff --git a/saga-demo/conditional-transaction-demo/conditional-transaction-demo-tests/pom.xml b/saga-demo/conditional-transaction-demo/conditional-transaction-demo-tests/pom.xml index 6b07471..ffe53b1 100644 --- a/saga-demo/conditional-transaction-demo/conditional-transaction-demo-tests/pom.xml +++ b/saga-demo/conditional-transaction-demo/conditional-transaction-demo-tests/pom.xml @@ -45,11 +45,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <scope>test</scope> diff --git a/saga-demo/conditional-transaction-demo/inventory/pom.xml b/saga-demo/conditional-transaction-demo/inventory/pom.xml index 56c3a8f..281ea34 100644 --- a/saga-demo/conditional-transaction-demo/inventory/pom.xml +++ b/saga-demo/conditional-transaction-demo/inventory/pom.xml @@ -36,11 +36,6 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/saga-demo/conditional-transaction-demo/payment/pom.xml b/saga-demo/conditional-transaction-demo/payment/pom.xml index 06a7216..1792916 100644 --- a/saga-demo/conditional-transaction-demo/payment/pom.xml +++ b/saga-demo/conditional-transaction-demo/payment/pom.xml @@ -37,11 +37,6 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/saga-demo/dependency-free-transaction-demo/demo-tests/pom.xml b/saga-demo/dependency-free-transaction-demo/demo-tests/pom.xml index 81594b4..038a47a 100644 --- a/saga-demo/dependency-free-transaction-demo/demo-tests/pom.xml +++ b/saga-demo/dependency-free-transaction-demo/demo-tests/pom.xml @@ -45,11 +45,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <scope>test</scope> diff --git a/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/pom.xml b/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/pom.xml index 8ec9534..dd8ad4b 100644 --- a/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/pom.xml +++ b/saga-demo/dependency-free-transaction-demo/hotel-reservation-service/pom.xml @@ -47,11 +47,6 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/saga-demo/dependency-free-transaction-demo/payment-service/pom.xml b/saga-demo/dependency-free-transaction-demo/payment-service/pom.xml index d21a7e4..045f324 100644 --- a/saga-demo/dependency-free-transaction-demo/payment-service/pom.xml +++ b/saga-demo/dependency-free-transaction-demo/payment-service/pom.xml @@ -47,11 +47,6 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/saga-demo/pom.xml b/saga-demo/pom.xml index 4bd0e9d..4e6c28c 100644 --- a/saga-demo/pom.xml +++ b/saga-demo/pom.xml @@ -38,6 +38,18 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> <version>${spring.boot.version}</version> <type>pom</type> @@ -46,6 +58,14 @@ </dependencies> </dependencyManagement> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> <plugins> <plugin> diff --git a/saga-discovery/saga-discovery-servicecenter/pom.xml b/saga-discovery/saga-discovery-servicecenter/pom.xml index f86d6ea..9137234 100644 --- a/saga-discovery/saga-discovery-servicecenter/pom.xml +++ b/saga-discovery/saga-discovery-servicecenter/pom.xml @@ -30,6 +30,18 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.servicecomb</groupId> <artifactId>java-chassis-dependencies</artifactId> <version>${java.chassis.version}</version> @@ -62,11 +74,9 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <scope>test</scope> <exclusions> <exclusion> <groupId>ch.qos.logback</groupId> @@ -74,6 +84,7 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> @@ -82,6 +93,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> diff --git a/saga-spring/pom.xml b/saga-spring/pom.xml index b96b2a9..ace3d7c 100755 --- a/saga-spring/pom.xml +++ b/saga-spring/pom.xml @@ -41,6 +41,18 @@ <version>${spring.version}</version> </dependency> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <version>${spring.boot.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.servicecomb</groupId> <artifactId>java-chassis-dependencies</artifactId> <version>${java.chassis.version}</version> -- To stop receiving notification emails like this one, please contact [email protected].
