Update rpc version to 5.6.0-SNAPSHOT. (sofastack#542)

update rpc version to 5.6.0-SNAPSHOT change jdk in pom to 1.8 remove jdk7 ci modify readme
GoodPaas · Mar 19, 2019 · f1cc2e1 · f1cc2e1
1 parent c8e6a50
commit f1cc2e1
Show file tree

Hide file tree

Showing 47 changed files with 54 additions and 55 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: java
 
 jdk:
 - oraclejdk8
-- openjdk7
 
 before_install:
 - echo "Downloading Maven 3.2.5"

diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@ SOFARPC 是一个高可扩展性、高性能、生产级的 Java RPC 框架。
 
 ## 需要
 
-编译需要 JDK 7 及以上、Maven 3.2.5 及以上。
+编译需要 JDK 8 及以上、Maven 3.2.5 及以上。
 
-运行需求 JDK 6 及以上。
+运行需求 JDK 8 及以上。
 
 ## 文档
 

diff --git a/README_EN.md b/README_EN.md
@@ -25,9 +25,9 @@ SOFARPC is a high-performance, high-extensibility, production-level Java RPC fra
 
 ## Requirements
 
-Build-time requirement: JDK 7 or above and Maven 3.2.5 or above.
+Build-time requirement: JDK 8 or above and Maven 3.2.5 or above.
 
-Runtime requirement: JDK 6 or above.
+Runtime requirement: JDK 8 or above.
 
 
 ## Documents

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.5.2-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-rpc</url>
@@ -51,8 +51,8 @@
 
     <properties>
         <!-- Build args -->
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
         <sofa.rpc.version>${project.version}</sofa.rpc.version>
         <slf4j.version>1.7.21</slf4j.version>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-rpc-bom</artifactId>
-    <version>5.5.2-SNAPSHOT</version>
+    <version>5.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/core-impl/client/pom.xml b/core-impl/client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-client</artifactId>

diff --git a/core-impl/codec/pom.xml b/core-impl/codec/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-codec</artifactId>

diff --git a/core-impl/filter/pom.xml b/core-impl/filter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-filter</artifactId>

diff --git a/core-impl/log/pom.xml b/core-impl/log/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-log</artifactId>

diff --git a/core-impl/pom.xml b/core-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-core-impl</artifactId>

diff --git a/core-impl/proxy/pom.xml b/core-impl/proxy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-proxy</artifactId>

diff --git a/core-impl/transport/pom.xml b/core-impl/transport/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sofa-rpc-core-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-transport</artifactId>

diff --git a/core/api/pom.xml b/core/api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-api</artifactId>

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
@@ -27,15 +27,15 @@ public final class Version {
     /**
      * 当前RPC版本，例如：5.6.7
      */
-    public static final String VERSION       = "5.5.2";
+    public static final String VERSION       = "5.6.0";
 
     /**
      * 当前RPC版本，例如： 5.6.7 对应 50607
      */
-    public static final int    RPC_VERSION   = 50502;
+    public static final int    RPC_VERSION   = 50600;
 
     /**
      * 当前Build版本，每次发布修改
      */
-    public static final String BUILD_VERSION = "5.5.2_20190227144655";
+    public static final String BUILD_VERSION = "5.6.0_20190319115956";
 }
diff --git a/core/common/pom.xml b/core/common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-common</artifactId>

diff --git a/core/exception/pom.xml b/core/exception/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-exception</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-core</artifactId>

diff --git a/example/pom.xml b/example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-example</artifactId>

diff --git a/extension-impl/api-compatible/pom.xml b/extension-impl/api-compatible/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-api-compatible</artifactId>

diff --git a/extension-impl/bootstrap-bolt/pom.xml b/extension-impl/bootstrap-bolt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-bootstrap-bolt</artifactId>

diff --git a/extension-impl/bootstrap-dubbo/pom.xml b/extension-impl/bootstrap-dubbo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>sofa-rpc-extension-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-bootstrap-dubbo</artifactId>

diff --git a/extension-impl/bootstrap-http/pom.xml b/extension-impl/bootstrap-http/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-bootstrap-http</artifactId>

diff --git a/extension-impl/bootstrap-rest/pom.xml b/extension-impl/bootstrap-rest/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>sofa-rpc-extension-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-bootstrap-rest</artifactId>

diff --git a/extension-impl/codec-jackson/pom.xml b/extension-impl/codec-jackson/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-codec-jackson</artifactId>

diff --git a/extension-impl/codec-protobuf/pom.xml b/extension-impl/codec-protobuf/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-codec-protobuf</artifactId>

diff --git a/extension-impl/codec-sofa-hessian/pom.xml b/extension-impl/codec-sofa-hessian/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-codec-sofa-hessian</artifactId>

diff --git a/extension-impl/extension-common/pom.xml b/extension-impl/extension-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-extension-common</artifactId>

diff --git a/extension-impl/fault-hystrix/pom.xml b/extension-impl/fault-hystrix/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/extension-impl/fault-tolerance/pom.xml b/extension-impl/fault-tolerance/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-fault-tolerance</artifactId>

diff --git a/extension-impl/log-common-tools/pom.xml b/extension-impl/log-common-tools/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-log-common-tools</artifactId>

diff --git a/extension-impl/metrics-lookout/pom.xml b/extension-impl/metrics-lookout/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-rpc-extension-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/extension-impl/pom.xml b/extension-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-extension-impl</artifactId>

diff --git a/extension-impl/registry-consul/pom.xml b/extension-impl/registry-consul/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-registry-consul</artifactId>

diff --git a/extension-impl/registry-local/pom.xml b/extension-impl/registry-local/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-registry-local</artifactId>

diff --git a/extension-impl/registry-mesh/pom.xml b/extension-impl/registry-mesh/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-registry-mesh</artifactId>

diff --git a/extension-impl/registry-nacos/pom.xml b/extension-impl/registry-nacos/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sofa-rpc-extension-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/extension-impl/registry-zk/pom.xml b/extension-impl/registry-zk/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-registry-zk</artifactId>

diff --git a/extension-impl/remoting-bolt/pom.xml b/extension-impl/remoting-bolt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-remoting-bolt</artifactId>

diff --git a/extension-impl/remoting-http/pom.xml b/extension-impl/remoting-http/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>sofa-rpc-extension-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-remoting-http</artifactId>

diff --git a/extension-impl/remoting-resteasy/pom.xml b/extension-impl/remoting-resteasy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-remoting-resteasy</artifactId>

diff --git a/extension-impl/tracer-opentracing-resteasy/pom.xml b/extension-impl/tracer-opentracing-resteasy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sofa-rpc-tracer-opentracing-resteasy</artifactId>