Browse Source

HDFS-12517. Ozone: mvn package is failing with out skipshade. Contributed by Bharat Viswanadham.

Anu Engineer 7 years ago
parent
commit
27ec22e20d

+ 6 - 0
hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh

@@ -43,6 +43,12 @@ allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
 #   * Used by JavaSandboxLinuxContainerRuntime as a default, loaded
 #     from root, so can't relocate. :(
 allowed_expr+="|^java.policy$"
+# * allowing native libraries from rocksdb. Leaving native libraries as it is.
+allowed_expr+="|^librocksdbjni-linux32.so"
+allowed_expr+="|^librocksdbjni-linux64.so"
+allowed_expr+="|^librocksdbjni-osx.jnilib"
+allowed_expr+="|^librocksdbjni-win64.dll"
+allowed_expr+="|^librocksdbjni-linux-ppc64le.so"
 
 
 allowed_expr+=")"

+ 7 - 0
hadoop-client-modules/hadoop-client-minicluster/pom.xml

@@ -647,6 +647,13 @@
                         <exclude>xml.xsd</exclude>
                       </excludes>
                     </filter>
+                    <!-- filtering HISTORY-JAVA.md from rocksdb jar -->
+                    <filter>
+                    <artifact>org.rocksdb:rocksdbjni</artifact>
+                    <excludes>
+                      <exclude>HISTORY-JAVA.md</exclude>
+                    </excludes>
+                    </filter>
                     <filter>
                       <!-- skip jetty license info already incorporated into LICENSE/NOTICE -->
                       <artifact>org.eclipse.jetty:*</artifact>

+ 6 - 0
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml

@@ -121,6 +121,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <dependency>
       <artifactId>ratis-common</artifactId>
       <groupId>org.apache.ratis</groupId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <artifactId>ratis-client</artifactId>