diff --git a/java/bench/core/pom.xml b/java/bench/core/pom.xml index 9fad2ef2ab2..7214a471573 100644 --- a/java/bench/core/pom.xml +++ b/java/bench/core/pom.xml @@ -55,18 +55,6 @@ org.apache.commons commons-csv - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-hdfs - - - org.apache.hadoop - hadoop-mapreduce-client-core - org.apache.hive hive-storage-api diff --git a/java/bench/hive/pom.xml b/java/bench/hive/pom.xml index 2db4c94580c..461eda61b6e 100644 --- a/java/bench/hive/pom.xml +++ b/java/bench/hive/pom.xml @@ -47,26 +47,26 @@ org.apache.avro avro-mapred - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - org.apache.hadoop - hadoop-hdfs - org.apache.hive hive-exec core + + + org.apache.hadoop + hadoop-yarn-registry + + org.apache.hive hive-serde + + + org.apache.hadoop + hadoop-common + + org.apache.hive diff --git a/java/bench/pom.xml b/java/bench/pom.xml index 6f4eca8ebb9..538a820ae88 100644 --- a/java/bench/pom.xml +++ b/java/bench/pom.xml @@ -34,7 +34,6 @@ 1.11.1 - 3.3.5 3.1.3 1.20 5.9.3 @@ -109,74 +108,6 @@ commons-csv 1.10.0 - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-core - - - commons-beanutils - commons-beanutils - - - commons-beanutils - commons-beanutils-core - - - javax.servlet - servlet-api - - - jdk.tools - jdk.tools - - - org.mortbay.jetty - servlet-api - - - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - runtime - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - javax.servlet - servlet-api - - - org.fusesource.leveldbjni - leveldbjni-all - - - org.mortbay.jetty - servlet-api - - - org.apache.hadoop hadoop-yarn-common diff --git a/java/bench/spark/pom.xml b/java/bench/spark/pom.xml index 7e8f6f4ccd1..b4e863818e2 100644 --- a/java/bench/spark/pom.xml +++ b/java/bench/spark/pom.xml @@ -52,18 +52,6 @@ org.apache.commons commons-lang3 - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-hdfs - - - org.apache.hadoop - hadoop-yarn-common - org.apache.hive hive-storage-api diff --git a/java/core/pom.xml b/java/core/pom.xml index 3a84c05ad28..c7de86e8027 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -53,11 +53,12 @@ org.apache.hadoop - hadoop-common + hadoop-client-api org.apache.hadoop - hadoop-hdfs + hadoop-client-runtime + runtime org.apache.hive @@ -156,16 +157,11 @@ org.apache.maven.plugins maven-dependency-plugin - - org.apache.hadoop:hadoop-hdfs - com.google.auto.service:auto-service-annotations org.apache.hive:hive-storage-api - org.apache.hadoop:hadoop-client-api - org.apache.hadoop:hadoop-client-runtime com.google.auto.service:auto-service @@ -182,25 +178,5 @@ ${build.dir}/core - - java17 - - [17,) - - - - org.apache.hadoop - hadoop-client-api - ${hadoop.version} - test - - - org.apache.hadoop - hadoop-client-runtime - ${hadoop.version} - test - - - diff --git a/java/examples/pom.xml b/java/examples/pom.xml index 60c714030f5..3d11dc03617 100644 --- a/java/examples/pom.xml +++ b/java/examples/pom.xml @@ -51,12 +51,7 @@ org.apache.hadoop - hadoop-common - compile - - - org.apache.hadoop - hadoop-hdfs + hadoop-client-api compile @@ -111,16 +106,6 @@ org.apache.maven.plugins maven-dependency-plugin - - - com.google.guava:guava - org.apache.hadoop:hadoop-hdfs - org.apache.hadoop:hadoop-common - - - org.apache.hadoop:hadoop-client-api - - ${basedir}/src/java diff --git a/java/mapreduce/pom.xml b/java/mapreduce/pom.xml index b2fd37a2d06..330566ee108 100644 --- a/java/mapreduce/pom.xml +++ b/java/mapreduce/pom.xml @@ -49,11 +49,11 @@ org.apache.hadoop - hadoop-common + hadoop-client-api org.apache.hadoop - hadoop-mapreduce-client-core + hadoop-client-runtime org.apache.hive @@ -66,17 +66,6 @@ slf4j-api test - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - test - - - org.apache.hadoop - hadoop-hdfs - ${min.hadoop.version} - test - org.junit.jupiter junit-jupiter-api @@ -119,16 +108,6 @@ org.apache.maven.plugins maven-dependency-plugin - - - org.apache.hadoop:hadoop-hdfs - org.apache.hadoop:hadoop-mapreduce-client-jobclient - - - org.apache.hadoop:hadoop-client-api - org.apache.hadoop:hadoop-client-runtime - - ${basedir}/src/java @@ -142,25 +121,5 @@ ${build.dir}/mapreduce - - java17 - - [17,) - - - - org.apache.hadoop - hadoop-client-api - ${hadoop.version} - test - - - org.apache.hadoop - hadoop-client-runtime - ${hadoop.version} - test - - - diff --git a/java/pom.xml b/java/pom.xml index f2804d156fc..42c83bd5373 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -62,7 +62,7 @@ 10.11.0 ${project.basedir}/../../examples - 2.7.3 + 3.3.5 5.9.3 3.6.0 3.4.1 @@ -71,7 +71,6 @@ false 3.8.8 - 2.7.3 4.11.0 2023-05-15T16:29:49Z @@ -79,7 +78,6 @@ 2.8.1 3.0.0-M5 ${project.build.directory}/testing-tmp - 3.3.5 3.8.1 @@ -160,195 +158,14 @@ org.apache.hadoop - hadoop-common - ${min.hadoop.version} - provided - - - com.google.code.findbugs - jsr305 - - - com.sun.jersey - jersey-json - - - commons-beanutils - commons-beanutils-core - - - commons-daemon - commons-daemon - - - commons-digester - commons-digester - - - commons-el - commons-el - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - jdk.tools - jdk.tools - - - net.java.dev.jets3t - jets3t - - - org.tukaani - xz - - - org.apache.curator - curator-recipes - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - org.apache.avro - avro - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - + hadoop-client-api + ${hadoop.version} org.apache.hadoop - hadoop-hdfs - ${min.hadoop.version} - provided - - - com.google.code.findbugs - jsr305 - - - com.sun.jersey - jersey-server - - - commons-daemon - commons-daemon - - - io.netty - netty - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - org.apache.avro - avro - - - org.fusesource.leveldbjni - leveldbjni-all - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - tomcat - jasper-runtime - - - xerces - xercesImpl - - - log4j - log4j - - - - - org.apache.hadoop - hadoop-mapreduce-client-core - ${min.hadoop.version} - provided - - - com.google.code.findbugs - jsr305 - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - org.apache.avro - avro - - - org.slf4j - slf4j-log4j12 - - - - - org.apache.hadoop - hadoop-mapreduce-client-jobclient - ${min.hadoop.version} - test - - - org.slf4j - slf4j-log4j12 - - + hadoop-client-runtime + ${hadoop.version} + runtime org.apache.hive @@ -816,6 +633,15 @@ ${maven.version} + + + org.apache.hadoop:hadoop-common + org.apache.hadoop:hadoop-hdfs-client + org.apache.hadoop:hadoop-mapreduce-client-core + org.apache.hadoop:hadoop-mapreduce-client-jobclient + + true + @@ -978,16 +804,6 @@ bench - - java17 - - [17,) - - - 3.3.5 - 3.3.5 - - java8 diff --git a/java/shims/pom.xml b/java/shims/pom.xml index 407289ea7c2..89d1c664664 100644 --- a/java/shims/pom.xml +++ b/java/shims/pom.xml @@ -34,13 +34,7 @@ org.apache.hadoop - hadoop-common - ${hadoop.version} - provided - - - org.apache.hadoop - hadoop-hdfs + hadoop-client-api ${hadoop.version} provided @@ -82,11 +76,6 @@ org.apache.maven.plugins maven-dependency-plugin - - - org.apache.hadoop:hadoop-hdfs - - ${basedir}/src/java @@ -100,18 +89,5 @@ ${build.dir}/shims - - java17 - - [17,) - - - - org.apache.hadoop - hadoop-client-api - ${hadoop.version} - - - diff --git a/java/tools/pom.xml b/java/tools/pom.xml index f761088c6da..aa68b9b9f4a 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -63,18 +63,6 @@ org.apache.commons commons-lang3 - - org.apache.hadoop - hadoop-common - ${tools.hadoop.version} - compile - - - org.apache.hadoop - hadoop-hdfs-client - ${tools.hadoop.version} - compile - org.apache.hive hive-storage-api @@ -208,25 +196,5 @@ ${build.dir}/tools - - java17 - - [17,) - - - - org.apache.hadoop - hadoop-client-api - ${hadoop.version} - test - - - org.apache.hadoop - hadoop-client-runtime - ${hadoop.version} - test - - -