You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/04/09 07:18:10 UTC
[incubator-servicecomb-saga] branch master updated: SCB-463 Clean
up the spring boot2 setting and upgrade the version to 2.0.1
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 89485bc SCB-463 Clean up the spring boot2 setting and upgrade the version to 2.0.1
89485bc is described below
commit 89485bc1ace9b65b01ccc1f57faa8f3b4ce7bd8a
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Apr 6 10:23:00 2018 +0800
SCB-463 Clean up the spring boot2 setting and upgrade the version to 2.0.1
---
alpha/alpha-server/pom.xml | 2 +-
omega/omega-spring-tx/pom.xml | 9 +++++++++
.../omega/transaction/spring/TransactionInterceptionTest.java | 6 +++---
.../saga/omega/transaction/spring/TransactionalUserService.java | 2 +-
pom.xml | 1 +
saga-demo/pom.xml | 2 +-
saga-persistence/saga-persistence-jpa/pom.xml | 2 +-
7 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index 857068e..e1d6a8c 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -170,7 +170,7 @@
<profile>
<id>spring-boot-2</id>
<properties>
- <spring.boot.version>2.0.0.RELEASE</spring.boot.version>
+ <spring.boot.version>${spring.boot2.version}</spring.boot.version>
</properties>
<!-- Need to add the dependency of log4j2 core -->
<dependencies>
diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml
index 8cfca67..9be4774 100644
--- a/omega/omega-spring-tx/pom.xml
+++ b/omega/omega-spring-tx/pom.xml
@@ -112,4 +112,13 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>spring-boot-2</id>
+ <properties>
+ <spring.boot.version>${spring.boot2.version}</spring.boot.version>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java
index 9fd2a7e..2ec42a5 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java
@@ -136,7 +136,7 @@ public class TransactionInterceptionTest {
toArray(messages)
);
- User actual = userRepository.findOne(user.id());
+ User actual = userRepository.findByUsername(user.username());
assertThat(actual, is(user));
}
@@ -169,8 +169,8 @@ public class TransactionInterceptionTest {
messageHandler.onReceive(globalTxId, newLocalTxId, globalTxId, compensationMethod, user);
messageHandler.onReceive(globalTxId, anotherLocalTxId, localTxId, compensationMethod, anotherUser);
- assertThat(userRepository.findOne(user.id()), is(nullValue()));
- assertThat(userRepository.findOne(anotherUser.id()), is(nullValue()));
+ assertThat(userRepository.findByUsername(user.username()), is(nullValue()));
+ assertThat(userRepository.findByUsername(anotherUser.username()), is(nullValue()));
assertArrayEquals(
new String[]{
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java
index 0a8cdfd..c98c6ea 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java
@@ -41,6 +41,6 @@ class TransactionalUserService {
}
void delete(User user) {
- userRepository.delete(user.id());
+ userRepository.delete(user);
}
}
diff --git a/pom.xml b/pom.xml
index 3a0194d..3747ae1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
<kamon.version>0.6.7</kamon.version>
<log4j.version>2.6.2</log4j.version>
<spring.boot.version>1.5.10.RELEASE</spring.boot.version>
+ <spring.boot2.version>2.0.1.RELEASE</spring.boot2.version>
<spring.cloud.version>Camden.SR6</spring.cloud.version>
<java.chassis.version>0.5.0</java.chassis.version>
<spring.version>4.3.7.RELEASE</spring.version>
diff --git a/saga-demo/pom.xml b/saga-demo/pom.xml
index 7b0e734..10f27db 100644
--- a/saga-demo/pom.xml
+++ b/saga-demo/pom.xml
@@ -115,7 +115,7 @@
<profile>
<id>spring-boot-2</id>
<properties>
- <spring.boot.version>2.0.0.RELEASE</spring.boot.version>
+ <spring.boot.version>${spring.boot2.version}</spring.boot.version>
</properties>
<!-- Need to add the dependency of log4j2 core -->
<dependencies>
diff --git a/saga-persistence/saga-persistence-jpa/pom.xml b/saga-persistence/saga-persistence-jpa/pom.xml
index f3c1cc2..7a52930 100644
--- a/saga-persistence/saga-persistence-jpa/pom.xml
+++ b/saga-persistence/saga-persistence-jpa/pom.xml
@@ -89,7 +89,7 @@
<profile>
<id>spring-boot-2</id>
<properties>
- <spring.boot.version>2.0.0.RELEASE</spring.boot.version>
+ <spring.boot.version>${spring.boot2.version}</spring.boot.version>
</properties>
</profile>
</profiles>
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.