From 1a195b3321363a7a459862c547d3e8fc26041228 Mon Sep 17 00:00:00 2001 From: liuxiao Date: Sat, 6 Jan 2024 18:14:41 +0800 Subject: [PATCH 1/4] update shade plugin for spark loader --- .../static/bin/hugegraph-spark-loader.sh | 2 +- hugegraph-loader/pom.xml | 66 +++---------------- .../shaded.jakarta.ws.rs.client.ClientBuilder | 16 ----- ...fish.hk2.extension.ServiceLocatorGenerator | 16 ----- hugegraph-tools/pom.xml | 8 +-- pom.xml | 6 -- 6 files changed, 13 insertions(+), 101 deletions(-) delete mode 100644 hugegraph-loader/src/main/resources/META-INF/services/shaded.jakarta.ws.rs.client.ClientBuilder delete mode 100644 hugegraph-loader/src/main/resources/META-INF/services/shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator diff --git a/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh b/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh index ee93c63f0..c6bb08b84 100755 --- a/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh +++ b/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh @@ -25,7 +25,7 @@ get_params "$@" echo "engine_params: $ENGINE_PARAMS" echo "hugegraph_params: $HUGEGRAPH_PARAMS" -ASSEMBLY_JAR_NAME=$(find "${LIB_DIR}" -name 'apache-hugegraph-loader*.jar') +ASSEMBLY_JAR_NAME=$(find "${LIB_DIR}" -name 'hugegraph-loader*.jar') DEFAULT_APP_NAME="hugegraph-spark-loader" APP_NAME=${APP_NAME:-$DEFAULT_APP_NAME} diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml index 6a9393557..9d84da90d 100644 --- a/hugegraph-loader/pom.xml +++ b/hugegraph-loader/pom.xml @@ -66,36 +66,6 @@ spark-core_${scala.version} ${spark.version} ${spark.scope} - - - jersey-client - org.glassfish.jersey.core - - - jersey-common - org.glassfish.jersey.core - - - jersey-container-servlet - org.glassfish.jersey.containers - - - jersey-container-servlet-core - org.glassfish.jersey.containers - - - jersey-hk2 - org.glassfish.jersey.inject - - - jersey-server - org.glassfish.jersey.core - - - gson - com.google.code.gson - - gson @@ -201,10 +171,6 @@ sfm-csv ${sfm.csv.version} - - com.google.guava - guava - @@ -359,6 +325,10 @@ org.apache.commons commons-compress + + guava + com.google.guava + @@ -667,39 +637,19 @@ false ${final.name}-shaded - - org.glassfish.jersey - shaded.org.glassfish.jersey - - - jakarta.ws.rs - shaded.jakarta.ws.rs - com.google.common.base shaded.com.google.common.base - org.glassfish.hk2 - shaded.org.glassfish.hk2 + okio + shaded.okio - org.jvnet.hk2 - shaded.org.jvnet.hk2 + okhttp3 + shaded.okhttp3 - - - - - - - *:* - - module-info.class - - - diff --git a/hugegraph-loader/src/main/resources/META-INF/services/shaded.jakarta.ws.rs.client.ClientBuilder b/hugegraph-loader/src/main/resources/META-INF/services/shaded.jakarta.ws.rs.client.ClientBuilder deleted file mode 100644 index 7205ceb4f..000000000 --- a/hugegraph-loader/src/main/resources/META-INF/services/shaded.jakarta.ws.rs.client.ClientBuilder +++ /dev/null @@ -1,16 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -shaded.org.glassfish.jersey.client.JerseyClientBuilder diff --git a/hugegraph-loader/src/main/resources/META-INF/services/shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator b/hugegraph-loader/src/main/resources/META-INF/services/shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator deleted file mode 100644 index bad820aa7..000000000 --- a/hugegraph-loader/src/main/resources/META-INF/services/shaded.org.glassfish.hk2.extension.ServiceLocatorGenerator +++ /dev/null @@ -1,16 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -org.jvnet.hk2.external.generator.ServiceLocatorGeneratorImpl diff --git a/hugegraph-tools/pom.xml b/hugegraph-tools/pom.xml index 719ad3934..e49c5ae28 100644 --- a/hugegraph-tools/pom.xml +++ b/hugegraph-tools/pom.xml @@ -115,6 +115,10 @@ log4j log4j + + guava + com.google.guava + @@ -167,10 +171,6 @@ - - com.google.guava - guava - diff --git a/pom.xml b/pom.xml index 0d90acb36..7bce7da1c 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,6 @@ 3.9.0 3.4.1 1.1.3 - 32.0.1-jre 1.4.0 1.72 2.12.3 @@ -231,11 +230,6 @@ - - com.google.guava - guava - ${guava.version} - commons-fileupload commons-fileupload From cab744346fc77ad6db6600b09c9a639738e263e6 Mon Sep 17 00:00:00 2001 From: liuxiao Date: Sat, 6 Jan 2024 18:30:34 +0800 Subject: [PATCH 2/4] update license --- hugegraph-dist/release-docs/LICENSE | 1 - .../scripts/dependency/known-dependencies.txt | 9 +++--- hugegraph-loader/pom.xml | 30 +++++++++++++++++++ 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index 02e28280d..da38beb35 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -321,7 +321,6 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * Gson (com.google.code.gson:gson:2.8.9 - https://github.com/google/gson/gson) (Apache License, Version 2.0) * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) (Apache License, Version 2.0) * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) - (Apache License, Version 2.0) * Guava: Google Core Libraries for Java (com.google.guava:guava:32.0.1-jre - https://github.com/google/guava/guava) (Apache License, Version 2.0) * HPPC Collections (com.carrotsearch:hppc:0.7.2 - http://labs.carrotsearch.com/hppc.html/hppc) (Apache License, Version 2.0) * Hadoop Metrics2 Reporter for Dropwizard Metrics (com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 - https://github.com/joshelser/dropwizard-hadoop-metrics2) (Apache License, Version 2.0) * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.0.17.Final - http://hibernate.org/validator/hibernate-validator) diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt index f0e8b54e8..c236d7260 100644 --- a/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -20,7 +20,7 @@ audience-annotations-0.5.0.jar avro-1.10.2.jar avro-1.7.7.jar caffeine-2.6.2.jar -checker-qual-3.33.0.jar +checker-qual-3.5.0.jar classmate-1.4.0.jar commons-beanutils-1.9.4.jar commons-cli-1.3.1.jar @@ -50,14 +50,15 @@ datanucleus-core-4.1.17.jar disruptor-3.3.6.jar dnsjava-2.1.7.jar dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar -error_prone_annotations-2.18.0.jar +error_prone_annotations-2.3.3.jar +error_prone_annotations-2.3.4.jar failureaccess-1.0.1.jar findbugs-annotations-1.3.9-1.jar flatbuffers-1.2.0-3f79e055.jar flatbuffers-java-1.9.0.jar groovy-all-2.4.21.jar gson-2.8.9.jar -guava-32.0.1-jre.jar +guava-30.0-jre.jar h2-1.4.199.jar hadoop-annotations-3.3.1.jar hadoop-auth-3.3.1.jar @@ -119,7 +120,7 @@ httpcore-4.4.12.jar httpcore-4.4.13.jar ivy-2.4.0.jar ivy-2.5.0.jar -j2objc-annotations-2.8.jar +j2objc-annotations-1.3.jar jackson-annotations-2.12.3.jar jackson-core-2.12.3.jar jackson-core-asl-1.9.13.jar diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml index 9d84da90d..0c6f6bd44 100644 --- a/hugegraph-loader/pom.xml +++ b/hugegraph-loader/pom.xml @@ -66,6 +66,36 @@ spark-core_${scala.version} ${spark.version} ${spark.scope} + + + jersey-client + org.glassfish.jersey.core + + + jersey-common + org.glassfish.jersey.core + + + jersey-container-servlet + org.glassfish.jersey.containers + + + jersey-container-servlet-core + org.glassfish.jersey.containers + + + jersey-hk2 + org.glassfish.jersey.inject + + + jersey-server + org.glassfish.jersey.core + + + gson + com.google.code.gson + + gson From 178d034c28c72b93f1b2e34531754d8700dfc155 Mon Sep 17 00:00:00 2001 From: liuxiao Date: Sat, 6 Jan 2024 18:37:40 +0800 Subject: [PATCH 3/4] update license --- hugegraph-dist/release-docs/LICENSE | 5 +++-- hugegraph-dist/scripts/dependency/known-dependencies.txt | 1 - hugegraph-loader/pom.xml | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index da38beb35..f2be92b0b 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -321,6 +321,7 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * Gson (com.google.code.gson:gson:2.8.9 - https://github.com/google/gson/gson) (Apache License, Version 2.0) * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess) (Apache License, Version 2.0) * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture) + (Apache License, Version 2.0) * Guava: Google Core Libraries for Java (com.google.guava:guava:30.0-jre - https://github.com/google/guava/guava) (Apache License, Version 2.0) * HPPC Collections (com.carrotsearch:hppc:0.7.2 - http://labs.carrotsearch.com/hppc.html/hppc) (Apache License, Version 2.0) * Hadoop Metrics2 Reporter for Dropwizard Metrics (com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 - https://github.com/joshelser/dropwizard-hadoop-metrics2) (Apache License, Version 2.0) * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.0.17.Final - http://hibernate.org/validator/hibernate-validator) @@ -341,7 +342,7 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * Hive Storage API (org.apache.hive:hive-storage-api:2.7.2 - https://www.apache.org/hive-storage-api/) (Apache License, Version 2.0) * Hive Upgrade Acid (org.apache.hive:hive-upgrade-acid:3.1.3 - https://www.apache.org/hive-upgrade-acid/) (Apache License, Version 2.0) * Hive Vector-Code-Gen Utilities (org.apache.hive:hive-vector-code-gen:3.1.3 - https://hive.apache.org/hive-vector-code-gen) - (Apache License, Version 2.0) * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:2.8 - https://github.com/google/j2objc/) + (Apache License, Version 2.0) * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/) (Apache License, Version 2.0) * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.3.3.Final - http://www.jboss.org) (Apache License, Version 2.0) * JCIP Annotations under Apache License (com.github.stephenc.jcip:jcip-annotations:1.0-1 - http://stephenc.github.com/jcip-annotations) (Apache License, Version 2.0) * JPam (net.sf.jpam:jpam:1.1 - http://jpam.sf.net) @@ -581,7 +582,7 @@ Third party MIT licenses The following components are provided under the MIT License. See licenses/ for text of these licenses. - (The MIT License) * Checker Qual (org.checkerframework:checker-qual:3.33.0 - https://checkerframework.org) + (The MIT License) * Checker Qual (org.checkerframework:checker-qual:3.5.0 - https://checkerframework.org) (The MIT License) * JCodings (org.jruby.jcodings:jcodings:1.0.18 - http://nexus.sonatype.org/oss-repository-hosting.html/jcodings) (The MIT License) * JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.28 - http://www.slf4j.org) (The MIT License) * Joni (org.jruby.joni:joni:2.1.11 - http://nexus.sonatype.org/oss-repository-hosting.html/joni) diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt index c236d7260..e610d0729 100644 --- a/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -50,7 +50,6 @@ datanucleus-core-4.1.17.jar disruptor-3.3.6.jar dnsjava-2.1.7.jar dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar -error_prone_annotations-2.3.3.jar error_prone_annotations-2.3.4.jar failureaccess-1.0.1.jar findbugs-annotations-1.3.9-1.jar diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml index 0c6f6bd44..339312e30 100644 --- a/hugegraph-loader/pom.xml +++ b/hugegraph-loader/pom.xml @@ -176,6 +176,10 @@ com.fasterxml.jackson.jaxrs * + + error_prone_annotations + com.google.errorprone + @@ -224,6 +228,10 @@ com.sun.jersey jersey-json + + error_prone_annotations + com.google.errorprone + From d1442164e4aae401c910f59031376d9080f37bcc Mon Sep 17 00:00:00 2001 From: liuxiao Date: Sat, 6 Jan 2024 18:39:05 +0800 Subject: [PATCH 4/4] update --- hugegraph-dist/release-docs/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-dist/release-docs/LICENSE b/hugegraph-dist/release-docs/LICENSE index f2be92b0b..3450cbb44 100644 --- a/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-dist/release-docs/LICENSE @@ -431,7 +431,7 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) * Woodstox (com.fasterxml.woodstox:woodstox-core:5.3.0 - https://github.com/FasterXML/woodstox) (Apache License, Version 2.0) * aircompressor (io.airlift:aircompressor:0.10 - http://github.com/airlift/aircompressor) (Apache License, Version 2.0) * aircompressor (io.airlift:aircompressor:0.21 - http://github.com/airlift/aircompressor) - (Apache License, Version 2.0) * error-prone annotations (com.google.errorprone:error_prone_annotations:2.18.0 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) + (Apache License, Version 2.0) * error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations) (Apache License, Version 2.0) * htrace-core4 (org.apache.htrace:htrace-core4:4.1.0-incubating - http://incubator.apache.org/projects/htrace.html) (Apache License, Version 2.0) * htrace-core4 (org.apache.htrace:htrace-core4:4.2.0-incubating - http://incubator.apache.org/projects/htrace.html) (Apache License, Version 2.0) * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.12.3 - http://github.com/FasterXML/jackson)