nzomkxia closed pull request #145: [#141] Fix warning on startup with dubbo2.6.4
URL: https://github.com/apache/incubator-dubbo-ops/pull/145
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
