You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/05/15 06:32:02 UTC
[shardingsphere] branch master updated: Update order of dependencies (#17666)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 8699c570806 Update order of dependencies (#17666)
8699c570806 is described below
commit 8699c57080653093d9a14c1dd716d8974d9e20f0
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun May 15 14:31:56 2022 +0800
Update order of dependencies (#17666)
---
examples/pom.xml | 4 ++--
.../transaction-2pc-xa-spring-namespace-example/pom.xml | 5 +++--
pom.xml | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index cc3f727f5d7..4c1afa3bdaa 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -211,12 +211,12 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
+ <artifactId>spring-jdbc</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
+ <artifactId>spring-tx</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/pom.xml b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/pom.xml
index 4870525bda3..b012d55ca06 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/pom.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/pom.xml
@@ -37,13 +37,14 @@
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-jdbc-core-spring-namespace</artifactId>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
+ <artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
+ <artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4076f15a895..fbfa3e86977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,13 +458,13 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
+ <artifactId>spring-jdbc</artifactId>
<version>${springframework.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
+ <artifactId>spring-tx</artifactId>
<version>${springframework.version}</version>
<scope>provided</scope>
</dependency>