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
The following commit(s) were added to refs/heads/master by this push:
new d75dfe8 Clean up the pom.xml setting
d75dfe8 is described below
commit d75dfe82d8f4a8a5084fdc44187ea01f110f0dfc
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Sun Aug 12 15:01:17 2018 +0800
Clean up the pom.xml setting
---
pom.xml | 19 +++++++++----------
saga-demo/dependency-free-transaction-demo/pom.xml | 5 -----
saga-demo/saga-servicecomb-demo/pom.xml | 3 ---
saga-spring/pom.xml | 5 -----
saga-web/pom.xml | 5 -----
5 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd532ce..e3c752c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -511,10 +511,15 @@
<version>1.2</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>${eclipse.link.version}</version>
- </dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
+ <version>${eclipse.link.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.6</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -548,12 +553,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>3.0.0</version>
diff --git a/saga-demo/dependency-free-transaction-demo/pom.xml
b/saga-demo/dependency-free-transaction-demo/pom.xml
index 17f3ac7..abdbc64 100644
--- a/saga-demo/dependency-free-transaction-demo/pom.xml
+++ b/saga-demo/dependency-free-transaction-demo/pom.xml
@@ -31,11 +31,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.6</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>spring-boot-starter-provider</artifactId>
<version>${java.chassis.version}</version>
diff --git a/saga-demo/saga-servicecomb-demo/pom.xml
b/saga-demo/saga-servicecomb-demo/pom.xml
index 7f5f9d8..ef8f46b 100644
--- a/saga-demo/saga-servicecomb-demo/pom.xml
+++ b/saga-demo/saga-servicecomb-demo/pom.xml
@@ -53,13 +53,10 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>20.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.6</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/saga-spring/pom.xml b/saga-spring/pom.xml
index c916e35..b477113 100755
--- a/saga-spring/pom.xml
+++ b/saga-spring/pom.xml
@@ -29,11 +29,6 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.6</version>
- </dependency>
<!-- java chassis jdbc version conflicts with the one defined in spring
boot, so we override the version here -->
<dependency>
<groupId>org.springframework</groupId>
diff --git a/saga-web/pom.xml b/saga-web/pom.xml
index cce93c9..007e6d0 100644
--- a/saga-web/pom.xml
+++ b/saga-web/pom.xml
@@ -32,11 +32,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.6</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>spring-boot-starter-provider</artifactId>
<version>${java.chassis.version}</version>
