You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by je...@apache.org on 2023/04/20 16:07:10 UTC
[incubator-hugegraph-commons] branch master updated: fix commons dependency conflict (#131)
This is an automated email from the ASF dual-hosted git repository.
jermy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-commons.git
The following commit(s) were added to refs/heads/master by this push:
new 297e491 fix commons dependency conflict (#131)
297e491 is described below
commit 297e49123298da7c17aecd5db826f4ff8d8a5fe5
Author: zoulei <10...@qq.com>
AuthorDate: Fri Apr 21 00:07:05 2023 +0800
fix commons dependency conflict (#131)
* fix commons dependency conflict
* upgrade commons version to 1.0.1
* upgrade grpc-core version to 1.28.1
Co-authored-by: imbajin <ji...@apache.org>
---
hugegraph-common/pom.xml | 73 ++++++++++++++++++++++
.../apache/hugegraph/version/CommonVersion.java | 2 +-
.../scripts/dependency/known-dependencies.txt | 6 +-
hugegraph-rpc/pom.xml | 9 +++
.../org/apache/hugegraph/version/RpcVersion.java | 2 +-
pom.xml | 4 +-
6 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/hugegraph-common/pom.xml b/hugegraph-common/pom.xml
index b75cdc5..01bf29b 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/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java b/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
index e2fa83a..bcdad92 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-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt
index 40d65bf..c6de269 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
diff --git a/hugegraph-rpc/pom.xml b/hugegraph-rpc/pom.xml
index a6c15df..0637da1 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>
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 70be408..f3cf926 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 a726be5..8f2e39b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,8 @@
</scm>
<properties>
- <revision>1.0.0</revision>
+ <!-- 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>
<compiler.source>1.8</compiler.source>
@@ -99,6 +100,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>