Skip to content

[WIP][AMORO-3866] Using shaded hadoop-client-api and hadoop-client-runtime for hadoop3 #3865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
turboFei wants to merge 1 commit into from
Closed

[WIP][AMORO-3866] Using shaded hadoop-client-api and hadoop-client-runtime for hadoop3 #3865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions amoro-ams/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,17 @@
<artifactId>s3-transfer-manager</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>${hadoop-client-api.artifact}</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>${hadoop-client-runtime.artifact}</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
Expand Down Expand Up @@ -451,6 +462,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
Expand Down
19 changes: 17 additions & 2 deletions amoro-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@
<artifactId>amoro-shade-zookeeper-3</artifactId>
</dependency>

<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>

<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
Expand All @@ -85,12 +100,12 @@

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<artifactId>${hadoop-client-api.artifact}</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<artifactId>${hadoop-client-runtime.artifact}</artifactId>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions amoro-format-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<artifactId>${hadoop-client-api.artifact}</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<artifactId>${hadoop-client-runtime.artifact}</artifactId>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions dev/deps/dependencies-hadoop-2-spark-3.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ chill-java/0.10.0//chill-java-0.10.0.jar
chill_2.12/0.10.0//chill_2.12-0.10.0.jar
commons-beanutils/1.11.0//commons-beanutils-1.11.0.jar
commons-cli/1.2//commons-cli-1.2.jar
commons-codec/1.15//commons-codec-1.15.jar
commons-codec/1.17.2//commons-codec-1.17.2.jar
commons-collections/3.2.2//commons-collections-3.2.2.jar
commons-collections4/4.4//commons-collections4-4.4.jar
commons-compiler/3.0.16//commons-compiler-3.0.16.jar
commons-compress/1.22//commons-compress-1.22.jar
commons-compress/1.21//commons-compress-1.21.jar
commons-configuration/1.6//commons-configuration-1.6.jar
commons-crypto/1.1.0//commons-crypto-1.1.0.jar
commons-dbcp/1.4//commons-dbcp-1.4.jar
Expand All @@ -62,7 +62,7 @@ commons-lang/2.6//commons-lang-2.6.jar
commons-lang3/3.14.0//commons-lang3-3.14.0.jar
commons-logging/1.2//commons-logging-1.2.jar
commons-math3/3.6.1//commons-math3-3.6.1.jar
commons-net/3.1//commons-net-3.1.jar
commons-net/3.12.0//commons-net-3.12.0.jar
commons-pool/1.5.4//commons-pool-1.5.4.jar
commons-pool2/2.12.0//commons-pool2-2.12.0.jar
commons-text/1.10.0//commons-text-1.10.0.jar
Expand Down
41 changes: 5 additions & 36 deletions dev/deps/dependencies-hadoop-3-spark-3.5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ RoaringBitmap/1.0.1//RoaringBitmap-1.0.1.jar
ST4/4.3.1//ST4-4.3.1.jar
activation/1.1.1//activation-1.1.1.jar
aircompressor/0.27//aircompressor-0.27.jar
animal-sniffer-annotations/1.17//animal-sniffer-annotations-1.17.jar
annotations/17.0.0//annotations-17.0.0.jar
annotations/2.24.12//annotations-2.24.12.jar
ant-launcher/1.9.1//ant-launcher-1.9.1.jar
Expand All @@ -30,7 +29,6 @@ aws-core/2.24.12//aws-core-2.24.12.jar
aws-json-protocol/2.24.12//aws-json-protocol-2.24.12.jar
aws-query-protocol/2.24.12//aws-query-protocol-2.24.12.jar
aws-xml-protocol/2.24.12//aws-xml-protocol-2.24.12.jar
bcprov-jdk15on/1.70//bcprov-jdk15on-1.70.jar
bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar
byte-buddy-agent/1.12.19//byte-buddy-agent-1.12.19.jar
byte-buddy/1.12.19//byte-buddy-1.12.19.jar
Expand All @@ -42,12 +40,11 @@ chill-java/0.10.0//chill-java-0.10.0.jar
chill_2.12/0.10.0//chill_2.12-0.10.0.jar
commons-beanutils/1.11.0//commons-beanutils-1.11.0.jar
commons-cli/1.2//commons-cli-1.2.jar
commons-codec/1.16.1//commons-codec-1.16.1.jar
commons-codec/1.17.2//commons-codec-1.17.2.jar
commons-collections/3.2.2//commons-collections-3.2.2.jar
commons-collections4/4.4//commons-collections4-4.4.jar
commons-compiler/3.1.9//commons-compiler-3.1.9.jar
commons-compress/1.23.0//commons-compress-1.23.0.jar
commons-configuration2/2.8.0//commons-configuration2-2.8.0.jar
commons-crypto/1.1.0//commons-crypto-1.1.0.jar
commons-dbcp/1.4//commons-dbcp-1.4.jar
commons-dbcp2/2.9.0//commons-dbcp2-2.9.0.jar
Expand All @@ -56,7 +53,7 @@ commons-lang/2.6//commons-lang-2.6.jar
commons-lang3/3.14.0//commons-lang3-3.14.0.jar
commons-logging/1.2//commons-logging-1.2.jar
commons-math3/3.6.1//commons-math3-3.6.1.jar
commons-net/3.9.0//commons-net-3.9.0.jar
commons-net/3.12.0//commons-net-3.12.0.jar
commons-pool/1.5.4//commons-pool-1.5.4.jar
commons-pool2/2.12.0//commons-pool2-2.12.0.jar
commons-text/1.10.0//commons-text-1.10.0.jar
Expand All @@ -68,15 +65,13 @@ datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar
datasketches-java/3.3.0//datasketches-java-3.3.0.jar
datasketches-memory/2.1.0//datasketches-memory-2.1.0.jar
derby/10.14.2.0//derby-10.14.2.0.jar
dnsjava/3.4.0//dnsjava-3.4.0.jar
dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
dynamodb/2.24.12//dynamodb-2.24.12.jar
eclipse-collections-api/11.1.0//eclipse-collections-api-11.1.0.jar
eclipse-collections/11.1.0//eclipse-collections-11.1.0.jar
endpoints-spi/2.24.12//endpoints-spi-2.24.12.jar
error_prone_annotations/2.10.0//error_prone_annotations-2.10.0.jar
eventstream/1.0.1//eventstream-1.0.1.jar
failureaccess/1.0//failureaccess-1.0.jar
flatbuffers-java/23.5.26//flatbuffers-java-23.5.26.jar
flatbuffers/1.2.0-3f79e055//flatbuffers-1.2.0-3f79e055.jar
flink-annotations/1.20.3//flink-annotations-1.20.3.jar
Expand All @@ -102,21 +97,9 @@ flink-shaded-netty/4.1.91.Final-17.0//flink-shaded-netty-4.1.91.Final-17.0.jar
flink-streaming-java/1.20.3//flink-streaming-java-1.20.3.jar
glue/2.24.12//glue-2.24.12.jar
gson/2.10.1//gson-2.10.1.jar
guava/27.0-jre//guava-27.0-jre.jar
hadoop-annotations/3.4.0//hadoop-annotations-3.4.0.jar
hadoop-auth/3.4.0//hadoop-auth-3.4.0.jar
hadoop-aws/3.4.0//hadoop-aws-3.4.0.jar
hadoop-client/3.4.0//hadoop-client-3.4.0.jar
hadoop-common/3.4.0//hadoop-common-3.4.0.jar
hadoop-hdfs-client/3.4.0//hadoop-hdfs-client-3.4.0.jar
hadoop-mapreduce-client-common/3.4.0//hadoop-mapreduce-client-common-3.4.0.jar
hadoop-mapreduce-client-core/3.4.0//hadoop-mapreduce-client-core-3.4.0.jar
hadoop-mapreduce-client-jobclient/3.4.0//hadoop-mapreduce-client-jobclient-3.4.0.jar
hadoop-shaded-guava/1.2.0//hadoop-shaded-guava-1.2.0.jar
hadoop-shaded-protobuf_3_21/1.2.0//hadoop-shaded-protobuf_3_21-1.2.0.jar
hadoop-yarn-api/3.4.0//hadoop-yarn-api-3.4.0.jar
hadoop-yarn-client/3.4.0//hadoop-yarn-client-3.4.0.jar
hadoop-yarn-common/3.4.0//hadoop-yarn-common-3.4.0.jar
hadoop-client-api/3.4.0//hadoop-client-api-3.4.0.jar
hadoop-client-runtime/3.4.0//hadoop-client-runtime-3.4.0.jar
hamcrest-core/1.3//hamcrest-core-1.3.jar
hive-classification/3.1.3//hive-classification-3.1.3.jar
hive-common/3.1.3//hive-common-3.1.3.jar
Expand Down Expand Up @@ -160,23 +143,17 @@ iceberg-spark-extensions-3.5_2.12/1.6.1//iceberg-spark-extensions-3.5_2.12-1.6.1
icu4j/69.1//icu4j-69.1.jar
identity-spi/2.24.12//identity-spi-2.24.12.jar
ivy/2.5.1//ivy-2.5.1.jar
j2objc-annotations/1.1//j2objc-annotations-1.1.jar
jackson-annotations/2.16.0//jackson-annotations-2.16.0.jar
jackson-core/2.14.2//jackson-core-2.14.2.jar
jackson-databind/2.14.2//jackson-databind-2.14.2.jar
jackson-dataformat-yaml/2.17.1//jackson-dataformat-yaml-2.17.1.jar
jackson-datatype-jsr310/2.17.1//jackson-datatype-jsr310-2.17.1.jar
jackson-jaxrs-base/2.12.7//jackson-jaxrs-base-2.12.7.jar
jackson-jaxrs-json-provider/2.12.7//jackson-jaxrs-json-provider-2.12.7.jar
jackson-module-jaxb-annotations/2.12.7//jackson-module-jaxb-annotations-2.12.7.jar
jackson-module-scala_2.12/2.15.2//jackson-module-scala_2.12-2.15.2.jar
jakarta.activation-api/1.2.1//jakarta.activation-api-1.2.1.jar
jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar
jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar
jakarta.servlet-api/4.0.3//jakarta.servlet-api-4.0.3.jar
jakarta.validation-api/2.0.2//jakarta.validation-api-2.0.2.jar
jakarta.ws.rs-api/2.1.6//jakarta.ws.rs-api-2.1.6.jar
jakarta.xml.bind-api/2.3.2//jakarta.xml.bind-api-2.3.2.jar
janino/3.1.9//janino-3.1.9.jar
javalin/4.6.8//javalin-4.6.8.jar
javassist/3.29.2-GA//javassist-3.29.2-GA.jar
Expand All @@ -185,7 +162,6 @@ javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
javax.json/1.0.4//javax.json-1.0.4.jar
javax.servlet-api/3.1.0//javax.servlet-api-3.1.0.jar
javolution/5.5.1//javolution-5.5.1.jar
jaxb-api/2.2.11//jaxb-api-2.2.11.jar
jboss-logging/3.3.1.Final//jboss-logging-3.3.1.Final.jar
jboss-threads/2.3.6.Final//jboss-threads-2.3.6.Final.jar
jcip-annotations/1.0-1//jcip-annotations-1.0-1.jar
Expand Down Expand Up @@ -215,7 +191,6 @@ json4s-ast_2.12/3.7.0-M11//json4s-ast_2.12-3.7.0-M11.jar
json4s-core_2.12/3.7.0-M11//json4s-core_2.12-3.7.0-M11.jar
json4s-jackson_2.12/3.7.0-M11//json4s-jackson_2.12-3.7.0-M11.jar
json4s-scalap_2.12/3.7.0-M11//json4s-scalap_2.12-3.7.0-M11.jar
jsp-api/2.1//jsp-api-2.1.jar
jsqlparser/4.7//jsqlparser-4.7.jar
jsr305/3.0.0//jsr305-3.0.0.jar
jta/1.1//jta-1.1.jar
Expand Down Expand Up @@ -278,7 +253,6 @@ kyuubi-hive-jdbc-shaded/1.10.2//kyuubi-hive-jdbc-shaded-1.10.2.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
libthrift/0.9.3//libthrift-0.9.3.jar
listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-1.2-api/2.20.0//log4j-1.2-api-2.20.0.jar
log4j-api/2.20.0//log4j-api-2.20.0.jar
log4j-core/2.20.0//log4j-core-2.20.0.jar
Expand Down Expand Up @@ -323,7 +297,6 @@ netty-resolver-dns/4.1.128.Final//netty-resolver-dns-4.1.128.Final.jar
netty-resolver/4.1.128.Final//netty-resolver-4.1.128.Final.jar
netty-transport-classes-epoll/4.1.128.Final//netty-transport-classes-epoll-4.1.128.Final.jar
netty-transport-classes-kqueue/4.1.128.Final//netty-transport-classes-kqueue-4.1.128.Final.jar
netty-transport-native-epoll/4.1.100.Final//netty-transport-native-epoll-4.1.100.Final.jar
netty-transport-native-epoll/4.1.128.Final/linux-riscv64/netty-transport-native-epoll-4.1.128.Final-linux-riscv64.jar
netty-transport-native-epoll/4.1.96.Final/linux-aarch_64/netty-transport-native-epoll-4.1.96.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.96.Final/linux-x86_64/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar
Expand All @@ -334,7 +307,7 @@ netty-transport-rxtx/4.1.128.Final//netty-transport-rxtx-4.1.128.Final.jar
netty-transport-sctp/4.1.128.Final//netty-transport-sctp-4.1.128.Final.jar
netty-transport-udt/4.1.128.Final//netty-transport-udt-4.1.128.Final.jar
netty-transport/4.1.128.Final//netty-transport-4.1.128.Final.jar
nimbus-jose-jwt/9.31//nimbus-jose-jwt-9.31.jar
nimbus-jose-jwt/9.30.1//nimbus-jose-jwt-9.30.1.jar
objenesis/3.3//objenesis-3.3.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
Expand All @@ -360,11 +333,9 @@ profiles/2.24.12//profiles-2.24.12.jar
protobuf-java/2.5.0//protobuf-java-2.5.0.jar
protocol-core/2.24.12//protocol-core-2.24.12.jar
py4j/0.10.9.7//py4j-0.10.9.7.jar
re2j/1.1//re2j-1.1.jar
reactive-streams/1.0.4//reactive-streams-1.0.4.jar
reflectasm/1.11.3//reflectasm-1.11.3.jar
regions/2.24.12//regions-2.24.12.jar
reload4j/1.2.22//reload4j-1.2.22.jar
rocksdbjni/7.10.2//rocksdbjni-7.10.2.jar
s3-transfer-manager/2.24.12//s3-transfer-manager-2.24.12.jar
s3/2.24.12//s3-2.24.12.jar
Expand Down Expand Up @@ -398,7 +369,6 @@ spark-sql_2.12/3.5.7//spark-sql_2.12-3.5.7.jar
spark-tags_2.12/3.5.7//spark-tags_2.12-3.5.7.jar
spark-unsafe_2.12/3.5.7//spark-unsafe_2.12-3.5.7.jar
sqlline/1.3.0//sqlline-1.3.0.jar
stax2-api/4.2.1//stax2-api-4.2.1.jar
stream/2.9.6//stream-2.9.6.jar
sts/2.24.12//sts-2.24.12.jar
swagger-ui/5.17.14//swagger-ui-5.17.14.jar
Expand All @@ -418,7 +388,6 @@ websocket-servlet/9.4.51.v20230217//websocket-servlet-9.4.51.v20230217.jar
wildfly-client-config/1.0.1.Final//wildfly-client-config-1.0.1.Final.jar
wildfly-common/1.5.4.Final//wildfly-common-1.5.4.Final.jar
wildfly-openssl/1.1.3.Final//wildfly-openssl-1.1.3.Final.jar
woodstox-core/5.4.0//woodstox-core-5.4.0.jar
xbean-asm9-shaded/4.23//xbean-asm9-shaded-4.23.jar
xnio-api/3.8.8.Final//xnio-api-3.8.8.Final.jar
xz/1.9//xz-1.9.jar
Expand Down
48 changes: 45 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
<paimon.version>1.2.0</paimon.version>
<hive.version>3.1.3</hive.version>
<hadoop.version>3.4.0</hadoop.version>
<hadoop-client-api.artifact>hadoop-client-api</hadoop-client-api.artifact>
<hadoop-client-runtime.artifact>hadoop-client-runtime</hadoop-client-runtime.artifact>
<kerby.version>2.0.3</kerby.version>
<scala.version>2.12.15</scala.version>
<scala.binary.version>2.12</scala.binary.version>
Expand All @@ -114,9 +116,11 @@
<log4j.version>2.20.0</log4j.version>
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.9.1</junit5.version>
<commons-beanutils.version>1.11.0</commons-beanutils.version>
<commons-codec.version>1.17.2</commons-codec.version>
<commons-pool2.version>2.12.0</commons-pool2.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons-beanutils.version>1.11.0</commons-beanutils.version>
<commons-net.version>3.12.0</commons-net.version>
<cglib.version>2.2.2</cglib.version>
<curator.version>5.7.0</curator.version>
<mockito.version>4.11.0</mockito.version>
Expand Down Expand Up @@ -219,6 +223,24 @@
<version>${amoro-shade-thrift.version}-${amoro-shade.version}</version>
</dependency>

<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>

<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${commons-net.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
Expand Down Expand Up @@ -316,6 +338,12 @@
<artifactId>hadoop-aliyun</artifactId>
<version>${hadoop.version}</version>
<scope>${aliyun-sdk-dependency-scope}</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -326,7 +354,7 @@

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<artifactId>${hadoop-client-runtime.artifact}</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -362,7 +390,7 @@

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<artifactId>${hadoop-client-api.artifact}</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -452,6 +480,10 @@
<version>${hadoop.version}</version>
<!-- Exclude aws bundles, we have declared the dependencies of AWS separately. -->
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bundle</artifactId>
Expand Down Expand Up @@ -892,6 +924,14 @@
<artifactId>hive-metastore</artifactId>
<version>${hive.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.curator</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
Expand Down Expand Up @@ -1675,6 +1715,8 @@
<hadoop.version>2.10.2</hadoop.version>
<spark.version>3.3.4</spark.version>
<spark.major.version>3.3</spark.major.version>
<hadoop-client-api.artifact>hadoop-client</hadoop-client-api.artifact>
<hadoop-client-runtime.artifact>hadoop-auth</hadoop-client-runtime.artifact>
</properties>
</profile>
<profile>
Expand Down
Loading