This is an automated email from the ASF dual-hosted git repository.
ming pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git
The following commit(s) were added to refs/heads/master by this push:
new 1d292bef fix: exclude okhttp1 which has different groupID with okhttp3
(#555)
1d292bef is described below
commit 1d292bef993c63ff4c7763b37692dc30a2a7bcab
Author: imbajin <[email protected]>
AuthorDate: Wed Dec 13 08:57:55 2023 +0800
fix: exclude okhttp1 which has different groupID with okhttp3 (#555)
* fix: exclude okhttp1 which has different groupID with okhttp3
* Update known-dependencies.txt
---
hugegraph-dist/scripts/dependency/known-dependencies.txt | 2 --
hugegraph-loader/pom.xml | 6 ++++++
hugegraph-tools/pom.xml | 4 ++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt
b/hugegraph-dist/scripts/dependency/known-dependencies.txt
index 7914115d..595a52f3 100644
--- a/hugegraph-dist/scripts/dependency/known-dependencies.txt
+++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt
@@ -253,7 +253,6 @@ netty-transport-4.1.65.Final.jar
netty-transport-native-epoll-4.1.65.Final.jar
netty-transport-native-unix-common-4.1.65.Final.jar
nimbus-jose-jwt-9.8.1.jar
-okhttp-2.7.5.jar
okhttp-4.10.0.jar
logging-interceptor-4.10.0.jar
kotlin-stdlib-1.6.20.jar
@@ -262,7 +261,6 @@ kotlin-stdlib-jdk7-1.2.71.jar
kotlin-stdlib-jdk7-1.6.10.jar
kotlin-stdlib-jdk8-1.2.71.jar
kotlin-stdlib-jdk8-1.6.10.jar
-okio-1.6.0.jar
okio-jvm-3.0.0.jar
opencsv-2.3.jar
orc-core-1.5.8.jar
diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml
index e4565f0f..6a939355 100644
--- a/hugegraph-loader/pom.xml
+++ b/hugegraph-loader/pom.xml
@@ -365,6 +365,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>okhttp</artifactId>
+ <groupId>com.squareup.okhttp</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- TODO: slim hadoop depedenencies -->
<dependency>
diff --git a/hugegraph-tools/pom.xml b/hugegraph-tools/pom.xml
index 8939e141..719ad393 100644
--- a/hugegraph-tools/pom.xml
+++ b/hugegraph-tools/pom.xml
@@ -161,6 +161,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>okhttp</artifactId>
+ <groupId>com.squareup.okhttp</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
