Release 3.1.3 (sofastack#373)

QilongZhang · web-flow · commit c60093b1ae01 · 2019-03-11T09:44:27.000+08:00
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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-dependencies</artifactId>
-        <version>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sofa-boot-runtime</artifactId>
-    <version>3.1.3-SNAPSHOT</version>
+    <version>3.1.3</version>
     <packaging>pom</packaging>
 
     <name>SOFABoot Runtime</name>
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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/runtime-sofa-boot-starter/src/main/java/com/alipay/sofa/runtime/integration/service/SofaEventHandler.java b/runtime-sofa-boot-starter/src/main/java/com/alipay/sofa/runtime/integration/service/SofaEventHandler.java
@@ -32,9 +32,9 @@
 public class SofaEventHandler implements EventHandler {
     @Override
     public void handleEvent(ArkEvent event) {
-        if (Constants.BIZ_EVENT_TOPIC_UNINSTALL.equals(event.getTopic())) {
+        if (Constants.BIZ_EVENT_TOPIC_AFTER_INVOKE_BIZ_STOP.equals(event.getTopic())) {
             doUninstallBiz((BizEvent) event);
-        } else if (Constants.BIZ_EVENT_TOPIC_HEALTH_CHECK.equals(event.getTopic())) {
+        } else if (Constants.BIZ_EVENT_TOPIC_AFTER_INVOKE_BIZ_START.equals(event.getTopic())) {
             doHealthCheck((BizEvent) event);
         }
     }
diff --git a/runtime-sofa-boot-starter/src/test/java/com/alipay/sofa/runtime/ark/SofaEventHandlerTest.java b/runtime-sofa-boot-starter/src/test/java/com/alipay/sofa/runtime/ark/SofaEventHandlerTest.java
@@ -93,7 +93,8 @@ public void testUninstallEvent() {
         Assert.assertTrue(applicationContext.isActive());
 
         SofaEventHandler sofaEventHandler = new SofaEventHandler();
-        sofaEventHandler.handleEvent(new BizEvent(biz, Constants.BIZ_EVENT_TOPIC_UNINSTALL));
+        sofaEventHandler.handleEvent(new BizEvent(biz,
+            Constants.BIZ_EVENT_TOPIC_AFTER_INVOKE_BIZ_STOP));
 
         Assert.assertFalse(SofaRuntimeProperties.isDisableJvmFirst(applicationContext
             .getClassLoader()));
@@ -113,7 +114,8 @@ public void testHealthCheck() {
             }
         };
         SofaEventHandler sofaEventHandler = new SofaEventHandler();
-        sofaEventHandler.handleEvent(new BizEvent(biz, Constants.BIZ_EVENT_TOPIC_HEALTH_CHECK));
+        sofaEventHandler.handleEvent(new BizEvent(biz,
+            Constants.BIZ_EVENT_TOPIC_AFTER_INVOKE_BIZ_START));
     }
 
     @Test
diff --git 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.3-SNAPSHOT'
+version '3.1.3'
 
 sourceCompatibility = 1.8
 
diff --git a/sofa-boot-gradle-plugin/pom.xml b/sofa-boot-gradle-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-boot-runtime</artifactId>
-        <version>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sofa-boot-gradle-plugin</artifactId>
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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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,7 +4,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-sample-standard-parent</artifactId>
-        <version>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sofaboot-samples/sofaboot-sample-standard/pom.xml b/sofaboot-samples/sofaboot-sample-standard/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofaboot-samples</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
     </parent>
 
     <groupId>com.alipay.sofa</groupId>
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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</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>3.1.3-SNAPSHOT</version>
+        <version>3.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@`
`32`	`32`	`public class SofaEventHandler implements EventHandler {`
`33`	`33`	`@Override`
`34`	`34`	`public void handleEvent(ArkEvent event) {`
`35`		`- if (Constants.BIZ_EVENT_TOPIC_UNINSTALL.equals(event.getTopic())) {`
	`35`	`+ if (Constants.BIZ_EVENT_TOPIC_AFTER_INVOKE_BIZ_STOP.equals(event.getTopic())) {`
`36`	`36`	`doUninstallBiz((BizEvent) event);`
`37`		`- } else if (Constants.BIZ_EVENT_TOPIC_HEALTH_CHECK.equals(event.getTopic())) {`
	`37`	`+ } else if (Constants.BIZ_EVENT_TOPIC_AFTER_INVOKE_BIZ_START.equals(event.getTopic())) {`
`38`	`38`	`doHealthCheck((BizEvent) event);`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ plugins {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`group 'com.alipay.sofa'`
`14`		`-version '3.1.3-SNAPSHOT'`
	`14`	`+version '3.1.3'`
`15`	`15`
`16`	`16`	`sourceCompatibility = 1.8`
`17`	`17`