Repository: hadoop Updated Branches: refs/heads/HDFS-7240 7c957451f -> 90f3fb618
HDFS-12517. Ozone: mvn package is failing with out skipshade. Contributed by Bharat Viswanadham. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/90f3fb61 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/90f3fb61 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/90f3fb61 Branch: refs/heads/HDFS-7240 Commit: 90f3fb618e39aca48913bfd8f140ea1421894887 Parents: 7c95745 Author: Anu Engineer <[email protected]> Authored: Thu Sep 21 11:40:31 2017 -0700 Committer: Anu Engineer <[email protected]> Committed: Thu Sep 21 11:40:31 2017 -0700 ---------------------------------------------------------------------- .../src/test/resources/ensure-jars-have-correct-contents.sh | 6 ++++++ hadoop-client-modules/hadoop-client-minicluster/pom.xml | 7 +++++++ hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 6 ++++++ 3 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/90f3fb61/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh ---------------------------------------------------------------------- diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh index fb9f4f9..f8c6a15 100644 --- a/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh +++ b/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+=")" http://git-wip-us.apache.org/repos/asf/hadoop/blob/90f3fb61/hadoop-client-modules/hadoop-client-minicluster/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 00f2d25..11e8643 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -646,6 +646,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> http://git-wip-us.apache.org/repos/asf/hadoop/blob/90f3fb61/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index 4c8f832..18fe57c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -120,6 +120,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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
