chore:manage sofa rpc version (sofastack#830)

* chore:manage sofa rpc version * chore:update maven 3.6.3
wpl-jack · Dec 23, 2019 · 7aa5905 · 7aa5905
1 parent db18a70
commit 7aa5905
Show file tree

Hide file tree

Showing 54 changed files with 461 additions and 116 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
diff --git a/.travis.yml b/.travis.yml
@@ -10,20 +10,12 @@ cache:
   directories:
     - $HOME/.m2
 
-before_install:
-  - echo "Downloading Maven 3.2.5"
-    && wget https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip
-    && unzip -q apache-maven-3.2.5-bin.zip
-    && export M2_HOME=$PWD/apache-maven-3.2.5
-    && export PATH=$M2_HOME/bin:$PATH
-    && mvn -version
-
 install:
-  - mvn clean install -Pci-install -B -U -e
+  - ./mvnw clean install -Pci-install -B -U -e
   - sh ./tools/check_format.sh
 
 script:
-  - travis_retry mvn clean package -Pci-test
+  - travis_retry ./mvnw clean package -Pci-test
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
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.4-SNAPSHOT</version>
+    <version>${revision}</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/sofastack/sofa-rpc</url>
@@ -51,10 +51,10 @@
 
     <properties>
         <!-- Build args -->
+        <revision>5.6.4-SNAPSHOT</revision>
         <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>
         <sofa.common.tools.version>1.0.18</sofa.common.tools.version>
         <javassist.version>3.20.0-GA</javassist.version>
@@ -72,189 +72,189 @@
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-common</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-exception</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-api</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
 
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-client</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-codec</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-filter</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-log</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-proxy</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-transport</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
 
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-extension-common</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-api-compatible</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-bootstrap-bolt</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-bootstrap-dubbo</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-bootstrap-grpc</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-bootstrap-http</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-bootstrap-rest</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-codec-sofa-hessian</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-codec-protobuf</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-codec-protostuff</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-codec-msgpack</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-codec-jackson</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-fault-tolerance</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-fault-hystrix</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-log-common-tools</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-registry-consul</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-registry-local</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-registry-zk</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-registry-nacos</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-registry-mesh</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-registry-sofa</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-remoting-bolt</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-remoting-http</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-remoting-resteasy</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-remoting-grpc</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-tracer-opentracing</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-tracer-opentracing-resteasy</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-rpc-metrics-lookout</artifactId>
-            <version>${sofa.rpc.version}</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.alipay.sofa</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,10 +6,11 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-rpc-bom</artifactId>
-    <version>5.6.4-SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <properties>
+        <revision>5.6.4-SNAPSHOT</revision>
         <javassist.version>3.20.0-GA</javassist.version>
         <bytebuddy.version>1.9.8</bytebuddy.version>
         <netty.version>4.1.42.Final</netty.version>

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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>sofa-rpc-api</artifactId>

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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</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.6.4-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <properties>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip