You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/10/19 02:39:30 UTC
[incubator-dubbo-ops] branch develop updated: [#141] Fix warning on
startup with dubbo2.6.4 (#145)
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new e0aa068 [#141] Fix warning on startup with dubbo2.6.4 (#145)
e0aa068 is described below
commit e0aa068adf52277f6fe27c315370c406615b1119
Author: 马金凯 <ma...@vip.qq.com>
AuthorDate: Fri Oct 19 10:39:25 2018 +0800
[#141] Fix warning on startup with dubbo2.6.4 (#145)
---
dubbo-admin-backend/pom.xml | 20 ++++++++++++++++++++
pom.xml | 6 ++++++
2 files changed, 26 insertions(+)
diff --git a/dubbo-admin-backend/pom.xml b/dubbo-admin-backend/pom.xml
index 1293667..da5e02d 100644
--- a/dubbo-admin-backend/pom.xml
+++ b/dubbo-admin-backend/pom.xml
@@ -55,11 +55,27 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>netty</artifactId>
+ <groupId>org.jboss.netty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>netty</artifactId>
+ <groupId>io.netty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
@@ -79,6 +95,10 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index e3fa4b4..950d1ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
<fastjson-version>1.2.46</fastjson-version>
<snakeyaml-version>1.22</snakeyaml-version>
<springfox-swagger-version>2.9.2</springfox-swagger-version>
+ <netty-version>4.1.30.Final</netty-version>
</properties>
<dependencyManagement>
@@ -90,6 +91,11 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>${springfox-swagger-version}</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty-version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>