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 2019/08/01 14:24:53 UTC
[servicecomb-pack] branch master updated (412c331 -> 135e6e9)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git.
from 412c331 Try to fix the CI error of AlphaIntegrationTest
new 99204cc SCB-1399 Drop the support of Spring Boot 1.x for ServiceComb-Pack
new 135e6e9 SCB-1399 Remove parameter -P${SPRING_BOOT_PROFILE}
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 7 +----
README.md | 8 +++---
README_ZH.md | 8 +++---
acceptance-tests/pom.xml | 19 +-------------
alpha/alpha-fsm/README.md | 2 +-
alpha/alpha-server/pom.xml | 23 ----------------
demo/pom.xml | 33 +++++++----------------
demo/saga-dubbo-demo/pom.xml | 21 ++++-----------
docs/user_guide.md | 16 +++---------
docs/user_guide_zh.md | 16 +++---------
pom.xml | 62 ++++----------------------------------------
scripts/test.sh | 6 ++---
12 files changed, 40 insertions(+), 181 deletions(-)
[servicecomb-pack] 01/02: SCB-1399 Drop the support of Spring Boot
1.x for ServiceComb-Pack
Posted by ni...@apache.org.
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
commit 99204cc62746da2526b1b4b1cb82d1b0c85f3509
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Sun Jul 28 19:23:28 2019 +0800
SCB-1399 Drop the support of Spring Boot 1.x for ServiceComb-Pack
---
.travis.yml | 7 +----
README.md | 8 +++---
README_ZH.md | 8 +++---
acceptance-tests/pom.xml | 19 +-------------
alpha/alpha-fsm/README.md | 2 +-
alpha/alpha-server/pom.xml | 23 ----------------
demo/pom.xml | 33 +++++++----------------
demo/saga-dubbo-demo/pom.xml | 21 ++++-----------
docs/user_guide.md | 16 +++---------
docs/user_guide_zh.md | 16 +++---------
pom.xml | 62 ++++----------------------------------------
11 files changed, 37 insertions(+), 178 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f837cb6..bc7dc8d 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,11 +25,6 @@ language: java
install: true
jdk:
- openjdk8
-env:
- # dummy profile
- - SPRING_BOOT_PROFILE=spring-boot-1
- # use spring-boot-2 profile
- - SPRING_BOOT_PROFILE=spring-boot-2
script: ./scripts/test.sh
after_success:
-- if [ "$TRAVIS_EVENT_TYPE" == "cron" ] && [ "$SPRING_BOOT_PROFILE" == "spring-boot-2" ]; then bash -x scripts/deploy.sh ; fi
+- if [ "$TRAVIS_EVENT_TYPE" == "cron" ]; then bash -x scripts/deploy.sh ; fi
diff --git a/README.md b/README.md
index daa2057..9af0f7e 100644
--- a/README.md
+++ b/README.md
@@ -33,20 +33,18 @@ Now we have different lanaguage implementation of Omega
* To debug the applications, please see [Spring Demo Debugging](demo/saga-spring-demo#debugging) for details.
## Build and Run the tests from source
-Current ServiceComb Pack code supports Spring Boot 1.x and Spring Boot 2.x at the same time, you can use *-Pspring-boot-1*, *-Pspring-boot-1* to switch Spring Boot version.
-Since Spring Boot supports JDK9+ from 2.x, if you want to build and run tests of ServiceComb Pack with JDK9 or JDK10, please use the spring-boot-2 profile. Please run the flowing comment from the root directory of ServiceComb Pack.
* Build the source code and run the tests
```bash
- $ mvn clean install -Pspring-boot-2
+ $ mvn clean install
```
* Build the source demo docker images and run the accept tests
```bash
- $ mvn clean install -Pdemo,spring-boot-2
+ $ mvn clean install -Pdemo
```
* Build the source code and docker images without running tests, the docker profile will be activated if the maven detects the docker installation.
```bash
- $ mvn clean install -DskipTests=true -Pdemo,spring-boot-2
+ $ mvn clean install -DskipTests=true -Pdemo
```
* Build the release kit for distribution without running the tests, then you can find the release kits in the distribution/target directory.
```bash
diff --git a/README_ZH.md b/README_ZH.md
index 43a0f77..05d5f85 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -36,20 +36,18 @@ ServiceComb Pack 架构是由 **alpha** 和 **omega**组成，其中：
## 编译和运行代码
-当前ServiceComb Pack同时支持Spring Boot 1.x 以及 Spring Boot 2.x，你可以使用 *-Pspring-boot-1* ，*-Pspring-boot-2* 参数转换Spring Boot版本。
-由于Spring Boot 只在2.x开始支持 JDK9，如果你想用JDK9或者JDK10来编译Pack并运行测试的话，请使用spring-boot-2 profile参数。下面示例的所有命令需要在Pack根目录下运行。
* 编译代码并且运行相关的单元测试
```bash
- $ mvn clean install -Pspring-boot-2
+ $ mvn clean install
```
* 编译示例代码，并生成docker镜像（maven会根据是否安装docker来启动这部分的设置），运行验收测试。
```bash
- $ mvn clean install -Pdemo,spring-boot-2
+ $ mvn clean install -Pdemo
```
* 编译示例代码，并生产docker镜像, 不运行测试
```bash
- $ mvn clean install -DskipTests=true -Pdemo,spring-boot-2
+ $ mvn clean install -DskipTests=true -Pdemo
```
* 编译软件发布包，不运行测试, maven会在distribution/target目录下生成的发布包.
```bash
diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
index a77af02..d84fd4a 100644
--- a/acceptance-tests/pom.xml
+++ b/acceptance-tests/pom.xml
@@ -42,6 +42,7 @@
<properties>
<cucumber.version>2.3.1</cucumber.version>
+ <info.service.uri>/actuator/info</info.service.uri>
</properties>
<dependencies>
@@ -98,22 +99,4 @@
<scope>test</scope>
</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>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <info.service.uri>/actuator/info</info.service.uri>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/alpha/alpha-fsm/README.md b/alpha/alpha-fsm/README.md
index e395612..405f8a5 100644
--- a/alpha/alpha-fsm/README.md
+++ b/alpha/alpha-fsm/README.md
@@ -7,7 +7,7 @@
```bash
git clone -b SCB-1321 git@github.com:apache/servicecomb-pack.git
-mvn clean install -DskipTests=true -Pdemo,spring-boot-2
+mvn clean install -DskipTests=true -Pdemo
```
## Unit Tests
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index 5c18f4a..42a1734 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -257,29 +257,6 @@
</build>
</profile>
<profile>
- <id>spring-boot-2</id>
- <!-- Specify the alpha spring boot starter with the profile-->
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>alpha-spring-boot-starter-2</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>spring-boot-1</id>
- <!-- Specify the alpha spring boot starter with the profile-->
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>alpha-spring-boot-starter-1</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>spring-cloud-eureka</id>
<!-- Specify the alpha spring boot starter with the profile-->
<dependencies>
diff --git a/demo/pom.xml b/demo/pom.xml
index d488375..2d306ad 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -76,6 +76,16 @@
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>3.3.7</version>
+ </dependency>
</dependencies>
<build>
@@ -118,27 +128,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>spring-boot-2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <!-- Need to add the dependency of log4j2 core -->
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- <version>3.3.7</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/demo/saga-dubbo-demo/pom.xml b/demo/saga-dubbo-demo/pom.xml
index a637c8b..febab9b 100644
--- a/demo/saga-dubbo-demo/pom.xml
+++ b/demo/saga-dubbo-demo/pom.xml
@@ -104,21 +104,10 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
+ <dependency>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ <version>1.2.17</version>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>spring-boot-2</id>
- <!-- Need to add the dependency of log4j jar to avoid no class found error -->
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- <version>1.2.17</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/docs/user_guide.md b/docs/user_guide.md
index 6963a9a..9a75192 100644
--- a/docs/user_guide.md
+++ b/docs/user_guide.md
@@ -22,17 +22,17 @@ $ cd servicecomb-pack
Saga can be built in either of the following ways.
* Only build the executable files.
```bash
- $ mvn clean install -DskipTests -Pspring-boot-2
+ $ mvn clean install -DskipTests
```
* build the executable files along with docker image.
```bash
- $ mvn clean install -DskipTests -Pdocker,spring-boot-2
+ $ mvn clean install -DskipTests -Pdocker
```
* build the executable file and saga-distribution
```bash
- $ mvn clean install -DskipTests -Prelease,spring-boot-2
+ $ mvn clean install -DskipTests -Prelease
```
After executing either one of the above command, you will find alpha server's executable file in `alpha/alpha-server/target/saga/alpha-server-${version}-exec.jar`.
@@ -313,8 +313,6 @@ Alpha instance can register to the discovery service, Omega obtains Alpha's inst
### Consul
-Uses Spring Cloud Consul 2.x by default, if you want to use Spring Cloud Consul 1.x, you can use `-Pspring-boot-1` to switch Spring Cloud Consul 1.x
-
1. run alpha
run with parameter `spring.cloud.consul.enabled=true`
@@ -424,8 +422,6 @@ Uses Spring Cloud Consul 2.x by default, if you want to use Spring Cloud Consul
### Spring Cloud Eureka
-Uses Spring Cloud Netflix 2.x by default, if you want to use Spring Cloud Netflix 1.x, you can use `-Pspring-boot-1` to switch Spring Cloud Netflix 1.x
-
1. build version of eureka
build the version support eureka with the `-Pspring-cloud-eureka` parameter
@@ -433,7 +429,7 @@ Uses Spring Cloud Netflix 2.x by default, if you want to use Spring Cloud Netfli
```bash
git clone https://github.com/apache/servicecomb-pack.git
cd servicecomb-pack
- mvn clean install -DskipTests=true -Pspring-boot-2,spring-cloud-eureka
+ mvn clean install -DskipTests=true -Pspring-cloud-eureka
```
2. run alpha
@@ -536,8 +532,6 @@ Uses Spring Cloud Netflix 2.x by default, if you want to use Spring Cloud Netfli
### Spring Cloud Zookeeper
-Uses Spring Cloud Zookeeper 2.x by default, if you want to use Spring Cloud Zookeeper 1.x, you can use `-Pspring-boot-1` to switch Spring Cloud Zookeeper 1.x
-
1. run alpha
run with parameter `spring.cloud.zookeeper.enabled=true`
@@ -668,8 +662,6 @@ Uses Spring Cloud Zookeeper 2.x by default, if you want to use Spring Cloud Zook
### Spring Cloud Nacos Discovery
-Uses Spring Cloud Nacos Discovery 0.2.x by default, if you want to use Spring Cloud Nacos Discovery 0.1.x, you can use `-Pspring-boot-1` to switch Spring Cloud Nacos Discovery 0.1.x
-
1. run alpha
run with parameter `nacos.client.enabled=true`
diff --git a/docs/user_guide_zh.md b/docs/user_guide_zh.md
index 93ff475..0a7a70d 100644
--- a/docs/user_guide_zh.md
+++ b/docs/user_guide_zh.md
@@ -21,17 +21,17 @@ $ cd servicecomb-pack
Saga可通过以下任一方式进行构建：
* 只构建可执行文件：
```bash
- $ mvn clean install -DskipTests -Pspring-boot-2
+ $ mvn clean install -DskipTests
```
* 同时构建可执行文件和docker镜像：
```bash
- $ mvn clean install -DskipTests -Pdocker,spring-boot-2
+ $ mvn clean install -DskipTests -Pdocker
```
* 同时构建可执行文件以及Saga发行包
```bash
- $ mvn clean install -DskipTests -Prelease,spring-boot-2
+ $ mvn clean install -DskipTests -Prelease
```
@@ -317,8 +317,6 @@ public void bar(BarCommandWithTxContext cmdWithTxContext) {
### Consul 支持
-当前版本支持 Spring Cloud Consul 2.x，你可以使用 `-Pspring-boot-1` 参数重新编译支持 Spring Cloud Consul 1.x 版本
-
1. 运行alpha
运行时增加 `spring.cloud.consul.enabled=true` 参数
@@ -424,8 +422,6 @@ public void bar(BarCommandWithTxContext cmdWithTxContext) {
### Spring Cloud Eureka支持
-当前版本支持 Spring Cloud Netflix 2.x，你可以使用 `-Pspring-boot-1` 参数重新编译支持 Spring Cloud Netflix 1.x 版本
-
1. 编译 eureka 的版本
使用 `-Pspring-cloud-eureka` 参数编译支持 eureka 的版本
@@ -433,7 +429,7 @@ public void bar(BarCommandWithTxContext cmdWithTxContext) {
```bash
git clone https://github.com/apache/servicecomb-pack.git
cd servicecomb-pack
- mvn clean install -DskipTests=true -Pspring-boot-2,spring-cloud-eureka
+ mvn clean install -DskipTests=true -Pspring-cloud-eureka
```
2. 运行alpha
@@ -535,8 +531,6 @@ public void bar(BarCommandWithTxContext cmdWithTxContext) {
### Spring Cloud Zookeeper 支持
-当前版本支持 Spring Cloud Zookeeper 2.x，你可以使用 `-Pspring-boot-1` 参数重新编译支持 Spring Cloud Zookeeper 1.x 版本
-
1. 运行alpha
运行时增加 `spring.cloud.zookeeper.enabled=true` 参数
@@ -661,8 +655,6 @@ public void bar(BarCommandWithTxContext cmdWithTxContext) {
### Spring Cloud Nacos Discovery 支持
-当前版本支持 Spring Cloud Nacos Discovery 0.2.x，你可以使用 `-Pspring-boot-1` 参数重新编译支持 Spring Cloud Nacos Discovery 0.1.x 版本
-
1. 运行alpha
运行时增加 `nacos.client.enabled=true` 参数
diff --git a/pom.xml b/pom.xml
index 7fd340c..62d7ae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,22 +50,11 @@
<log4j.version>2.7</log4j.version>
<disruptor.version>3.3.7</disruptor.version>
<dubbo.version>2.6.4</dubbo.version>
- <spring.boot1.version>1.5.17.RELEASE</spring.boot1.version>
- <spring.boot2.version>2.1.6.RELEASE</spring.boot2.version>
- <spring.boot.version>${spring.boot2.version}</spring.boot.version>
- <spring.cloud1.version>1.4.6.RELEASE</spring.cloud1.version>
- <spring.cloud2.version>2.1.1.RELEASE</spring.cloud2.version>
- <spring.cloud.version>${spring.cloud2.version}</spring.cloud.version>
- <spring.cloud.starter.consul.discovery1.version>1.3.5.RELEASE</spring.cloud.starter.consul.discovery1.version>
- <spring.cloud.starter.consul.discovery2.version>2.1.1.RELEASE</spring.cloud.starter.consul.discovery2.version>
- <spring.cloud.starter.consul.discovery.version>${spring.cloud.starter.consul.discovery2.version}</spring.cloud.starter.consul.discovery.version>
- <spring.cloud.starter.zookeeper.discovery1.version>1.2.2.RELEASE</spring.cloud.starter.zookeeper.discovery1.version>
- <spring.cloud.starter.zookeeper.discovery2.version>${spring.cloud.version}</spring.cloud.starter.zookeeper.discovery2.version>
- <spring.cloud.starter.zookeeper.discovery.version>${spring.cloud.starter.zookeeper.discovery2.version}</spring.cloud.starter.zookeeper.discovery.version>
-
- <spring.cloud.starter.alibaba.nacos.discovery1.version>0.1.2.RELEASE</spring.cloud.starter.alibaba.nacos.discovery1.version>
- <spring.cloud.starter.alibaba.nacos.discovery2.version>0.2.2.RELEASE</spring.cloud.starter.alibaba.nacos.discovery2.version>
- <spring.cloud.starter.alibaba.nacos.discovery.version>${spring.cloud.starter.alibaba.nacos.discovery2.version}</spring.cloud.starter.alibaba.nacos.discovery.version>
+ <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
+ <spring.cloud.version>2.1.1.RELEASE</spring.cloud.version>
+ <spring.cloud.starter.consul.discovery.version>2.1.1.RELEASE</spring.cloud.starter.consul.discovery.version>
+ <spring.cloud.starter.zookeeper.discovery.version>2.1.1.RELEASE</spring.cloud.starter.zookeeper.discovery.version>
+ <spring.cloud.starter.alibaba.nacos.discovery.version>0.2.2.RELEASE</spring.cloud.starter.alibaba.nacos.discovery.version>
<java.chassis.version>1.2.1</java.chassis.version>
<akka.version>2.5.14</akka.version>
@@ -366,16 +355,6 @@
<version>0.5.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>alpha-spring-boot-starter-1</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>alpha-spring-boot-starter-2</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
<version>${spring.cloud.starter.consul.discovery.version}</version>
@@ -874,37 +853,6 @@
<profiles>
<profile>
- <id>spring-boot-1</id>
- <properties>
- <spring.boot.version>${spring.boot1.version}</spring.boot.version>
- <spring.cloud.version>${spring.cloud1.version}</spring.cloud.version>
- <spring.cloud.starter.consul.discovery.version>${spring.cloud.starter.consul.discovery1.version}</spring.cloud.starter.consul.discovery.version>
- <spring.cloud.starter.zookeeper.discovery.version>${spring.cloud.starter.zookeeper.discovery1.version}</spring.cloud.starter.zookeeper.discovery.version>
- <spring.cloud.starter.alibaba.nacos.discovery.version>${spring.cloud.starter.alibaba.nacos.discovery1.version}</spring.cloud.starter.alibaba.nacos.discovery.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <!-- support zookeeper discovery in 1.2.2
- rx.Single error in upgrade rxjava version to 1.1.5 -->
- <dependency>
- <groupId>io.reactivex</groupId>
- <artifactId>rxjava</artifactId>
- <version>1.1.5</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- <profile>
- <id>spring-boot-2</id>
- <properties>
- <spring.boot.version>${spring.boot2.version}</spring.boot.version>
- <spring.cloud.version>${spring.cloud2.version}</spring.cloud.version>
- <spring.cloud.starter.consul.discovery.version>${spring.cloud.starter.consul.discovery2.version}</spring.cloud.starter.consul.discovery.version>
- <spring.cloud.starter.zookeeper.discovery.version>${spring.cloud.starter.zookeeper.discovery2.version}</spring.cloud.starter.zookeeper.discovery.version>
- <spring.cloud.starter.alibaba.nacos.discovery.version>${spring.cloud.starter.alibaba.nacos.discovery2.version}</spring.cloud.starter.alibaba.nacos.discovery.version>
- </properties>
- </profile>
- <profile>
<id>release</id>
<modules>
<module>demo</module>
[servicecomb-pack] 02/02: SCB-1399 Remove parameter
-P${SPRING_BOOT_PROFILE}
Posted by ni...@apache.org.
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
commit 135e6e9268174116ca5456551f8a385fb68ffdbc
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Thu Aug 1 20:57:04 2019 +0800
SCB-1399 Remove parameter -P${SPRING_BOOT_PROFILE}
---
scripts/test.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/test.sh b/scripts/test.sh
index 4e7ef9e..476152f 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -22,7 +22,7 @@ then
echo "Don't do anything here for the cron job!"
else
echo "Running the unit tests and integration tests here!"
- mvn clean install -B -Pjacoco -Pdocker -P${SPRING_BOOT_PROFILE} coveralls:report \
- && mvn clean verify -B -f demo -Pdemo -Pdocker -P${SPRING_BOOT_PROFILE} -Ddocker.useColor=false -Ddocker.showLogs \
- && mvn clean verify -B -f acceptance-tests -Pdemo -Pdocker -P${SPRING_BOOT_PROFILE} -Ddocker.useColor=false -Ddocker.showLogs
+ mvn clean install -B -Pjacoco -Pdocker coveralls:report \
+ && mvn clean verify -B -f demo -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs \
+ && mvn clean verify -B -f acceptance-tests -Pdemo -Pdocker -Ddocker.useColor=false -Ddocker.showLogs
fi