You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by co...@apache.org on 2020/04/17 00:47:39 UTC

[dubbo-benchmark] 13/16: upgrade to dubbo 2.7.2

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

codingsinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-benchmark.git

commit 7e5abfd875f71a15b017c5b4a93b13aaad6106ac
Author: CodingSinger <oo...@gmail.com>
AuthorDate: Mon Jul 22 09:42:02 2019 +0800

    upgrade to dubbo 2.7.2
---
 client-base/pom.xml                 | 11 -----------
 dubbo-native-hessian-client/pom.xml |  3 ++-
 pom.xml                             | 24 ++++++++++--------------
 server-base/pom.xml                 |  5 -----
 4 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/client-base/pom.xml b/client-base/pom.xml
index 9607e04..24c648f 100644
--- a/client-base/pom.xml
+++ b/client-base/pom.xml
@@ -19,11 +19,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>
@@ -47,11 +42,5 @@
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.4</version>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/dubbo-native-hessian-client/pom.xml b/dubbo-native-hessian-client/pom.xml
index d2c19b8..f172c50 100644
--- a/dubbo-native-hessian-client/pom.xml
+++ b/dubbo-native-hessian-client/pom.xml
@@ -20,7 +20,8 @@
 
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-serialization-native-hessian</artifactId>
+            <artifactId>dubbo-serialization-native-hession</artifactId>
+            <version>${dubbo.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 94af7a0..408e17f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,6 @@
         <kryo.version>4.0.2</kryo.version>
         <kryo-serializers.version>0.42</kryo-serializers.version>
         <fst.version>2.48-jdk-6</fst.version>
-        <native-hessian.version>1.0-SNAPSHOT</native-hessian.version>
         <jmh.version>1.21</jmh.version>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.3</logback.version>
@@ -39,9 +38,11 @@
     </modules>
 
     <dependencies>
+
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
+            <version>${dubbo.version}</version>
         </dependency>
 
         <dependency>
@@ -65,14 +66,10 @@
             <!-- use netty 4 by default -->
             <dependency>
                 <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo</artifactId>
+                <artifactId>dubbo-dependencies-bom</artifactId>
                 <version>${dubbo.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.jboss.netty</groupId>
-                        <artifactId>netty</artifactId>
-                    </exclusion>
-                </exclusions>
+               <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>
@@ -100,12 +97,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.dubbo</groupId>
-                <artifactId>dubbo-serialization-native-hessian</artifactId>
-                <version>${native-hessian.version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.openjdk.jmh</groupId>
                 <artifactId>jmh-core</artifactId>
                 <version>${jmh.version}</version>
@@ -135,6 +126,11 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-serialization-native-hessian</artifactId>
+                <version>${dubbo.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/server-base/pom.xml b/server-base/pom.xml
index e6392a9..f2289af 100644
--- a/server-base/pom.xml
+++ b/server-base/pom.xml
@@ -19,11 +19,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>