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
sofastack · Mar 13, 2020 · 819d178 · 819d178
1 parent acc755e
commit 819d178
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 9 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-rpc-all</artifactId>
-    <version>5.6.5-SNAPSHOT</version>
+    <version>5.6.5</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/sofastack/sofa-rpc</url>
@@ -275,7 +275,7 @@
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
-            <artifactId>sofa-rpc-dynamic-apollo</artifactId>
+            <artifactId>sofa-rpc-config-apollo</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -477,7 +477,7 @@
                                     <include>com.alipay.sofa:sofa-rpc-remoting-grpc</include>
                                     <include>com.alipay.sofa:sofa-rpc-tracer-opentracing</include>
                                     <include>com.alipay.sofa:sofa-rpc-tracer-opentracing-resteasy</include>
-                                    <include>com.alipay.sofa:sofa-rpc-dynamic-apollo</include>
+                                    <include>com.alipay.sofa:sofa-rpc-config-apollo</include>
                                     <include>com.alipay.sofa:sofa-rpc-doc-swagger</include>
                                     <!-- TODO -->
                                 </includes>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -10,7 +10,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>5.6.5-SNAPSHOT</revision>
+        <revision>5.6.5</revision>
         <javassist.version>3.20.0-GA</javassist.version>
         <bytebuddy.version>1.9.8</bytebuddy.version>
         <netty.version>4.1.44.Final</netty.version>

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
@@ -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 → extension-impl/config-apollo/pom.xml b/extension-impl/dynamic-apollo/pom.xml → extension-impl/config-apollo/pom.xml
@@ -10,7 +10,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>sofa-rpc-dynamic-apollo</artifactId>
+    <artifactId>sofa-rpc-config-apollo</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/...ic/apollo/ApolloDynamicConfigManager.java → ...ic/apollo/ApolloDynamicConfigManager.java b/...ic/apollo/ApolloDynamicConfigManager.java → ...ic/apollo/ApolloDynamicConfigManager.java
diff --git a/...pay.sofa.rpc.dynamic.DynamicConfigManager → ...pay.sofa.rpc.dynamic.DynamicConfigManager b/...pay.sofa.rpc.dynamic.DynamicConfigManager → ...pay.sofa.rpc.dynamic.DynamicConfigManager
diff --git a/...pollo/ApolloDynamicConfigManagerTest.java → ...pollo/ApolloDynamicConfigManagerTest.java b/...pollo/ApolloDynamicConfigManagerTest.java → ...pollo/ApolloDynamicConfigManagerTest.java
diff --git a/...namic-apollo/src/test/resources/log4j.xml → ...onfig-apollo/src/test/resources/log4j.xml b/...namic-apollo/src/test/resources/log4j.xml → ...onfig-apollo/src/test/resources/log4j.xml
diff --git a/extension-impl/pom.xml b/extension-impl/pom.xml
@@ -44,7 +44,7 @@
         <module>tracer-opentracing</module>
         <module>tracer-opentracing-resteasy</module>
         <module>fault-hystrix</module>
-        <module>dynamic-apollo</module>
+        <module>config-apollo</module>
         <module>doc-swagger</module>
     </modules>
 

diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
 
     <properties>
         <!-- Build args -->
-        <revision>5.6.5-SNAPSHOT</revision>
+        <revision>5.6.5</revision>
         <module.install.skip>true</module.install.skip>
         <module.deploy.skip>true</module.deploy.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>

diff --git a/test/test-integration/pom.xml b/test/test-integration/pom.xml
@@ -197,7 +197,7 @@
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
-            <artifactId>sofa-rpc-dynamic-apollo</artifactId>
+            <artifactId>sofa-rpc-config-apollo</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>