This is an automated email from the ASF dual-hosted git repository.
jinglun pushed a commit to branch HADOOP-19236-original
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit c1cd76aa1035eb47081e4a1d7bc445a9f944a6c7
Author: lijinglun <lijing...@bytedance.com>
AuthorDate: Tue Nov 12 16:43:01 2024 +0800
Integration of TOS: Fix build issues.
---
dev-support/bin/dist-layout-stitching | 4 ++++
hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml | 6 ++++++
hadoop-cloud-storage-project/hadoop-tos/pom.xml | 6 ++++++
3 files changed, 16 insertions(+)
diff --git a/dev-support/bin/dist-layout-stitching
b/dev-support/bin/dist-layout-stitching
index d4bfd8aaada..3a0aaca7763 100755
--- a/dev-support/bin/dist-layout-stitching
+++ b/dev-support/bin/dist-layout-stitching
@@ -151,6 +151,10 @@ run cp -p
"${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop
run copy
"${ROOT}/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${VERSION}" .
run copy
"${ROOT}/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-dist/target/hadoop-dynamometer-dist-${VERSION}"
.
+run mkdir -p "share/hadoop/tools/hadoop-cloud-storage"
+run cp
"${ROOT}/hadoop-cloud-storage-project/hadoop-tos/target/hadoop-tos-${VERSION}.jar"
share/hadoop/tools/hadoop-cloud-storage/
+run cp
"${ROOT}/hadoop-cloud-storage-project/hadoop-cos/target/hadoop-cos-${VERSION}.jar"
share/hadoop/tools/hadoop-cloud-storage/
+run cp
"${ROOT}/hadoop-cloud-storage-project/hadoop-huaweicloud/target/hadoop-huaweicloud-${VERSION}.jar"
share/hadoop/tools/hadoop-cloud-storage/
echo
echo "Hadoop dist layout available at: ${BASEDIR}/hadoop-${VERSION}"
diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
index 46cbaf86b3f..bb080fcdd82 100644
--- a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
@@ -136,6 +136,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-huaweicloud</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-cloud-storage-project/hadoop-tos/pom.xml
b/hadoop-cloud-storage-project/hadoop-tos/pom.xml
index 50ea1df8d2b..86994472595 100644
--- a/hadoop-cloud-storage-project/hadoop-tos/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-tos/pom.xml
@@ -71,6 +71,12 @@
<groupId>com.volcengine</groupId>
<artifactId>ve-tos-java-sdk</artifactId>
<version>${ve-tos-java-sdk.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
