SCB-463 Clean up the spring boot2 setting and upgrade the version to …

…2.0.1
apache · Apr 9, 2018 · 89485bc · 89485bc
1 parent 4630696
commit 89485bc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git 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
@@ -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/...ava/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java b/...ava/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java
@@ -136,7 +136,7 @@ public void sendsUserToRemote_AroundTransaction() throws Exception {
         toArray(messages)
     );
 
-    User actual = userRepository.findOne(user.id());
+    User actual = userRepository.findByUsername(user.username());
     assertThat(actual, is(user));
   }
 
@@ -169,8 +169,8 @@ public void compensateOnTransactionException() throws Exception {
     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/...t/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java b/...t/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java
@@ -41,6 +41,6 @@ User add(User user) {
   }
 
   void delete(User user) {
-    userRepository.delete(user.id());
+    userRepository.delete(user);
   }
 }
diff --git 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
@@ -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
@@ -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>