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/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new a4e9334 SCB-1086 Using spring-boot-2 by default
a4e9334 is described below
commit a4e9334c43450308b168a5cb9281c0fb25de4ed1
Author: longchun <[email protected]>
AuthorDate: Mon Dec 24 18:07:26 2018 +0800
SCB-1086 Using spring-boot-2 by default
---
acceptance-tests/acceptance-pack-dubbo-demo/pom.xml | 6 ------
acceptance-tests/acceptance-pack-spring-demo/pom.xml | 6 ------
acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml | 6 ------
acceptance-tests/pom.xml | 14 ++++++++++++++
alpha/alpha-server/pom.xml | 6 ------
demo/pom.xml | 6 +++---
demo/saga-dubbo-demo/pom.xml | 3 ---
integration-tests/pack-tests/pom.xml | 6 ------
omega/omega-spring-tx/pom.xml | 9 ---------
persistence/persistence-jpa/pom.xml | 8 --------
pom.xml | 15 ++++++++++++++-
11 files changed, 31 insertions(+), 54 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
index f256fe3..ea0b329 100644
--- 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
index e81aab9..277346e 100644
--- 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
index 2503b8a..3061600 100644
--- 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
index dd3534a..146d244 100644
--- 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
index ae81145..a7cf347 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -214,12 +214,6 @@
</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>
<dependency>
diff --git a/demo/pom.xml b/demo/pom.xml
index 556201b..9c48c8d 100644
--- 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
index ef4c783..7eccf91 100644
--- 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
index dc7d1d9..033c03f 100644
--- a/integration-tests/pack-tests/pom.xml
+++ b/integration-tests/pack-tests/pom.xml
@@ -130,12 +130,6 @@
<profiles>
<profile>
- <id>spring-boot-2</id>
- <properties>
- <spring.boot.version>${spring.boot2.version}</spring.boot.version>
- </properties>
- </profile>
- <profile>
<id>docker</id>
<activation>
<file>
diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml
index f76ac38..c29a97a 100644
--- 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
index c68e377..2f51868 100644
--- 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
index 5c8aa56..f42c499 100644
--- 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>
@@ -775,6 +776,18 @@
<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>
<module>demo</module>
