From 549ca82021b846fd1ae8c6ed112c47935228fb7f Mon Sep 17 00:00:00 2001 From: conghuhu <56248584+conghuhu@users.noreply.github.com> Date: Sun, 18 Jun 2023 21:04:19 +0800 Subject: [PATCH] chore: unify the dependencies versions of the entire project (#478) fix: unify zk version chore: update guava to 32.0.0-jre Co-authored-by: shiyi --- hugegraph-client/pom.xml | 7 - .../scripts/dependency/known-dependencies.txt | 137 +++------ hugegraph-hubble/hubble-be/pom.xml | 8 +- hugegraph-hubble/pom.xml | 15 +- hugegraph-loader/pom.xml | 42 +-- hugegraph-tools/pom.xml | 27 +- pom.xml | 273 ++++++++++++++---- 7 files changed, 306 insertions(+), 203 deletions(-) diff --git a/hugegraph-client/pom.xml b/hugegraph-client/pom.xml index b04eeda5b..ec867df2d 100644 --- a/hugegraph-client/pom.xml +++ b/hugegraph-client/pom.xml @@ -37,31 +37,24 @@ - 1.0.0 - 3.0.3 - 2.8.47 org.apache.hugegraph hugegraph-common - ${hugegraph.common.version} org.lz4 lz4-java - 1.4.0 org.glassfish.jersey.containers jersey-container-servlet - ${jersey.version} org.mockito mockito-core - ${mockito.version} test diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-dist/scripts/dependency/known-dependencies.txt index 77463237a..6a67bf292 100644 --- a/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -6,7 +6,6 @@ accessors-smart-1.2.jar accessors-smart-2.4.2.jar aircompressor-0.10.jar aircompressor-0.21.jar -animal-sniffer-annotations-1.14.jar annotations-17.0.0.jar ant-1.9.1.jar ant-launcher-1.9.1.jar @@ -25,81 +24,59 @@ audience-annotations-0.5.0.jar avro-1.10.2.jar avro-1.7.7.jar caffeine-2.6.2.jar -checker-qual-2.0.0.jar -checker-qual-3.5.0.jar +checker-qual-3.33.0.jar classmate-1.4.0.jar -commons-beanutils-1.9.3.jar commons-beanutils-1.9.4.jar -commons-cli-1.2.jar commons-cli-1.3.1.jar -commons-codec-1.11.jar -commons-codec-1.13.jar commons-codec-1.15.jar commons-collections-3.2.2.jar commons-compress-1.21.jar -commons-compress-1.4.1.jar commons-configuration-1.10.jar commons-configuration2-2.1.1.jar commons-configuration2-2.8.0.jar commons-crypto-1.0.0.jar commons-crypto-1.1.0.jar commons-daemon-1.0.13.jar -commons-fileupload-1.4.jar -commons-io-2.7.jar +commons-fileupload-1.5.jar +commons-io-2.8.0.jar commons-lang-2.6.jar -commons-lang3-3.12.0.jar -commons-lang3-3.4.jar -commons-lang3-3.8.1.jar commons-lang3-3.9.jar -commons-logging-1.1.1.jar commons-logging-1.1.3.jar -commons-math3-3.1.1.jar commons-math3-3.4.1.jar -commons-net-3.1.jar -commons-net-3.6.jar -commons-text-1.6.jar -commons-text-1.9.jar -curator-client-2.12.0.jar +commons-net-3.9.0.jar +commons-text-1.10.0.jar curator-client-4.2.0.jar curator-framework-2.12.0.jar -curator-recipes-2.12.0.jar +curator-framework-4.2.0.jar curator-recipes-2.13.0.jar curator-recipes-4.2.0.jar 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.1.3.jar -error_prone_annotations-2.3.4.jar +error_prone_annotations-2.18.0.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.2.4.jar -gson-2.8.5.jar -guava-25.1-jre.jar -guava-30.0-jre.jar +gson-2.8.9.jar +guava-32.0.1-jre.jar h2-1.4.199.jar -hadoop-annotations-3.1.1.jar hadoop-annotations-3.3.1.jar -hadoop-auth-3.1.1.jar hadoop-auth-3.3.1.jar -hadoop-client-3.1.1.jar -hadoop-common-3.1.1.jar +hadoop-client-3.3.1.jar hadoop-common-3.3.1.jar -hadoop-hdfs-3.1.1.jar +hadoop-hdfs-3.3.1.jar hadoop-hdfs-client-3.3.1.jar -hadoop-hdfs-client-3.1.1.jar -hadoop-mapreduce-client-common-3.1.1.jar -hadoop-mapreduce-client-core-3.1.1.jar -hadoop-mapreduce-client-jobclient-3.1.1.jar +hadoop-mapreduce-client-common-3.3.1.jar +hadoop-mapreduce-client-core-3.3.1.jar +hadoop-mapreduce-client-jobclient-3.3.1.jar hadoop-shaded-guava-1.1.1.jar hadoop-shaded-protobuf_3_7-1.1.1.jar -hadoop-yarn-api-3.1.1.jar -hadoop-yarn-client-3.1.1.jar -hadoop-yarn-common-3.1.1.jar -hamcrest-core-1.3.jar +hadoop-yarn-api-3.3.1.jar +hadoop-yarn-client-3.3.1.jar +hadoop-yarn-common-3.3.1.jar hbase-client-2.2.3.jar hbase-common-2.2.3.jar hbase-hadoop-compat-2.2.3.jar @@ -142,51 +119,31 @@ hppc-0.7.2.jar htrace-core4-4.1.0-incubating.jar htrace-core4-4.2.0-incubating.jar httpclient-4.5.13.jar -httpclient-4.5.2.jar httpclient-4.5.9.jar httpcore-4.4.12.jar httpcore-4.4.13.jar -httpcore-4.4.4.jar ivy-2.4.0.jar ivy-2.5.0.jar -j2objc-annotations-1.1.jar -j2objc-annotations-1.3.jar +j2objc-annotations-2.8.jar jackson-annotations-2.12.3.jar -jackson-annotations-2.14.0-rc1.jar -jackson-annotations-2.7.0.jar -jackson-annotations-2.9.0.jar jackson-core-2.12.3.jar -jackson-core-2.14.0-rc1.jar -jackson-core-2.7.8.jar -jackson-core-2.9.9.jar jackson-core-asl-1.9.13.jar jackson-databind-2.12.3.jar -jackson-databind-2.14.0-rc1.jar -jackson-databind-2.7.8.jar -jackson-databind-2.9.9.3.jar -jackson-datatype-jdk8-2.9.9.jar -jackson-datatype-jsr310-2.9.9.jar -jackson-jaxrs-base-2.9.9.jar -jackson-jaxrs-base-2.14.0-rc1.jar -jackson-jaxrs-json-provider-2.14.0-rc1.jar -jackson-jaxrs-json-provider-2.7.8.jar -jackson-jaxrs-json-provider-2.9.9.jar +jackson-datatype-jdk8-2.12.3.jar +jackson-datatype-jsr310-2.12.3.jar +jackson-jaxrs-base-2.12.3.jar +jackson-jaxrs-json-provider-2.12.3.jar jackson-mapper-asl-1.9.13.jar -jackson-module-jaxb-annotations-2.14.0-rc1.jar jackson-module-jaxb-annotations-2.12.3.jar -jackson-module-jaxb-annotations-2.9.9.jar -jackson-module-jaxb-annotations-2.7.8.jar -jackson-module-parameter-names-2.9.9.jar +jackson-module-parameter-names-2.12.3.jar jakarta.activation-2.0.1.jar jakarta.activation-api-1.2.1.jar -jakarta.activation-api-1.2.2.jar -jakarta.activation-api-2.1.0-RC1.jar jakarta.annotation-api-2.0.0.jar jakarta.inject-api-2.0.0.jar jakarta.validation-api-3.0.0.jar jakarta.ws.rs-api-3.0.0.jar -jakarta.xml.bind-api-4.0.0-RC2.jar jakarta.xml.bind-api-2.3.2.jar +jakarta.xml.bind-api-4.0.0-RC2.jar jamon-runtime-2.4.1.jar javassist-3.24.0-GA.jar javassist-3.28.0-GA.jar @@ -219,42 +176,33 @@ jersey-hk2-3.0.3.jar jersey-media-json-jackson-3.0.3.jar jersey-server-3.0.3.jar jetty-client-9.4.33.v20201020.jar -jetty-http-9.3.19.v20170502.jar +jetty-client-9.4.40.v20210413.jar jetty-http-9.4.19.v20190610.jar jetty-http-9.4.40.v20210413.jar -jetty-io-9.3.19.v20170502.jar jetty-io-9.4.19.v20190610.jar jetty-io-9.4.40.v20210413.jar jetty-rewrite-9.3.20.v20170531.jar jetty-rewrite-9.4.19.v20190610.jar -jetty-security-9.3.19.v20170502.jar jetty-security-9.4.19.v20190610.jar jetty-security-9.4.40.v20210413.jar -jetty-server-9.3.19.v20170502.jar jetty-server-9.4.19.v20190610.jar jetty-server-9.4.40.v20210413.jar -jetty-servlet-9.3.19.v20170502.jar jetty-servlet-9.4.19.v20190610.jar jetty-servlet-9.4.40.v20210413.jar -jetty-util-9.3.19.v20170502.jar jetty-util-9.4.19.v20190610.jar jetty-util-9.4.40.v20210413.jar -jetty-util-ajax-9.3.19.v20170502.jar jetty-util-ajax-9.4.19.v20190610.jar jetty-util-ajax-9.4.40.v20210413.jar -jetty-webapp-9.3.19.v20170502.jar jetty-webapp-9.4.19.v20190610.jar jetty-webapp-9.4.40.v20210413.jar -jetty-xml-9.3.19.v20170502.jar jetty-xml-9.4.19.v20190610.jar jetty-xml-9.4.40.v20210413.jar -jline-0.9.94.jar jline-2.12.jar +jline-3.9.0.jar joda-time-2.10.3.jar joda-time-2.10.8.jar joni-2.1.11.jar jpam-1.1.jar -jsch-0.1.54.jar jsch-0.1.55.jar json-1.8.jar json-smart-2.3.jar @@ -263,9 +211,8 @@ jsp-api-2.1.jar jsqlparser-3.1.jar jsr305-3.0.0.jar jsr305-3.0.1.jar +jsr305-3.0.2.jar jul-to-slf4j-1.7.28.jar -junit-4.12.jar -junit-4.13.1.jar kerb-admin-1.0.1.jar kerb-client-1.0.1.jar kerb-common-1.0.1.jar @@ -287,21 +234,14 @@ listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j-1.2-api-2.11.2.jar log4j-1.2-api-2.17.1.jar log4j-1.2.17.jar -log4j-api-2.11.2.jar log4j-api-2.18.0.jar log4j-core-2.18.0.jar -log4j-core-2.11.2.jar log4j-jul-2.11.2.jar log4j-slf4j-impl-2.18.0.jar -log4j-slf4j-impl-2.11.2.jar lombok-1.18.8.jar lz4-java-1.4.0.jar -lz4-java-1.7.1.jar -metrics-core-4.0.6.jar metrics-core-4.2.0.jar -metrics-json-4.0.6.jar metrics-json-4.2.0.jar -metrics-jvm-4.0.6.jar metrics-jvm-4.2.0.jar micrometer-core-1.1.6.jar mssql-jdbc-6.4.0.jre8.jar @@ -315,11 +255,16 @@ mybatis-plus-extension-3.3.0.jar mybatis-spring-2.0.2.jar mybatis-spring-boot-autoconfigure-2.1.0.jar mybatis-spring-boot-starter-2.1.0.jar -netty-3.10.5.Final.jar -netty-all-4.0.52.Final.jar -netty-buffer-4.1.39.Final.jar -netty-common-4.1.39.Final.jar -nimbus-jose-jwt-4.41.1.jar +netty-3.10.6.Final.jar +netty-all-4.1.65.Final.jar +netty-buffer-4.1.65.Final.jar +netty-codec-4.1.65.Final.jar +netty-common-4.1.65.Final.jar +netty-handler-4.1.65.Final.jar +netty-resolver-4.1.65.Final.jar +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 okio-1.6.0.jar @@ -346,7 +291,6 @@ slf4j-api-1.7.28.jar slf4j-api-1.7.30.jar slf4j-log4j12-1.7.30.jar snakeyaml-1.23.jar -snappy-java-1.0.5.jar snappy-java-1.1.8.2.jar snappy-java-1.1.8.4.jar spring-aop-5.1.9.RELEASE.jar @@ -373,7 +317,6 @@ spring-tx-5.1.9.RELEASE.jar spring-web-5.1.9.RELEASE.jar spring-webmvc-5.1.9.RELEASE.jar stax-api-1.0.1.jar -stax2-api-3.1.4.jar stax2-api-4.2.1.jar threeten-extra-1.5.0.jar token-provider-1.0.1.jar @@ -381,11 +324,11 @@ tomcat-embed-core-9.0.24.jar tomcat-embed-el-9.0.24.jar tomcat-embed-websocket-9.0.24.jar validation-api-2.0.1.Final.jar +websocket-api-9.4.40.v20210413.jar +websocket-client-9.4.40.v20210413.jar +websocket-common-9.4.40.v20210413.jar woodstox-core-5.0.3.jar woodstox-core-5.3.0.jar -xz-1.0.jar xz-1.8.jar -zookeeper-3.4.10.jar -zookeeper-3.4.9.jar zookeeper-3.6.2.jar zookeeper-jute-3.6.2.jar diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index 7d520ce8b..fe7b686d1 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -29,6 +29,8 @@ true localhost 36320 + 2.1.0 + 3.3.0 @@ -66,12 +68,12 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.1.0 + ${mybatis.starter.version} com.baomidou mybatis-plus-boot-starter - 3.3.0 + ${mybatis.plus.starter.version} com.h2database @@ -90,7 +92,6 @@ org.apache.hugegraph hugegraph-common - ${project.version} @@ -144,7 +145,6 @@ commons-fileupload commons-fileupload - 1.4 diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml index 928324e76..e9f239b49 100644 --- a/hugegraph-hubble/pom.xml +++ b/hugegraph-hubble/pom.xml @@ -43,7 +43,6 @@ 2.1.8.RELEASE - 3.0.3 @@ -55,6 +54,20 @@ pom import + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + io.netty + netty-bom + ${netty.version} + pom + import + org.springframework.boot spring-boot-dependencies diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml index 078e90084..6ff5e69ce 100644 --- a/hugegraph-loader/pom.xml +++ b/hugegraph-loader/pom.xml @@ -27,31 +27,37 @@ hugegraph-loader - + jar ${project.artifactId} https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-loader - hugegraph-loader is a customizable command line utility for loading small to medium size graph datasets + hugegraph-loader is a customizable command line utility for loading small to medium size + graph datasets into the HugeGraph database from multiple data sources with various input formats. ${project.artifactId} apache-${release.name}-incubating-${project.version} - 2.12.3 - 3.3.1 ${project.basedir}/assembly ${assembly.dir}/descriptor ${assembly.dir}/static + 2.4.21 + 1.78 + 8.2.1 + 4.5.13 + 1.8 + 8.0.28 + 42.4.1 + 7.2.0.jre8 - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} + com.fasterxml.jackson.module + jackson-module-jaxb-annotations @@ -165,32 +171,29 @@ commons-io commons-io - 2.7 org.apache.commons commons-lang3 - 3.9 org.codehaus.groovy groovy-all - 2.4.21 + ${groovy.all.version} com.beust jcommander - 1.78 + ${jcommander.version} org.simpleflatmapper sfm-csv - 8.2.1 + ${sfm.csv.version} com.google.guava guava - 30.0-jre @@ -369,38 +372,37 @@ org.apache.commons commons-compress - 1.21 org.apache.httpcomponents httpclient - 4.5.13 + ${apache.httpclient.version} org.tukaani xz - 1.8 + ${xz.version} mysql mysql-connector-java - 8.0.28 + ${mysql.connector.version} test org.postgresql postgresql - 42.4.1 + ${postgres.version} com.microsoft.sqlserver mssql-jdbc - 7.2.0.jre8 + ${mssql.jdbc.version} org.apache.hive hive-exec - 3.1.3 + ${hive.version} log4j diff --git a/hugegraph-tools/pom.xml b/hugegraph-tools/pom.xml index de3dbe277..8939e141c 100644 --- a/hugegraph-tools/pom.xml +++ b/hugegraph-tools/pom.xml @@ -38,25 +38,9 @@ ${project.basedir}/assembly ${assembly.dir}/descriptor bash - 4.12 yyyy-MM-dd HH:mm:ssZ - 1.0.0 - 1.72 - 3.1.1 - 25.1-jre - - - - junit - junit - ${junit.version} - test - - - - junit @@ -66,7 +50,7 @@ org.apache.hugegraph hugegraph-client - ${hugegraph-client-version} + ${revision} com.fasterxml.jackson.core @@ -93,17 +77,15 @@ com.beust jcommander - ${jcommand-version} commons-io commons-io - 2.7 org.apache.hadoop hadoop-common - ${hadoop-version} + ${hadoop.version} javax.ws.rs @@ -138,7 +120,7 @@ org.apache.hadoop hadoop-hdfs - ${hadoop-version} + ${hadoop.version} com.sun.jersey @@ -161,7 +143,7 @@ org.apache.hadoop hadoop-client - ${hadoop-version} + ${hadoop.version} com.sun.jersey @@ -184,7 +166,6 @@ com.google.guava guava - ${guava.version} diff --git a/pom.xml b/pom.xml index b435a6758..192733125 100644 --- a/pom.xml +++ b/pom.xml @@ -28,8 +28,7 @@ ${project.artifactId} https://github.com/apache/incubator-hugegraph-toolchain - hugegraph-toolchain is the integration project of a series of utilities for HugeGraph, it - includes 4 main modules (loader/hubble/tools/client) + hugegraph-toolchain is the integration project of a series of utilities for HugeGraph, it includes 4 main modules (loader/hubble/tools/client) @@ -47,43 +46,45 @@ - - Apache Hugegraph(Incubating) - dev-subscribe@hugegraph.apache.org - https://hugegraph.apache.org/ - + + Apache Hugegraph(Incubating) + dev-subscribe@hugegraph.apache.org + https://hugegraph.apache.org/ + - - Developer List - dev-subscribe@hugegraph.apache.org - dev-unsubscribe@hugegraph.apache.org - dev@hugegraph.incubator.apache.org - - - Commits List - commits-subscribe@hugegraph.apache.org - commits-unsubscribe@hugegraph.apache.org - commits@hugegraph.apache.org - - - Issues List - issues-subscribe@hugegraph.apache.org - issues-unsubscribe@hugegraph.apache.org - issues@hugegraph.apache.org - + + Developer List + dev-subscribe@hugegraph.apache.org + dev-unsubscribe@hugegraph.apache.org + dev@hugegraph.incubator.apache.org + + + Commits List + commits-subscribe@hugegraph.apache.org + commits-unsubscribe@hugegraph.apache.org + commits@hugegraph.apache.org + + + Issues List + issues-subscribe@hugegraph.apache.org + issues-unsubscribe@hugegraph.apache.org + issues@hugegraph.apache.org + https://github.com/apache/hugegraph-toolchain scm:git:https://github.com/apache/hugegraph-toolchain.git - scm:git:https://github.com/apache/hugegraph-toolchain.git + + scm:git:https://github.com/apache/hugegraph-toolchain.git + - Github Issues - https://github.com/apache/hugegraph-toolchain/issues + Github Issues + https://github.com/apache/hugegraph-toolchain/issues @@ -118,32 +119,202 @@ hugegraph ${project.name} ${project.version} + 1.0.0 + 3.1.3 2.2.3 + 3.3.1 + 3.6.2 + 3.0.3 + 4.12 + 2.8.47 + 1.18.8 + 2.8.0 + 3.9 + 1.21 + 1.5 + 1.15 + 1.3.1 + 1.10.0 + 3.9.0 + 3.4.1 + 1.1.3 + 32.0.1-jre + 1.4.0 + 1.72 + 2.12.3 + 2.18.0 + 4.2.0 + 4.1.65.Final + 2.8.9 - - - - - - - - - - - - - - - - - - - - - - - + + + + + org.glassfish.jersey + jersey-bom + ${jersey.version} + pom + import + + + org.apache.hugegraph + hugegraph-common + ${hugegraph.common.version} + + + + junit + junit + ${junit.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.projectlombok + lombok + ${lombok.version} + true + + + commons-io + commons-io + ${commons.io.version} + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + commons-codec + commons-codec + ${commons.codec.version} + + + commons-cli + commons-cli + ${commons.cli.version} + + + org.apache.commons + commons-text + ${commons.text.version} + + + commons-net + commons-net + ${commons.net.version} + + + org.apache.commons + commons-math3 + ${commons.math3.version} + + + commons-logging + commons-logging + ${commons.logging.version} + + + logkit + logkit + + + avalon-framework + avalon-framework + + + + + com.google.guava + guava + ${guava.version} + + + commons-fileupload + commons-fileupload + ${commons.fileupload.version} + + + org.lz4 + lz4-java + ${lz4.version} + + + com.beust + jcommander + ${jcommand-version} + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j2.version} + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + metrics-core + io.dropwizard.metrics + ${dropwizard.metics.version} + + + metrics-json + io.dropwizard.metrics + ${dropwizard.metics.version} + + + metrics-jvm + io.dropwizard.metrics + ${dropwizard.metics.version} + + + io.netty + netty-bom + ${netty.version} + pom + import + + + com.google.code.gson + gson + ${gson.version} + + + + +