From 014307be3bd27532b047ffc39452eb250acbed3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com>
Date: Sat, 8 Apr 2023 07:28:54 +0800
Subject: [PATCH 1/6] fix commons dependency conflict

---
 hugegraph-common/pom.xml | 73 ++++++++++++++++++++++++++++++++++++++++
 pom.xml                  |  1 +
 2 files changed, 74 insertions(+)

diff --git a/hugegraph-common/pom.xml b/hugegraph-common/pom.xml
index b75cdc54..01bf29b1 100644
--- a/hugegraph-common/pom.xml
+++ b/hugegraph-common/pom.xml
@@ -85,11 +85,32 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-configuration2</artifactId>
             <version>${commons.configuration2.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-lang3</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons.lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
             <version>${commons.beanutils.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -110,6 +131,12 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jsr305</artifactId>
+                    <groupId>com.google.code.findbugs</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -151,6 +178,12 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
             <version>${jackson.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <groupId>jakarta.xml.bind</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -182,28 +215,68 @@
                     <groupId>com.fasterxml.jackson.jaxrs</groupId>
                     <artifactId>jackson-jaxrs-json-provider</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jackson-annotations</artifactId>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jackson-databind</artifactId>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jackson-module-jaxb-annotations</artifactId>
+                    <groupId>com.fasterxml.jackson.module</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.connectors</groupId>
             <artifactId>jersey-apache-connector</artifactId>
             <version>${jersey.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-codec</artifactId>
+                    <groupId>commons-codec</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-hk2</artifactId>
             <version>${jersey.hk2.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${jakarta.xml.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jakarta.activation-api</artifactId>
+                    <groupId>jakarta.activation</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <version>${sun.xml.version}</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                    <groupId>jakarta.xml.bind</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index a726be5a..f015d30c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
         <commons.configuration2.version>2.8.0</commons.configuration2.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
         <commons.collections.version>3.2.2</commons.collections.version>
+        <commons.lang3.version>3.12.0</commons.lang3.version>
         <commons.io.version>2.7</commons.io.version>
         <commons.codec.version>1.13</commons.codec.version>
         <guava.version>30.0-jre</guava.version>

From 71a4d00aa33df11833a0b20fbb01c536c33c4fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com>
Date: Tue, 11 Apr 2023 13:09:43 +0800
Subject: [PATCH 2/6] upgrade commons version to 1.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f015d30c..9c339dd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
     </scm>
 
     <properties>
-        <revision>1.0.0</revision>
+        <revision>1.0.1</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <top.level.dir>${project.basedir}/..</top.level.dir>
         <compiler.source>1.8</compiler.source>

From 4ddd61fc1113e9cc477942b9954ca810008cb118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com>
Date: Wed, 12 Apr 2023 17:58:44 +0800
Subject: [PATCH 3/6] upgrade common & rpc version to 1.0.1

---
 .../main/java/org/apache/hugegraph/version/CommonVersion.java   | 2 +-
 .../src/main/java/org/apache/hugegraph/version/RpcVersion.java  | 2 +-
 pom.xml                                                         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java b/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
index e2fa83a3..bcdad926 100644
--- a/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
@@ -24,5 +24,5 @@ public class CommonVersion {
     public static final String NAME = "hugegraph-common";
 
     // The second parameter of Version.of() is for all-in-one JAR
-    public static final Version VERSION = Version.of(CommonVersion.class, "1.0.0");
+    public static final Version VERSION = Version.of(CommonVersion.class, "1.0.1");
 }
diff --git a/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java
index 70be408c..f3cf926a 100644
--- a/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java
@@ -24,5 +24,5 @@ public class RpcVersion {
     public static final String NAME = "hugegraph-rpc";
 
     // The second parameter of Version.of() is for all-in-one JAR
-    public static final Version VERSION = Version.of(RpcVersion.class, "1.0.0");
+    public static final Version VERSION = Version.of(RpcVersion.class, "1.0.1");
 }
diff --git a/pom.xml b/pom.xml
index 9c339dd2..8289a8e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
     </scm>
 
     <properties>
+        <!--need to keep pace with CommonVersion.java & RpcVersion.java-->
         <revision>1.0.1</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <top.level.dir>${project.basedir}/..</top.level.dir>

From 921c72f87810f8783e560b1de40e07b8456abbc2 Mon Sep 17 00:00:00 2001
From: imbajin <jin@apache.org>
Date: Wed, 12 Apr 2023 18:09:10 +0800
Subject: [PATCH 4/6] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8289a8e9..8f2e39bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
     </scm>
 
     <properties>
-        <!--need to keep pace with CommonVersion.java & RpcVersion.java-->
+        <!-- Note: We need also update the version in CommonVersion.java & RpcVersion.java now -->
         <revision>1.0.1</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <top.level.dir>${project.basedir}/..</top.level.dir>

From cb79ce46ec8682c345272d684ca047eae466f8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com>
Date: Thu, 20 Apr 2023 15:35:17 +0800
Subject: [PATCH 5/6] upgrade grpc-core version to 1.28.1

---
 hugegraph-rpc/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hugegraph-rpc/pom.xml b/hugegraph-rpc/pom.xml
index a6c15df2..0637da1c 100644
--- a/hugegraph-rpc/pom.xml
+++ b/hugegraph-rpc/pom.xml
@@ -96,8 +96,17 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.grpc</groupId>
+                    <artifactId>grpc-core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-core</artifactId>
+            <version>1.28.1</version>
+        </dependency>
     </dependencies>
 
     <build>

From 549cdc7f309649c99db59f032f88d2314a13d5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E5=B9=B4?= <1043706593@qq.com>
Date: Thu, 20 Apr 2023 16:02:05 +0800
Subject: [PATCH 6/6] update grpc version in know-dependencies.txt

---
 hugegraph-dist/scripts/dependency/known-dependencies.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt
index 40d65bff..c6de269c 100644
--- a/hugegraph-dist/scripts/dependency/known-dependencies.txt
+++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt
@@ -16,9 +16,9 @@ commons-text-1.9.jar
 disruptor-3.3.7.jar
 error_prone_annotations-2.3.4.jar
 failureaccess-1.0.1.jar
-grpc-api-1.28.0.jar
-grpc-context-1.28.0.jar
-grpc-core-1.28.0.jar
+grpc-api-1.28.1.jar
+grpc-context-1.28.1.jar
+grpc-core-1.28.1.jar
 grpc-netty-shaded-1.28.0.jar
 grpc-protobuf-1.28.0.jar
 grpc-protobuf-lite-1.28.0.jar