Upgrade version (sofastack#348)

QilongZhang · straybirdzls · commit e550731eb960 · 2019-01-25T14:20:08.000+08:00
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@
 
 SOFABoot 是蚂蚁金服开源的基于 Spring Boot 的研发框架，它在 Spring Boot 的基础上，提供了诸如 Readiness Check，类隔离，日志空间隔离等等能力。在增强了 Spring Boot 的同时，SOFABoot 提供了让用户可以在 Spring Boot 中非常方便地使用 SOFA 中间件的能力。
 
-## 3.0.0 SNAPSHOT ! 🎉🎉🎉
-为了方便社区同学能够基于 SOFABoot 使用 Spring Boot 2.0 进行开发，我们拉了 3.0.0-SNAPSHOT 快照分支，该版本是基于 Spring Boot 2.0.3.RELEASE。
+## 3.x
+为了方便社区同学能够基于 SOFABoot 使用 Spring Boot 2.0 进行开发，SOFABoot 提供了 3.x 版本系列，欢迎使用。
 
 ## 一、背景
 
diff --git a/change_version.sh b/change_version.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+shopt -s expand_aliases
+if [ ! -n "$1" ] ;then
+	echo "Please enter a version"
+ 	exit 1
+else
+  	echo "The updated version is $1 !"
+fi
+
+currentVersion=`sed -n '/<project /,/<packaging/p' pom.xml | grep version | cut -d '>' -f2 | cut -d '<' -f1`
+echo "The current version is $currentVersion"
+
+if [ `uname` == "Darwin" ] ;then
+ 	echo "This is OS X"
+ 	alias sed='sed -i ""'
+else
+ 	echo "This is Linux"
+ 	alias sed='sed -i'
+fi
+
+echo "Change version in root pom.xml ===>"
+sed "/<project /,/<packaging/ s/<version>.*<\/version>/<version>$1<\/version>/" pom.xml
+
+echo "Change version in subproject pom ===>"
+for filename in `find . -name "pom.xml" -mindepth 2`;do
+    echo "Deal with $filename"
+    sed "/<parent>/,/<\/parent>/ s/<version>.*<\/version>/<version>$1<\/version>/" $filename
+done
+
diff --git a/healthcheck-sofa-boot-starter/pom.xml b/healthcheck-sofa-boot-starter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-boot-runtime</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/infra-sofa-boot-starter/pom.xml b/infra-sofa-boot-starter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-boot-runtime</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/isle-sofa-boot-starter/pom.xml b/isle-sofa-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-boot-runtime</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-dependencies</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/runtime-sofa-boot-plugin/pom.xml b/runtime-sofa-boot-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-boot-runtime</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>runtime-sofa-boot-starter</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>aopalliance</groupId>
@@ -120,4 +120,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/runtime-sofa-boot-starter/pom.xml b/runtime-sofa-boot-starter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-boot-runtime</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sofaboot-samples/pom.xml b/sofaboot-samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-boot-runtime</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-sample-standard-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sofaboot-samples/sofaboot-sample-standard/app/biz/shared/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/biz/shared/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-sample-standard-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sofaboot-sample-standard-biz-shared</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.6.0</version>
     <url>http://home.alipay.net</url>
     <description>Alipay sofaboot-sample-standard-biz-shared</description>
     <packaging>jar</packaging>
diff --git 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 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-sample-standard-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-sample-standard-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 
diff --git a/sofaboot-samples/sofaboot-sample-standard/app/test/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/test/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-sample-standard-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sofaboot-samples/sofaboot-sample-standard/app/web/pom.xml b/sofaboot-samples/sofaboot-sample-standard/app/web/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-sample-standard-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sofaboot-samples/sofaboot-sample-standard/app/web/src/main/java/com/alipay/sofa/controller/SampleRestController.java b/sofaboot-samples/sofaboot-sample-standard/app/web/src/main/java/com/alipay/sofa/controller/SampleRestController.java
@@ -116,4 +116,8 @@ public Map<String, Object> query(@PathVariable("author") String author) {
         return resultMap;
     }
 
+    @RequestMapping("/json")
+    public String query() {
+        return "zhangsan";
+    }
 }
diff --git a/sofaboot-samples/sofaboot-sample-standard/pom.xml b/sofaboot-samples/sofaboot-sample-standard/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <artifactId>sofaboot-samples</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofaboot-sample-standard-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -31,32 +30,32 @@
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>sofaboot-sample-standard-biz-shared</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>sofaboot-sample-standard-common-service-facade</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>sofaboot-sample-standard-biz-service-impl</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>sofaboot-sample-standard-common-dal</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>sofaboot-sample-standard-web</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>sofaboot-sample-standard-test</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
diff --git a/sofaboot-samples/sofaboot-sample-with-isle/pom.xml b/sofaboot-samples/sofaboot-sample-with-isle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofaboot-samples</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git 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 @@
     <parent>
         <artifactId>sofaboot-sample-with-isle</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git 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 @@
     <parent>
         <artifactId>sofaboot-sample-with-isle</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git 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 @@
     <parent>
         <artifactId>sofaboot-sample-with-isle</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofaboot-sample-with-isle</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sofaboot-samples/sofaboot-sample-with-isolation/pom.xml b/sofaboot-samples/sofaboot-sample-with-isolation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>sofaboot-samples</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sofaboot-samples/sofaboot-sample-with-rpc/pom.xml b/sofaboot-samples/sofaboot-sample-with-rpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofaboot-samples</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sofaboot-samples/sofaboot-sample/pom.xml b/sofaboot-samples/sofaboot-sample/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>sofaboot-samples</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/test-sofa-boot-starter/pom.xml b/test-sofa-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-boot-runtime</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
