[incubator-servicecomb-saga] 01/03: SCB-244 Clean up the dependency versions

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git

commit fcf7c788ece273fd1941a92297765752fbb5ec9e
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Tue Jun 26 09:28:51 2018 +0800

    SCB-244 Clean up the dependency versions
---
 pom.xml                                 | 7 +++----
 saga-demo/saga-servicecomb-demo/pom.xml | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e11d2d..8f91a95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,7 @@
     <dubbo.version>2.6.1</dubbo.version>
     <spring.boot.version>1.5.13.RELEASE</spring.boot.version>
     <spring.boot2.version>2.0.2.RELEASE</spring.boot2.version>
-    <spring.cloud.version>Camden.SR6</spring.cloud.version>
-    <java.chassis.version>1.0.0-m1</java.chassis.version>
+    <java.chassis.version>1.0.0-m2</java.chassis.version>
     <spring.version>4.3.7.RELEASE</spring.version>
     <akka.version>2.5.6</akka.version>
     <rat.version>0.12</rat.version>
@@ -64,7 +63,7 @@
     <jaxb.version>2.3.0</jaxb.version>
     <javax.activation.version>1.1.1</javax.activation.version>
     <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
-    <netty.version>2.0.7.Final</netty.version>
+    <netty.boringssl.version>2.0.7.Final</netty.boringssl.version>
     <java-chassis.version>1.0.0-m2</java-chassis.version>
   </properties>
 
@@ -321,7 +320,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-tcnative-boringssl-static</artifactId>
-        <version>${netty.version}</version>
+        <version>${netty.boringssl.version}</version>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
diff --git a/saga-demo/saga-servicecomb-demo/pom.xml b/saga-demo/saga-servicecomb-demo/pom.xml
index 6dec185..7f5f9d8 100644
--- a/saga-demo/saga-servicecomb-demo/pom.xml
+++ b/saga-demo/saga-servicecomb-demo/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>org.apache.servicecomb</groupId>
         <artifactId>java-chassis-dependencies</artifactId>
-        <version>${java-chassis.version}</version>
+        <version>${java.chassis.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -141,4 +141,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>