瀏覽代碼

Integration of TOS: Fix build issues.

lijinglun 5 月之前
父節點
當前提交
c1cd76aa10

+ 4 - 0
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}"

+ 6 - 0
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>

+ 6 - 0
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>