From 819d178eabe77cfb536dbc7fbc89c73db75d4ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=91=88=E7=86=B9?= Date: Fri, 13 Mar 2020 20:51:19 +0800 Subject: [PATCH] update version to 5.6.5 (#883) * update version to 5.6.5 * change the artifactId of apollo dynamic config * rename config-apollo file name --- all/pom.xml | 6 +++--- bom/pom.xml | 2 +- .../src/main/java/com/alipay/sofa/rpc/common/Version.java | 2 +- extension-impl/{dynamic-apollo => config-apollo}/pom.xml | 2 +- .../sofa/rpc/dynamic/apollo/ApolloDynamicConfigManager.java | 0 .../com.alipay.sofa.rpc.dynamic.DynamicConfigManager | 0 .../rpc/dynamic/apollo/ApolloDynamicConfigManagerTest.java | 0 .../src/test/resources/log4j.xml | 0 extension-impl/pom.xml | 2 +- pom.xml | 2 +- test/test-integration/pom.xml | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) rename extension-impl/{dynamic-apollo => config-apollo}/pom.xml (98%) rename extension-impl/{dynamic-apollo => config-apollo}/src/main/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManager.java (100%) rename extension-impl/{dynamic-apollo => config-apollo}/src/main/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.dynamic.DynamicConfigManager (100%) rename extension-impl/{dynamic-apollo => config-apollo}/src/test/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManagerTest.java (100%) rename extension-impl/{dynamic-apollo => config-apollo}/src/test/resources/log4j.xml (100%) diff --git a/all/pom.xml b/all/pom.xml index cd8285ee8..564b8079b 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -6,7 +6,7 @@ com.alipay.sofa sofa-rpc-all - 5.6.5-SNAPSHOT + 5.6.5 ${project.groupId}:${project.artifactId} http://github.com/sofastack/sofa-rpc @@ -275,7 +275,7 @@ com.alipay.sofa - sofa-rpc-dynamic-apollo + sofa-rpc-config-apollo ${project.version} @@ -477,7 +477,7 @@ com.alipay.sofa:sofa-rpc-remoting-grpc com.alipay.sofa:sofa-rpc-tracer-opentracing com.alipay.sofa:sofa-rpc-tracer-opentracing-resteasy - com.alipay.sofa:sofa-rpc-dynamic-apollo + com.alipay.sofa:sofa-rpc-config-apollo com.alipay.sofa:sofa-rpc-doc-swagger diff --git a/bom/pom.xml b/bom/pom.xml index 1a78e6c86..755e72e86 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ pom - 5.6.5-SNAPSHOT + 5.6.5 3.20.0-GA 1.9.8 4.1.44.Final diff --git a/core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java b/core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java index bfdeaaabb..fcb7a0b9a 100644 --- a/core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java +++ b/core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java @@ -37,5 +37,5 @@ public final class Version { /** * 当前Build版本，每次发布修改 */ - public static final String BUILD_VERSION = "5.6.5_20200218150127"; + public static final String BUILD_VERSION = "5.6.5_20200313112735"; } diff --git a/extension-impl/dynamic-apollo/pom.xml b/extension-impl/config-apollo/pom.xml similarity index 98% rename from extension-impl/dynamic-apollo/pom.xml rename to extension-impl/config-apollo/pom.xml index cdaeeaf32..a3cea66cb 100644 --- a/extension-impl/dynamic-apollo/pom.xml +++ b/extension-impl/config-apollo/pom.xml @@ -10,7 +10,7 @@ ${revision} - sofa-rpc-dynamic-apollo + sofa-rpc-config-apollo diff --git a/extension-impl/dynamic-apollo/src/main/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManager.java b/extension-impl/config-apollo/src/main/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManager.java similarity index 100% rename from extension-impl/dynamic-apollo/src/main/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManager.java rename to extension-impl/config-apollo/src/main/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManager.java diff --git a/extension-impl/dynamic-apollo/src/main/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.dynamic.DynamicConfigManager b/extension-impl/config-apollo/src/main/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.dynamic.DynamicConfigManager similarity index 100% rename from extension-impl/dynamic-apollo/src/main/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.dynamic.DynamicConfigManager rename to extension-impl/config-apollo/src/main/resources/META-INF/services/sofa-rpc/com.alipay.sofa.rpc.dynamic.DynamicConfigManager diff --git a/extension-impl/dynamic-apollo/src/test/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManagerTest.java b/extension-impl/config-apollo/src/test/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManagerTest.java similarity index 100% rename from extension-impl/dynamic-apollo/src/test/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManagerTest.java rename to extension-impl/config-apollo/src/test/java/com/alipay/sofa/rpc/dynamic/apollo/ApolloDynamicConfigManagerTest.java diff --git a/extension-impl/dynamic-apollo/src/test/resources/log4j.xml b/extension-impl/config-apollo/src/test/resources/log4j.xml similarity index 100% rename from extension-impl/dynamic-apollo/src/test/resources/log4j.xml rename to extension-impl/config-apollo/src/test/resources/log4j.xml diff --git a/extension-impl/pom.xml b/extension-impl/pom.xml index 8a390928c..6ac9d835e 100644 --- a/extension-impl/pom.xml +++ b/extension-impl/pom.xml @@ -44,7 +44,7 @@ tracer-opentracing tracer-opentracing-resteasy fault-hystrix - dynamic-apollo + config-apollo doc-swagger diff --git a/pom.xml b/pom.xml index 05742bb53..e0dba1d36 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ - 5.6.5-SNAPSHOT + 5.6.5 true true true diff --git a/test/test-integration/pom.xml b/test/test-integration/pom.xml index 35d3e697c..64b821d63 100644 --- a/test/test-integration/pom.xml +++ b/test/test-integration/pom.xml @@ -197,7 +197,7 @@ com.alipay.sofa - sofa-rpc-dynamic-apollo + sofa-rpc-config-apollo ${project.parent.version} test