From accc27fc9bc985235d3ba09767ac2acbd5e731c4 Mon Sep 17 00:00:00 2001
From: Linary <liningrui@vip.qq.com>
Date: Tue, 22 Sep 2020 09:09:17 +0800
Subject: [PATCH] Solve some dependency conflicts (#54) (#1184)

Change-Id: I86f0a7800e19acb6356e9e603605cb03eff1d30d
---
 hugegraph-api/pom.xml       | 21 +++++++++++++++++++++
 hugegraph-cassandra/pom.xml |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/hugegraph-api/pom.xml b/hugegraph-api/pom.xml
index a2a3e2f8cd..ce3f9987c4 100644
--- a/hugegraph-api/pom.xml
+++ b/hugegraph-api/pom.xml
@@ -66,6 +66,27 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jersey2</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.grizzly</groupId>
+            <artifactId>grizzly-http</artifactId>
+            <version>2.4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.grizzly</groupId>
+            <artifactId>grizzly-framework</artifactId>
+            <version>2.4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.grizzly</groupId>
+            <artifactId>grizzly-http-server</artifactId>
+            <version>2.4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.grizzly</groupId>
+            <artifactId>grizzly-http-servlet</artifactId>
+            <version>2.4.4</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/hugegraph-cassandra/pom.xml b/hugegraph-cassandra/pom.xml
index 7f4e4fd82e..7fb53b4420 100644
--- a/hugegraph-cassandra/pom.xml
+++ b/hugegraph-cassandra/pom.xml
@@ -60,12 +60,12 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.42.Final</version>
+            <version>4.1.13.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
-            <version>4.1.36.Final</version>
+            <version>4.1.13.Final</version>
             <classifier>linux-x86_64</classifier>
         </dependency>
     </dependencies>