Change boot version to 2.5.1 (#100)

sofastack · Oct 25, 2018 · b9676c3 · b9676c3
1 parent 132cd04
commit b9676c3
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git a/sofa-boot-core/pom.xml b/sofa-boot-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-dependencies</artifactId>
-        <version>2.4.9</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sofa-boot-plugin/pom.xml b/sofa-boot-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-dependencies</artifactId>
-        <version>2.4.9</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
 
     <properties>
         <ark.plugin.name>rpc-sofa-boot-plugin</ark.plugin.name>
-        <rpc.all.version>5.4.5</rpc.all.version>
+        <rpc.all.version>5.4.7</rpc.all.version>
     </properties>
 
     <dependencies>

diff --git a/sofa-boot-samples/pom.xml b/sofa-boot-samples/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <dubbo_version>2.4.10</dubbo_version>
         <cxf.version>3.0.14</cxf.version>
-        <sofaboot.version>2.4.9</sofaboot.version>
+        <sofaboot.version>2.5.1</sofaboot.version>
         <rpc.starter.version>5.4.7</rpc.starter.version>
     </properties>
 

diff --git a/sofa-boot-starter/pom.xml b/sofa-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-dependencies</artifactId>
-        <version>2.4.9</version>
+        <version>2.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sofa-boot-starter/src/test/java/com/alipay/sofa/rpc/test/shutdown/RpcShutdownTest.java b/sofa-boot-starter/src/test/java/com/alipay/sofa/rpc/test/shutdown/RpcShutdownTest.java
@@ -35,7 +35,7 @@
 @SpringBootApplication
 @SpringBootTest(classes = RpcShutdownTest.class)
 @RunWith(SpringRunner.class)
-@ImportResource("classpath:spring/readiness.xml")
+@ImportResource("classpath:spring/shutdown.xml")
 public class RpcShutdownTest extends ActivelyDestroyTest implements ApplicationContextAware {
     private static ApplicationContext applicationContext;
 

diff --git a/sofa-boot-starter/src/test/resources/spring/readiness.xml b/sofa-boot-starter/src/test/resources/spring/readiness.xml
@@ -4,10 +4,7 @@
        xmlns:sofa="http://sofastack.io/schema/sofaboot"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
             http://sofastack.io/schema/sofaboot http://sofastack.io/schema/sofaboot.xsd">
-    <bean class="com.alipay.sofa.rpc.test.bean.SampleFacadeImpl" id="sampleFacadeBean"/>
-    <sofa:service ref="sampleFacadeBean" interface="com.alipay.sofa.rpc.test.bean.SampleFacade">
-        <sofa:binding.bolt/>
-    </sofa:service>
+
     <sofa:reference jvm-first="false" interface="com.alipay.sofa.rpc.test.bean.SampleFacade" id="sampleFacade">
         <sofa:binding.bolt/>
     </sofa:reference>

diff --git a/sofa-boot-starter/src/test/resources/spring/shutdown.xml b/sofa-boot-starter/src/test/resources/spring/shutdown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sofa="http://sofastack.io/schema/sofaboot"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://sofastack.io/schema/sofaboot http://sofastack.io/schema/sofaboot.xsd">
+
+    <bean class="com.alipay.sofa.rpc.test.bean.SampleFacadeImpl" id="sampleFacadeBean"/>
+    <sofa:service ref="sampleFacadeBean" interface="com.alipay.sofa.rpc.test.bean.SampleFacade">
+        <sofa:binding.bolt/>
+    </sofa:service>
+    <sofa:reference jvm-first="false" interface="com.alipay.sofa.rpc.test.bean.SampleFacade" id="sampleFacade">
+        <sofa:binding.bolt/>
+    </sofa:reference>
+</beans>
diff --git a/tools/change_version.sh b/tools/change_version.sh
@@ -40,4 +40,5 @@ sed "s/<rpc.starter.version>.*<\/rpc.starter.version>/<rpc.starter.version>$1<\/
 echo "Change rpc version in sofa-boot-plugin ===>"
 sed "s/<rpc.starter.version>.*<\/rpc.starter.version>/<rpc.starter.version>$1<\/rpc.starter.version>/" $shellDir/../sofa-boot-plugin/pom.xml
 sed "/\/parent/,/<properties/ s/<version>[^\$].*<\/version>/<version>$1<\/version>/" $shellDir/../sofa-boot-plugin/pom.xml
+sed "s/<rpc.all.version>.*<\/rpc.all.version>/<rpc.all.version>$1<\/rpc.all.version>/" $shellDir/../sofa-boot-plugin/pom.xml