SCB-1086 Using spring-boot-2 by default

apache · Dec 24, 2018 · a4e9334 · a4e9334
1 parent 3e75610
commit a4e9334
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 54 deletions.
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -323,12 +323,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>spring-boot-2</id>
-      <properties>
-        <info.service.uri>/actuator/info</info.service.uri>
-      </properties>
-    </profile>
   </profiles>
 
 

diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
@@ -371,12 +371,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>spring-boot-2</id>
-      <properties>
-        <info.service.uri>/actuator/info</info.service.uri>
-      </properties>
-    </profile>
   </profiles>
 
 </project>
diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
@@ -340,12 +340,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>spring-boot-2</id>
-      <properties>
-        <info.service.uri>/actuator/info</info.service.uri>
-      </properties>
-    </profile>
   </profiles>
 
 </project>
diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
@@ -94,4 +94,18 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>spring-boot-1</id>
+      <properties>
+        <info.service.uri>/info</info.service.uri>
+      </properties>
+    </profile>
+    <profile>
+      <id>spring-boot-2</id>
+      <properties>
+        <info.service.uri>/actuator/info</info.service.uri>
+      </properties>
+    </profile>
+  </profiles>
 </project>
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
@@ -213,12 +213,6 @@
         </dependency>
       </dependencies>
     </profile>
-    <profile>
-    <id>spring-boot-2</id>
-      <properties>
-        <spring.boot.version>${spring.boot2.version}</spring.boot.version>
-      </properties>
-    </profile>
     <profile>
       <id>perf</id>
       <dependencies>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -122,9 +122,9 @@
   <profiles>
     <profile>
       <id>spring-boot-2</id>
-      <properties>
-        <spring.boot.version>${spring.boot2.version}</spring.boot.version>
-      </properties>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <!-- Need to add the dependency of log4j2 core -->
       <dependencies>
         <dependency>

diff --git a/demo/saga-dubbo-demo/pom.xml b/demo/saga-dubbo-demo/pom.xml
@@ -108,9 +108,6 @@
   <profiles>
     <profile>
       <id>spring-boot-2</id>
-      <properties>
-        <spring.boot.version>${spring.boot2.version}</spring.boot.version>
-      </properties>
       <!-- Need to add the dependency of log4j jar to avoid no class found error -->
       <dependencies>
         <dependency>

diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml
@@ -129,12 +129,6 @@
   </dependencies>
 
   <profiles>
-    <profile>
-      <id>spring-boot-2</id>
-      <properties>
-        <spring.boot.version>${spring.boot2.version}</spring.boot.version>
-      </properties>
-    </profile>
     <profile>
       <id>docker</id>
       <activation>

diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml
@@ -117,13 +117,4 @@
 
   </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/persistence/persistence-jpa/pom.xml b/persistence/persistence-jpa/pom.xml
@@ -86,13 +86,5 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>spring-boot-2</id>
-      <properties>
-        <spring.boot.version>${spring.boot2.version}</spring.boot.version>
-      </properties>
-    </profile>
-  </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -50,8 +50,9 @@
     <log4j.version>2.7</log4j.version>
     <disruptor.version>3.3.7</disruptor.version>
     <dubbo.version>2.6.1</dubbo.version>
-    <spring.boot.version>1.5.17.RELEASE</spring.boot.version>
+    <spring.boot1.version>1.5.17.RELEASE</spring.boot1.version>
     <spring.boot2.version>2.0.6.RELEASE</spring.boot2.version>
+    <spring.boot.version>${spring.boot2.version}</spring.boot.version>
     <java.chassis.version>1.0.0</java.chassis.version>
     <spring.version>4.3.18.RELEASE</spring.version>
     <akka.version>2.5.14</akka.version>
@@ -774,6 +775,18 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>spring-boot-1</id>
+      <properties>
+        <spring.boot.version>${spring.boot1.version}</spring.boot.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>spring-boot-2</id>
+      <properties>
+        <spring.boot.version>${spring.boot2.version}</spring.boot.version>
+      </properties>
+    </profile>
     <profile>
       <id>release</id>
       <modules>