You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2021/04/07 05:16:24 UTC
[hadoop] branch branch-3.3 updated: HADOOP-17624. Remove any
rocksdb exclusion code. (#2867)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 4436524 HADOOP-17624. Remove any rocksdb exclusion code. (#2867)
4436524 is described below
commit 44365244e67a5bfb77fbf7c2ba4831cda0843e6c
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Tue Apr 6 21:52:23 2021 -0700
HADOOP-17624. Remove any rocksdb exclusion code. (#2867)
Reviewed-by: Márton Elek <el...@apache.org>
Reviewed-by: Viraj Jasani <vj...@apache.org>
(cherry picked from commit f608cda72976d62354e063472d9b985eed48ebae)
---
.../src/test/resources/ensure-jars-have-correct-contents.sh | 7 -------
hadoop-client-modules/hadoop-client-minicluster/pom.xml | 7 -------
2 files changed, 14 deletions(-)
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 d77424e..0dbfefb 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
@@ -58,13 +58,6 @@ allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
allowed_expr+="|^java.policy$"
# * Used by javax.annotation
allowed_expr+="|^jndi.properties$"
-# * 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+=")"
declare -i bad_artifacts=0
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 9631081cd..d9d32d9 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -761,13 +761,6 @@
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org