Repository: alibaba/fescar
Pull request #323 (2019-01-29 08:50:41)

Upgrade dubbo to 2.7.0
<!-- Please make sure you have read and understood the contributing guidelines -->

### Ⅰ. Describe what this PR did
upgrade dubbo to v 2.7.0

### Ⅱ. Does this pull request fix one issue?

https://github.com/alibaba/fescar/issues/6


### Ⅲ. Why don't you add test cases (unit test/integration test)? 


### Ⅳ. Describe how to verify it

ci pass 
 


codecov-io: # [Codecov](https://codecov.io/gh/alibaba/fescar/pull/323?src=pr&el=h1) Report
> Merging [#323](https://codecov.io/gh/alibaba/fescar/pull/323?src=pr&el=desc) into [develop](https://codecov.io/gh/alibaba/fescar/commit/15e1fd8051c2299d3c4c79637100c598d9419cbb?src=pr&el=desc) will **increase** coverage by `0.01%`.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/alibaba/fescar/pull/323/graphs/tree.svg?width=650&token=Hy9a6MCc4p&height=150&src=pr)](https://codecov.io/gh/alibaba/fescar/pull/323?src=pr&el=tree)

```diff
@@             Coverage Diff             @@
##           develop     #323      +/-   ##
===========================================
+ Coverage    20.62%   20.63%   +0.01%     
===========================================
  Files          184      184              
  Lines         6938     6938              
  Branches       951      951              
===========================================
+ Hits          1431     1432       +1     
+ Misses        5357     5356       -1     
  Partials       150      150
```


| [Impacted Files](https://codecov.io/gh/alibaba/fescar/pull/323?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [...aba/fescar/dubbo/TransactionPropagationFilter.java](https://codecov.io/gh/alibaba/fescar/pull/323/diff?src=pr&el=tree#diff-ZHViYm8vc3JjL21haW4vamF2YS9jb20vYWxpYmFiYS9mZXNjYXIvZHViYm8vVHJhbnNhY3Rpb25Qcm9wYWdhdGlvbkZpbHRlci5qYXZh) | `0% <ø> (ø)` | :arrow_up: |
| [...scar/server/store/FileTransactionStoreManager.java](https://codecov.io/gh/alibaba/fescar/pull/323/diff?src=pr&el=tree#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2FsaWJhYmEvZmVzY2FyL3NlcnZlci9zdG9yZS9GaWxlVHJhbnNhY3Rpb25TdG9yZU1hbmFnZXIuamF2YQ==) | `52.12% <0%> (+0.53%)` | :arrow_up: |

------

[Continue to review full report at Codecov](https://codecov.io/gh/alibaba/fescar/pull/323?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/alibaba/fescar/pull/323?src=pr&el=footer). Last update [15e1fd8...755d86d](https://codecov.io/gh/alibaba/fescar/pull/323?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


Patch:
diff --git a/.gitignore b/.gitignore
index 316063435..e96e3d3cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,11 @@ target/
 *.diff
 *.patch
 *.tmp
-distribution/*
+/distribution/bin
+/distribution/conf
+/distribution/lib
+server/*root.*
+server/.root.*
 
 # system ignore
 .DS_Store
diff --git a/dubbo/pom.xml b/dubbo/pom.xml
index aef91b54a..d8608f88b 100644
--- a/dubbo/pom.xml
+++ b/dubbo/pom.xml
@@ -36,7 +36,7 @@
             <artifactId>fescar-tm</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
         </dependency>
     </dependencies>
diff --git a/dubbo/src/main/java/com/alibaba/fescar/dubbo/TransactionPropagationFilter.java b/dubbo/src/main/java/com/alibaba/fescar/dubbo/TransactionPropagationFilter.java
index 1573737a8..1b8f50f63 100644
--- a/dubbo/src/main/java/com/alibaba/fescar/dubbo/TransactionPropagationFilter.java
+++ b/dubbo/src/main/java/com/alibaba/fescar/dubbo/TransactionPropagationFilter.java
@@ -16,14 +16,14 @@
 
 package com.alibaba.fescar.dubbo;
 
-import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.common.extension.Activate;
-import com.alibaba.dubbo.rpc.Filter;
-import com.alibaba.dubbo.rpc.Invocation;
-import com.alibaba.dubbo.rpc.Invoker;
-import com.alibaba.dubbo.rpc.Result;
-import com.alibaba.dubbo.rpc.RpcContext;
-import com.alibaba.dubbo.rpc.RpcException;
+import org.apache.dubbo.common.Constants;
+import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.rpc.Filter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Result;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcException;
 import com.alibaba.fescar.core.context.RootContext;
 
 import org.slf4j.Logger;
diff --git a/examples/src/main/resources/dubbo-account-service.xml b/examples/src/main/resources/dubbo-account-service.xml
index 506cf1a4e..e710b2cf6 100755
--- a/examples/src/main/resources/dubbo-account-service.xml
+++ b/examples/src/main/resources/dubbo-account-service.xml
@@ -17,8 +17,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
+       xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
 
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations" value="classpath:jdbc.properties"/>
diff --git a/examples/src/main/resources/dubbo-business.xml b/examples/src/main/resources/dubbo-business.xml
index 9f47f3686..4a28bedb4 100755
--- a/examples/src/main/resources/dubbo-business.xml
+++ b/examples/src/main/resources/dubbo-business.xml
@@ -17,9 +17,9 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+    xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
+                        http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
 
     <dubbo:application name="dubbo-demo-app"  />
     <dubbo:registry address="multicast://224.5.6.7:1234?unicast=false" />
diff --git a/examples/src/main/resources/dubbo-order-service.xml b/examples/src/main/resources/dubbo-order-service.xml
index 379d9ab59..be393ad29 100755
--- a/examples/src/main/resources/dubbo-order-service.xml
+++ b/examples/src/main/resources/dubbo-order-service.xml
@@ -17,8 +17,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
+       xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
 
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations" value="classpath:jdbc.properties"/>
diff --git a/examples/src/main/resources/dubbo-storage-service.xml b/examples/src/main/resources/dubbo-storage-service.xml
index 85dddf081..90745bc04 100755
--- a/examples/src/main/resources/dubbo-storage-service.xml
+++ b/examples/src/main/resources/dubbo-storage-service.xml
@@ -17,8 +17,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
+       xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
 
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations" value="classpath:jdbc.properties"/>
diff --git a/pom.xml b/pom.xml
index 33791cd03..76dd198ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,9 +88,20 @@
         <netty4.version>4.1.24.Final</netty4.version>
         <org.springframework.spring.version>2.5.6.SEC03</org.springframework.spring.version>
         <junit.version>4.12</junit.version>
-        <dubbo.version>2.5.3</dubbo.version>
+        <dubbo.version>2.7.0</dubbo.version>
+        <fastjson.version>1.2.48</fastjson.version>
+        <config.version>1.2.1</config.version>
+        <slf4j-api.version>1.7.22</slf4j-api.version>
+        <logback-classic.version>1.1.6</logback-classic.version>
+        <commons-lang.version>2.6</commons-lang.version>
+        <commons-pool2.version>2.4.2</commons-pool2.version>
+        <commons-pool.version>1.6</commons-pool.version>
+        <cglib.version>3.1</cglib.version>
+        <aopalliance.version>1.0</aopalliance.version>
         <zkclient.version>0.10</zkclient.version>
         <dubbo.registry.nacos>0.0.1</dubbo.registry.nacos>
+        <spring-context-support.version>1.0.2</spring-context-support.version>
+        <testng.version>6.4</testng.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -157,7 +168,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.48</version>
+                <version>${fastjson.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
@@ -167,32 +178,32 @@
             <dependency>
                 <groupId>com.typesafe</groupId>
                 <artifactId>config</artifactId>
-                <version>1.2.1</version>
+                <version>${config.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.22</version>
+                <version>${slf4j-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.1.6</version>
+                <version>${logback-classic.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
+                <version>${commons-lang.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
-                <version>2.4.2</version>
+                <version>${commons-pool2.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
-                <version>1.6</version>
+                <version>${commons-pool.version}</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -202,22 +213,22 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>6.4</version>
+                <version>${testng.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.alibaba</groupId>
+                <groupId>org.apache.dubbo</groupId>
                 <artifactId>dubbo</artifactId>
                 <version>${dubbo.version}</version>
             </dependency>
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib</artifactId>
-                <version>3.1</version>
+                <version>${cglib.version}</version>
             </dependency>
             <dependency>
                 <groupId>aopalliance</groupId>
                 <artifactId>aopalliance</artifactId>
-                <version>1.0</version>
+                <version>${aopalliance.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.101tec</groupId>
@@ -232,9 +243,10 @@
             <dependency>
                 <groupId>com.alibaba.spring</groupId>
                 <artifactId>spring-context-support</artifactId>
-                <version>1.0.2</version>
+                <version>${spring-context-support.version}</version>
             </dependency>
         </dependencies>
+
     </dependencyManagement>
 
     <profiles>


Test patch:
diff --git a/test/pom.xml b/test/pom.xml
index 83f77b551..74ee50240 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -61,9 +61,8 @@
             <artifactId>fescar-rm-datasource</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
-            <version>2.5.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>