diff --git a/sofa-boot-core/pom.xml b/sofa-boot-core/pom.xml index ae38805..288dbff 100644 --- a/sofa-boot-core/pom.xml +++ b/sofa-boot-core/pom.xml @@ -5,7 +5,7 @@ com.alipay.sofa sofaboot-dependencies - 2.4.9 + 2.5.1 4.0.0 diff --git a/sofa-boot-plugin/pom.xml b/sofa-boot-plugin/pom.xml index 1d2d189..110375d 100644 --- a/sofa-boot-plugin/pom.xml +++ b/sofa-boot-plugin/pom.xml @@ -5,7 +5,7 @@ com.alipay.sofa sofaboot-dependencies - 2.4.9 + 2.5.1 4.0.0 @@ -14,7 +14,7 @@ rpc-sofa-boot-plugin - 5.4.5 + 5.4.7 diff --git a/sofa-boot-samples/pom.xml b/sofa-boot-samples/pom.xml index 465b185..c9c9e5a 100644 --- a/sofa-boot-samples/pom.xml +++ b/sofa-boot-samples/pom.xml @@ -13,7 +13,7 @@ 2.4.10 3.0.14 - 2.4.9 + 2.5.1 5.4.7 diff --git a/sofa-boot-starter/pom.xml b/sofa-boot-starter/pom.xml index f370564..e1876b8 100644 --- a/sofa-boot-starter/pom.xml +++ b/sofa-boot-starter/pom.xml @@ -5,7 +5,7 @@ com.alipay.sofa sofaboot-dependencies - 2.4.9 + 2.5.1 4.0.0 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 index c6142f2..aec3a7d 100644 --- 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 index d7b5bf1..4b30d64 100644 --- 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"> - - - - + diff --git a/sofa-boot-starter/src/test/resources/spring/shutdown.xml b/sofa-boot-starter/src/test/resources/spring/shutdown.xml new file mode 100644 index 0000000..835892b --- /dev/null +++ b/sofa-boot-starter/src/test/resources/spring/shutdown.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/tools/change_version.sh b/tools/change_version.sh index 64a283e..9aa91fa 100644 --- a/tools/change_version.sh +++ b/tools/change_version.sh @@ -40,4 +40,5 @@ sed "s/.*<\/rpc.starter.version>/$1<\/ echo "Change rpc version in sofa-boot-plugin ===>" sed "s/.*<\/rpc.starter.version>/$1<\/rpc.starter.version>/" $shellDir/../sofa-boot-plugin/pom.xml sed "/\/parent/,/[^\$].*<\/version>/$1<\/version>/" $shellDir/../sofa-boot-plugin/pom.xml +sed "s/.*<\/rpc.all.version>/$1<\/rpc.all.version>/" $shellDir/../sofa-boot-plugin/pom.xml