Skip to content

Commit 2741e29

Browse files
turboFeiturboFei
committed
hadoop client api and hadoop client runtime
1 parent 622234d commit 2741e29

File tree

3 files changed

+60
-6
lines changed

3 files changed

+60
-6
lines changed

‎amoro-common/pom.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,21 @@
6464
<artifactId>amoro-shade-zookeeper-3</artifactId>
6565
</dependency>
6666

67+
<dependency>
68+
<groupId>commons-beanutils</groupId>
69+
<artifactId>commons-beanutils</artifactId>
70+
</dependency>
71+
72+
<dependency>
73+
<groupId>commons-codec</groupId>
74+
<artifactId>commons-codec</artifactId>
75+
</dependency>
76+
77+
<dependency>
78+
<groupId>commons-net</groupId>
79+
<artifactId>commons-net</artifactId>
80+
</dependency>
81+
6782
<dependency>
6883
<groupId>org.apache.commons</groupId>
6984
<artifactId>commons-pool2</artifactId>
@@ -87,12 +102,12 @@
87102

88103
<dependency>
89104
<groupId>org.apache.hadoop</groupId>
90-
<artifactId>hadoop-auth</artifactId>
105+
<artifactId>${hadoop-client-api.artifact}</artifactId>
91106
</dependency>
92107

93108
<dependency>
94109
<groupId>org.apache.hadoop</groupId>
95-
<artifactId>hadoop-client</artifactId>
110+
<artifactId>${hadoop-client-runtime.artifact}</artifactId>
96111
</dependency>
97112

98113
<dependency>

‎amoro-format-iceberg/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@
131131

132132
<dependency>
133133
<groupId>org.apache.hadoop</groupId>
134-
<artifactId>hadoop-auth</artifactId>
134+
<artifactId>${hadoop-client-api.artifact}</artifactId>
135135
</dependency>
136136

137137
<dependency>
138138
<groupId>org.apache.hadoop</groupId>
139-
<artifactId>hadoop-client</artifactId>
139+
<artifactId>${hadoop-client-runtime.artifact}</artifactId>
140140
</dependency>
141141

142142
<dependency>

‎pom.xml‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,20 @@
106106
<paimon.version>1.1.1</paimon.version>
107107
<hive.version>3.1.3</hive.version>
108108
<hadoop.version>3.4.0</hadoop.version>
109+
<hadoop-client-api.artifact>hadoop-client-api</hadoop-client-api.artifact>
110+
<hadoop-client-runtime.artifact>hadoop-client-runtime</hadoop-client-runtime.artifact>
109111
<kerby.version>2.0.3</kerby.version>
110112
<scala.binary.version>2.12</scala.binary.version>
111113
<args4j.version>2.33</args4j.version>
112114
<slf4j.version>1.7.30</slf4j.version>
113115
<log4j.version>2.20.0</log4j.version>
114116
<junit4.version>4.13.2</junit4.version>
115117
<junit5.version>5.9.1</junit5.version>
118+
<commons-beanutils.version>1.11.0</commons-beanutils.version>
119+
<commons-codec.version>1.17.2</commons-codec.version>
116120
<commons-pool2.version>2.12.0</commons-pool2.version>
117121
<commons-lang3.version>3.14.0</commons-lang3.version>
122+
<commons-net.version>3.12.0</commons-net.version>
118123
<commons-beanutils.version>1.11.0</commons-beanutils.version>
119124
<cglib.version>2.2.2</cglib.version>
120125
<curator.version>5.7.0</curator.version>
@@ -296,6 +301,24 @@
296301
<version>${amoro-shade-thrift.version}-${amoro-shade.version}</version>
297302
</dependency>
298303

304+
<dependency>
305+
<groupId>commons-beanutils</groupId>
306+
<artifactId>commons-beanutils</artifactId>
307+
<version>${commons-beanutils.version}</version>
308+
</dependency>
309+
310+
<dependency>
311+
<groupId>commons-codec</groupId>
312+
<artifactId>commons-codec</artifactId>
313+
<version>${commons-codec.version}</version>
314+
</dependency>
315+
316+
<dependency>
317+
<groupId>commons-net</groupId>
318+
<artifactId>commons-net</artifactId>
319+
<version>${commons-net.version}</version>
320+
</dependency>
321+
299322
<dependency>
300323
<groupId>org.apache.commons</groupId>
301324
<artifactId>commons-pool2</artifactId>
@@ -393,6 +416,12 @@
393416
<artifactId>hadoop-aliyun</artifactId>
394417
<version>${hadoop.version}</version>
395418
<scope>${aliyun-sdk-dependency-scope}</scope>
419+
<exclusions>
420+
<exclusion>
421+
<groupId>org.apache.hadoop</groupId>
422+
<artifactId>hadoop-common</artifactId>
423+
</exclusion>
424+
</exclusions>
396425
</dependency>
397426

398427
<dependency>
@@ -403,7 +432,7 @@
403432

404433
<dependency>
405434
<groupId>org.apache.hadoop</groupId>
406-
<artifactId>hadoop-auth</artifactId>
435+
<artifactId>${hadoop-client-runtime.artifact}</artifactId>
407436
<version>${hadoop.version}</version>
408437
<exclusions>
409438
<exclusion>
@@ -423,7 +452,7 @@
423452

424453
<dependency>
425454
<groupId>org.apache.hadoop</groupId>
426-
<artifactId>hadoop-client</artifactId>
455+
<artifactId>${hadoop-client-api.artifact}</artifactId>
427456
<version>${hadoop.version}</version>
428457
<exclusions>
429458
<exclusion>
@@ -487,6 +516,10 @@
487516
<version>${hadoop.version}</version>
488517
<!-- Exclude aws bundles, we have declared the dependencies of AWS separately. -->
489518
<exclusions>
519+
<exclusion>
520+
<groupId>org.apache.hadoop</groupId>
521+
<artifactId>hadoop-common</artifactId>
522+
</exclusion>
490523
<exclusion>
491524
<groupId>software.amazon.awssdk</groupId>
492525
<artifactId>bundle</artifactId>
@@ -734,6 +767,10 @@
734767
<artifactId>hive-metastore</artifactId>
735768
<version>${hive.version}</version>
736769
<exclusions>
770+
<exclusion>
771+
<groupId>org.apache.hadoop</groupId>
772+
<artifactId>hadoop-common</artifactId>
773+
</exclusion>
737774
<exclusion>
738775
<groupId>org.apache.hadoop</groupId>
739776
<artifactId>hadoop-hdfs</artifactId>
@@ -1420,6 +1457,8 @@
14201457
<hadoop.version>2.10.2</hadoop.version>
14211458
<spark.version>3.3.4</spark.version>
14221459
<spark.major.version>3.3</spark.major.version>
1460+
<hadoop-client-api.artifact>hadoop-client</hadoop-client-api.artifact>
1461+
<hadoop-client-runtime.artifact>hadoop-auth</hadoop-client-runtime.artifact>
14231462
</properties>
14241463
</profile>
14251464
<profile>

0 commit comments

Comments
 (0)