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 62766e9c0ff45973b8259d19176458a04037d310 Author: Willem Jiang <[email protected]> AuthorDate: Tue Sep 4 16:40:13 2018 +0800 SCB-820 Updated the pom setting to fix the build with docker --- saga-demo/tcc-spring-demo/inventory/pom.xml | 2 +- .../demo/pack/inventory/InventoryServiceTest.java | 28 ---------------- .../inventory/src/test/resources/application.yaml | 37 ---------------------- saga-demo/tcc-spring-demo/ordering/pom.xml | 2 +- saga-demo/tcc-spring-demo/payment/pom.xml | 2 +- 5 files changed, 3 insertions(+), 68 deletions(-) diff --git a/saga-demo/tcc-spring-demo/inventory/pom.xml b/saga-demo/tcc-spring-demo/inventory/pom.xml index aed29e4..f6370d6 100644 --- a/saga-demo/tcc-spring-demo/inventory/pom.xml +++ b/saga-demo/tcc-spring-demo/inventory/pom.xml @@ -26,7 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>Tcc-Inventory</artifactId> + <artifactId>tcc-inventory</artifactId> <name>Saga::Demo::Tcc-Spring-Demo::Tcc-Inventory</name> <dependencies> diff --git a/saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java b/saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java deleted file mode 100644 index b8d51c6..0000000 --- a/saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.apache.servicecomb.saga.demo.pack.inventory; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@SpringBootTest -@RunWith(SpringJUnit4ClassRunner.class) -public class InventoryServiceTest { - - private InventoryService inventoryService; - - @Test - public void reserve() { - Integer count = inventoryService.reserve(1L, 10); - assertThat(count).isNotNull().isEqualTo(10); - } - - @Autowired - public void setInventoryService(InventoryService inventoryService) { - this.inventoryService = inventoryService; - } -} \ No newline at end of file diff --git a/saga-demo/tcc-spring-demo/inventory/src/test/resources/application.yaml b/saga-demo/tcc-spring-demo/inventory/src/test/resources/application.yaml deleted file mode 100644 index c8e3e32..0000000 --- a/saga-demo/tcc-spring-demo/inventory/src/test/resources/application.yaml +++ /dev/null @@ -1,37 +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. -## --------------------------------------------------------------------------- -spring: - application: - name: inventory - datasource: - url: jdbc:h2:mem:inventory-test - h2: - console: - enabled: true - jpa: - show-sql: true - generate-ddl: true - hibernate: - ddl-auto: create-drop - naming: - physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy - implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy -alpha: - cluster: - address: alpha-server.servicecomb.io:8080 -server: - port: 10020 \ No newline at end of file diff --git a/saga-demo/tcc-spring-demo/ordering/pom.xml b/saga-demo/tcc-spring-demo/ordering/pom.xml index 6cbbba1..0029e8d 100644 --- a/saga-demo/tcc-spring-demo/ordering/pom.xml +++ b/saga-demo/tcc-spring-demo/ordering/pom.xml @@ -26,7 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>Tcc-Ordering</artifactId> + <artifactId>tcc-ordering</artifactId> <name>Saga::Demo::Tcc-Spring-Demo::Tcc-Ordering</name> <dependencies> diff --git a/saga-demo/tcc-spring-demo/payment/pom.xml b/saga-demo/tcc-spring-demo/payment/pom.xml index e950acc..667060e 100644 --- a/saga-demo/tcc-spring-demo/payment/pom.xml +++ b/saga-demo/tcc-spring-demo/payment/pom.xml @@ -24,7 +24,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>Tcc-Payment</artifactId> + <artifactId>tcc-payment</artifactId> <name>Saga::Demo::Tcc-Spring-Demo::Tcc-Payment</name> <dependencies>
