From 4f9e18c5cffbab5e00b85daadf7ff76a4e1d78b9 Mon Sep 17 00:00:00 2001 From: Rico Chiu Date: Wed, 18 Jan 2023 14:25:03 -0800 Subject: [PATCH] Add client-hadoop3 module the new client/hdfs3 and shaded/client-hadoop3 modules are currently a copy of the existing client/hdfs and shaded/client modules the addition of this will allow for changes that are available only in hadoop3, such as https://github.com/Alluxio/alluxio/pull/16017#discussion_r1039377694 both client jars will be built by default, but the symlink at client/alluxio-VERSION-client.jar will point to the hadoop-2 one to maintain backcompat. if the hadoop-3 profile is activated by adding `-Phadoop-3`, then the symlink will be overridden to point to the new hadoop3 shaded client jar pr-link: Alluxio/alluxio#16699 change-id: cid-a6ffd09414e8259078fd5a8f68c3e287d85feec5 --- core/client/hdfs3/pom.xml | 57 +++++ core/client/pom.xml | 1 + shaded/client-hadoop3/pom.xml | 377 ++++++++++++++++++++++++++++++++++ shaded/pom.xml | 1 + 4 files changed, 436 insertions(+) create mode 100644 core/client/hdfs3/pom.xml create mode 100644 shaded/client-hadoop3/pom.xml diff --git a/core/client/hdfs3/pom.xml b/core/client/hdfs3/pom.xml new file mode 100644 index 000000000000..3bc1b3b8cb14 --- /dev/null +++ b/core/client/hdfs3/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + org.alluxio + alluxio-core-client + 2.10.0-SNAPSHOT + + alluxio-core-client-hdfs3 + jar + Alluxio Core - Client - HDFS3 + HDFS Client of Alluxio Core For HDFS 3 + + + + + ${project.parent.parent.parent.basedir}/build + false + + + + + + org.alluxio + alluxio-core-client-hdfs + ${project.version} + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + + diff --git a/core/client/pom.xml b/core/client/pom.xml index 338db707b66b..46895c9ea6cf 100644 --- a/core/client/pom.xml +++ b/core/client/pom.xml @@ -25,6 +25,7 @@ fs hdfs + hdfs3 diff --git a/shaded/client-hadoop3/pom.xml b/shaded/client-hadoop3/pom.xml new file mode 100644 index 000000000000..88aaa5390c7e --- /dev/null +++ b/shaded/client-hadoop3/pom.xml @@ -0,0 +1,377 @@ + + + 4.0.0 + + alluxio-shaded + org.alluxio + 2.10.0-SNAPSHOT + + alluxio-shaded-hadoop3-client + jar + Alluxio Shaded Libraries - Hadoop3 Client + Shaded Alluxio Client Module for hadoop 3 + + + + + ${project.parent.parent.basedir}/build + false + + alluxio.shaded.client + + + + + + + org.apache.hadoop + hadoop-client + provided + + + org.rocksdb + rocksdbjni + runtime + + + + org.slf4j + slf4j-api + runtime + + + commons-logging + commons-logging + runtime + + + + org.apache.logging.log4j + log4j-slf4j-impl + runtime + true + + + org.apache.logging.log4j + log4j-api + runtime + true + + + org.apache.logging.log4j + log4j-core + runtime + true + + + + + + org.alluxio + alluxio-core-client-hdfs3 + ${project.version} + + + org.alluxio + alluxio-core-client-fs + ${project.version} + + + org.alluxio + alluxio-table-client + ${project.version} + + + + + + includeHadoopClient + + + org.apache.hadoop + hadoop-client + compile + + + com.fasterxml.jackson.core + jackson-core + + + + + + + + + hadoop-3 + + + + org.codehaus.mojo + exec-maven-plugin + + + symlink-jar + install + + exec + + + ln + + -fnsv + build/alluxio-${project.version}-hadoop3-client.jar + ${project.parent.parent.basedir}/client/alluxio-${project.version}-client.jar + + + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + true + + + + empty-javadoc-jar + package + + jar + + + javadoc + ${basedir}/javadoc + + + + sources-jar + package + + jar + + + sources + + + + + + org.apache.maven.plugins + maven-source-plugin + + true + + + + attach-sources + + jar-no-fork + + + + + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + uber-jar + package + + shade + + + true + true + ${create.dependency.reduced.pom} + + + + org.slf4j:* + + commons-logging:commons-logging + + log4j:log4j + org.apache.logging.log4j:log4j-api + org.apache.logging.log4j:log4j-core + org.apache.logging.log4j:log4j-slf4j-impl + org.alluxio:alluxio-microbench + org.openjdk.jmh:* + + + + + + org.apache.zookeeper:zookeeper-jute + + **/*.java + + + + *:* + + LICENSE + META-INF/LICENSE + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + *:* + + mozilla/public-suffix-list.txt + + + + + + + META-INF/native/libnetty_transport_native_epoll_x86_64.so + META-INF/native/liballuxio_shaded_client_netty_transport_native_epoll_x86_64.so + + true + + + META-INF/native/libnetty_transport_native_epoll_aarch_64.so + META-INF/native/liballuxio_shaded_client_netty_transport_native_epoll_aarch_64.so + + true + + + com/ + ${shading.prefix}.com. + + **/pom.xml + + com/ibm/security/* + com/ibm/security/**/* + com/sun/tools/* + com/sun/javadoc/* + com/sun/security/* + com/sun/jndi/* + com/sun/management/* + com/sun/tools/**/* + com/sun/javadoc/**/* + com/sun/security/**/* + com/sun/jndi/**/* + com/sun/management/**/* + + + + io/ + ${shading.prefix}.io. + + **/pom.xml + + + + javassist + ${shading.prefix}.javassist + + + javax/annotation/ + ${shading.prefix}.javax.annotation. + + **/pom.xml + + + + org/ + ${shading.prefix}.org. + + org/apache/hadoop/* + org/apache/hadoop/**/* + **/pom.xml + + org/slf4j/* + org/slf4j/**/* + org/apache/commons/logging/* + org/apache/commons/logging/**/* + org/apache/log4j/* + org/apache/log4j/**/* + + org/ietf/jgss/* + org/omg/**/* + org/w3c/dom/* + org/w3c/dom/**/* + org/xml/sax/* + org/xml/sax/**/* + + org/rocksdb/**/* + + + + + + + + + NOTICE.txt + NOTICE + LICENSE + Log4j-charsets.properties + Log4j-config.xsd + Log4j-events.dtd + Log4j-events.xsd + Log4j-levels.xsd + + + + META-INF/LICENSE + ${basedir}/../../LICENSE + + + META-INF/NOTICE + ${basedir}/../../NOTICE + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + + + copy-and-rename-file + install + + copy + + + ${basedir}/target/${project.artifactId}-${project.version}.jar + ${project.parent.parent.basedir}/client/build/alluxio-${project.version}-hadoop3-client.jar + + + + + + + + diff --git a/shaded/pom.xml b/shaded/pom.xml index b781a24457b7..12c95c5ae5d3 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -24,6 +24,7 @@ client + client-hadoop3 hadoop