From 7dc81c70e0e759dee8e899061d7f1837cc6ca27d Mon Sep 17 00:00:00 2001 From: QilongZhang Date: Sat, 23 Feb 2019 15:53:07 +0800 Subject: [PATCH] Prepare to release 3.1.2 (#362) --- healthcheck-sofa-boot-starter/pom.xml | 2 +- infra-sofa-boot-starter/pom.xml | 2 +- isle-sofa-boot-starter/pom.xml | 2 +- pom.xml | 4 ++-- runtime-sofa-boot-plugin/pom.xml | 2 +- runtime-sofa-boot-starter/pom.xml | 2 +- sofa-boot-gradle-plugin/build.gradle | 2 +- sofa-boot-gradle-plugin/pom.xml | 2 +- sofaboot-samples/pom.xml | 2 +- .../sofaboot-sample-standard/app/biz/service-impl/pom.xml | 2 +- .../sofaboot-sample-standard/app/biz/shared/pom.xml | 2 +- .../sofaboot-sample-standard/app/common/dal/pom.xml | 2 +- .../app/common/service/facade/pom.xml | 2 +- sofaboot-samples/sofaboot-sample-standard/app/test/pom.xml | 2 +- sofaboot-samples/sofaboot-sample-standard/app/web/pom.xml | 2 +- sofaboot-samples/sofaboot-sample-standard/pom.xml | 2 +- sofaboot-samples/sofaboot-sample-with-isle/pom.xml | 2 +- .../sofaboot-sample-with-isle/service-consumer/pom.xml | 2 +- .../sofaboot-sample-with-isle/service-facade/pom.xml | 2 +- .../sofaboot-sample-with-isle/service-provider/pom.xml | 2 +- .../sofaboot-sample-with-isle/sofa-boot-run/pom.xml | 2 +- sofaboot-samples/sofaboot-sample-with-isolation/pom.xml | 2 +- .../sofa/boot/examples/demo/service/ReferenceServiceImpl.java | 4 ++-- sofaboot-samples/sofaboot-sample-with-rpc/pom.xml | 2 +- sofaboot-samples/sofaboot-sample/pom.xml | 2 +- test-sofa-boot-starter/pom.xml | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/healthcheck-sofa-boot-starter/pom.xml b/healthcheck-sofa-boot-starter/pom.xml index 9d8d7ede0..3fc2e769e 100644 --- a/healthcheck-sofa-boot-starter/pom.xml +++ b/healthcheck-sofa-boot-starter/pom.xml @@ -22,7 +22,7 @@ com.alipay.sofa sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 ../pom.xml diff --git a/infra-sofa-boot-starter/pom.xml b/infra-sofa-boot-starter/pom.xml index f4c914a43..fad8428ae 100644 --- a/infra-sofa-boot-starter/pom.xml +++ b/infra-sofa-boot-starter/pom.xml @@ -22,7 +22,7 @@ com.alipay.sofa sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 ../pom.xml 4.0.0 diff --git a/isle-sofa-boot-starter/pom.xml b/isle-sofa-boot-starter/pom.xml index a9ab822e7..833828f80 100644 --- a/isle-sofa-boot-starter/pom.xml +++ b/isle-sofa-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.alipay.sofa sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 552102ad0..b994cb597 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ com.alipay.sofa sofaboot-dependencies - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 pom SOFABoot Runtime diff --git a/runtime-sofa-boot-plugin/pom.xml b/runtime-sofa-boot-plugin/pom.xml index f76078bde..720eb3225 100644 --- a/runtime-sofa-boot-plugin/pom.xml +++ b/runtime-sofa-boot-plugin/pom.xml @@ -22,7 +22,7 @@ com.alipay.sofa sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 ../pom.xml 4.0.0 diff --git a/runtime-sofa-boot-starter/pom.xml b/runtime-sofa-boot-starter/pom.xml index b633112b4..7a0498206 100644 --- a/runtime-sofa-boot-starter/pom.xml +++ b/runtime-sofa-boot-starter/pom.xml @@ -22,7 +22,7 @@ com.alipay.sofa sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 ../pom.xml 4.0.0 diff --git a/sofa-boot-gradle-plugin/build.gradle b/sofa-boot-gradle-plugin/build.gradle index b65358cf0..2aabf2156 100644 --- a/sofa-boot-gradle-plugin/build.gradle +++ b/sofa-boot-gradle-plugin/build.gradle @@ -11,7 +11,7 @@ plugins { } group 'com.alipay.sofa' -version '3.1.2-SNAPSHOT' +version '3.1.2' sourceCompatibility = 1.8 diff --git a/sofa-boot-gradle-plugin/pom.xml b/sofa-boot-gradle-plugin/pom.xml index c39ea1d8c..016760256 100644 --- a/sofa-boot-gradle-plugin/pom.xml +++ b/sofa-boot-gradle-plugin/pom.xml @@ -5,7 +5,7 @@ com.alipay.sofa sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 ../pom.xml sofa-boot-gradle-plugin diff --git a/sofaboot-samples/pom.xml b/sofaboot-samples/pom.xml index ac967a97a..83f9946ba 100644 --- a/sofaboot-samples/pom.xml +++ b/sofaboot-samples/pom.xml @@ -22,7 +22,7 @@ com.alipay.sofa sofa-boot-runtime - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-standard/app/biz/service-impl/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/biz/service-impl/pom.xml index cf8cd9543..7bda95d46 100644 --- a/sofaboot-samples/sofaboot-sample-standard/app/biz/service-impl/pom.xml +++ b/sofaboot-samples/sofaboot-sample-standard/app/biz/service-impl/pom.xml @@ -3,7 +3,7 @@ com.alipay.sofa sofaboot-sample-standard-parent - 3.1.2-SNAPSHOT + 3.1.2 ../../../pom.xml 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-standard/app/biz/shared/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/biz/shared/pom.xml index 684aa65ca..025bff352 100644 --- a/sofaboot-samples/sofaboot-sample-standard/app/biz/shared/pom.xml +++ b/sofaboot-samples/sofaboot-sample-standard/app/biz/shared/pom.xml @@ -4,7 +4,7 @@ com.alipay.sofa sofaboot-sample-standard-parent - 3.1.2-SNAPSHOT + 3.1.2 ../../../pom.xml 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-standard/app/common/dal/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/common/dal/pom.xml index f0fe5357a..bbb160c52 100644 --- a/sofaboot-samples/sofaboot-sample-standard/app/common/dal/pom.xml +++ b/sofaboot-samples/sofaboot-sample-standard/app/common/dal/pom.xml @@ -3,7 +3,7 @@ com.alipay.sofa sofaboot-sample-standard-parent - 3.1.2-SNAPSHOT + 3.1.2 ../../../pom.xml 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-standard/app/common/service/facade/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/common/service/facade/pom.xml index d8325654d..1651ff2d2 100644 --- a/sofaboot-samples/sofaboot-sample-standard/app/common/service/facade/pom.xml +++ b/sofaboot-samples/sofaboot-sample-standard/app/common/service/facade/pom.xml @@ -5,7 +5,7 @@ com.alipay.sofa sofaboot-sample-standard-parent - 3.1.2-SNAPSHOT + 3.1.2 ../../../../pom.xml diff --git a/sofaboot-samples/sofaboot-sample-standard/app/test/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/test/pom.xml index 913da0e16..578612804 100644 --- a/sofaboot-samples/sofaboot-sample-standard/app/test/pom.xml +++ b/sofaboot-samples/sofaboot-sample-standard/app/test/pom.xml @@ -3,7 +3,7 @@ com.alipay.sofa sofaboot-sample-standard-parent - 3.1.2-SNAPSHOT + 3.1.2 ../../pom.xml 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-standard/app/web/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/web/pom.xml index cbcd4400f..0dc1bee9b 100644 --- a/sofaboot-samples/sofaboot-sample-standard/app/web/pom.xml +++ b/sofaboot-samples/sofaboot-sample-standard/app/web/pom.xml @@ -3,7 +3,7 @@ com.alipay.sofa sofaboot-sample-standard-parent - 3.1.2-SNAPSHOT + 3.1.2 ../../pom.xml 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-standard/pom.xml b/sofaboot-samples/sofaboot-sample-standard/pom.xml index 2cd64dadc..7d7b58575 100644 --- a/sofaboot-samples/sofaboot-sample-standard/pom.xml +++ b/sofaboot-samples/sofaboot-sample-standard/pom.xml @@ -5,7 +5,7 @@ sofaboot-samples com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 com.alipay.sofa diff --git a/sofaboot-samples/sofaboot-sample-with-isle/pom.xml b/sofaboot-samples/sofaboot-sample-with-isle/pom.xml index b2b3142bb..db3b6eb1f 100644 --- a/sofaboot-samples/sofaboot-sample-with-isle/pom.xml +++ b/sofaboot-samples/sofaboot-sample-with-isle/pom.xml @@ -5,7 +5,7 @@ sofaboot-samples com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-with-isle/service-consumer/pom.xml b/sofaboot-samples/sofaboot-sample-with-isle/service-consumer/pom.xml index a51f3f0ab..043847aac 100644 --- a/sofaboot-samples/sofaboot-sample-with-isle/service-consumer/pom.xml +++ b/sofaboot-samples/sofaboot-sample-with-isle/service-consumer/pom.xml @@ -5,7 +5,7 @@ sofaboot-sample-with-isle com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-with-isle/service-facade/pom.xml b/sofaboot-samples/sofaboot-sample-with-isle/service-facade/pom.xml index 7d266c2bc..8abc0c32f 100644 --- a/sofaboot-samples/sofaboot-sample-with-isle/service-facade/pom.xml +++ b/sofaboot-samples/sofaboot-sample-with-isle/service-facade/pom.xml @@ -5,7 +5,7 @@ sofaboot-sample-with-isle com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-with-isle/service-provider/pom.xml b/sofaboot-samples/sofaboot-sample-with-isle/service-provider/pom.xml index 15101b081..928158d42 100644 --- a/sofaboot-samples/sofaboot-sample-with-isle/service-provider/pom.xml +++ b/sofaboot-samples/sofaboot-sample-with-isle/service-provider/pom.xml @@ -5,7 +5,7 @@ sofaboot-sample-with-isle com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-with-isle/sofa-boot-run/pom.xml b/sofaboot-samples/sofaboot-sample-with-isle/sofa-boot-run/pom.xml index eb8aeeb42..45d1181e4 100644 --- a/sofaboot-samples/sofaboot-sample-with-isle/sofa-boot-run/pom.xml +++ b/sofaboot-samples/sofaboot-sample-with-isle/sofa-boot-run/pom.xml @@ -5,7 +5,7 @@ sofaboot-sample-with-isle com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-with-isolation/pom.xml b/sofaboot-samples/sofaboot-sample-with-isolation/pom.xml index 68cb3e67c..7cb4cae49 100644 --- a/sofaboot-samples/sofaboot-sample-with-isolation/pom.xml +++ b/sofaboot-samples/sofaboot-sample-with-isolation/pom.xml @@ -22,7 +22,7 @@ sofaboot-samples com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample-with-isolation/src/main/java/com/alipay/sofa/boot/examples/demo/service/ReferenceServiceImpl.java b/sofaboot-samples/sofaboot-sample-with-isolation/src/main/java/com/alipay/sofa/boot/examples/demo/service/ReferenceServiceImpl.java index e08553134..91dc811d8 100644 --- a/sofaboot-samples/sofaboot-sample-with-isolation/src/main/java/com/alipay/sofa/boot/examples/demo/service/ReferenceServiceImpl.java +++ b/sofaboot-samples/sofaboot-sample-with-isolation/src/main/java/com/alipay/sofa/boot/examples/demo/service/ReferenceServiceImpl.java @@ -19,7 +19,7 @@ import com.alipay.sofa.boot.examples.demo.service.facade.ReferenceService; import com.alipay.sofa.boot.examples.demo.service.facade.SampleService; import com.alipay.sofa.rpc.config.ConsumerConfig; -import org.junit.Assert; +import org.springframework.util.Assert; /** * @author qilong.zql @@ -35,7 +35,7 @@ public void reference() { SampleService sampleService = consumerConfig.refer(); - Assert.assertTrue("service".equals(sampleService.service())); + Assert.isTrue("service".equals(sampleService.service())); } } \ No newline at end of file diff --git a/sofaboot-samples/sofaboot-sample-with-rpc/pom.xml b/sofaboot-samples/sofaboot-sample-with-rpc/pom.xml index ffc0a0224..7f907ba09 100644 --- a/sofaboot-samples/sofaboot-sample-with-rpc/pom.xml +++ b/sofaboot-samples/sofaboot-sample-with-rpc/pom.xml @@ -5,7 +5,7 @@ sofaboot-samples com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/sofaboot-samples/sofaboot-sample/pom.xml b/sofaboot-samples/sofaboot-sample/pom.xml index a3c3d03ea..935042450 100644 --- a/sofaboot-samples/sofaboot-sample/pom.xml +++ b/sofaboot-samples/sofaboot-sample/pom.xml @@ -22,7 +22,7 @@ sofaboot-samples com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 4.0.0 diff --git a/test-sofa-boot-starter/pom.xml b/test-sofa-boot-starter/pom.xml index c5daafa63..9013a6eb8 100644 --- a/test-sofa-boot-starter/pom.xml +++ b/test-sofa-boot-starter/pom.xml @@ -5,7 +5,7 @@ sofa-boot-runtime com.alipay.sofa - 3.1.2-SNAPSHOT + 3.1.2 ../pom.xml 4.0.0