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

This commit is contained in:
Anu Engineer 2017-09-21 11:40:31 -07:00 committed by Owen O'Malley
parent 42e248372c
commit 27ec22e20d
3 changed files with 19 additions and 0 deletions

View File

@ -43,6 +43,12 @@ allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
# * Used by JavaSandboxLinuxContainerRuntime as a default, loaded # * Used by JavaSandboxLinuxContainerRuntime as a default, loaded
# from root, so can't relocate. :( # from root, so can't relocate. :(
allowed_expr+="|^java.policy$" 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+=")" allowed_expr+=")"

View File

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

View File

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