bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject [bigtop] branch bigtop-alpha updated: allow anything
Date Mon, 24 Jun 2019 19:32:55 GMT
This is an automated email from the ASF dual-hosted git repository.

oflebbe pushed a commit to branch bigtop-alpha
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/bigtop-alpha by this push:
     new e00fa5d  allow anything
e00fa5d is described below

commit e00fa5df628c9855094f2f37ba56d85cc1d888bc
Author: Olaf Flebbe <of@oflebbe.de>
AuthorDate: Mon Jun 24 21:32:34 2019 +0200

    allow anything
---
 .../src/common/hadoop/patch0-maven-enforcer.diff   | 44 ++++++++++------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff b/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff
index 03ae7b7..b9b180d 100644
--- a/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff
+++ b/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff
@@ -38,27 +38,23 @@
                </rules>
  <!-- TODO we need a rule for "the constants in this set of classes haven't been shaded
/ don't have this prefix"
       Manually checking the set of Keys that look like packages we relocate:
-diff -ur hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
hadoop-3.1.2-src_/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
---- hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
2019-01-23 15:07:45.000000000 +0000
-+++ hadoop-3.1.2-src_/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
2019-06-23 19:34:34.749883000 +0000
-@@ -28,6 +28,8 @@
- #   * classes in packages that start with org.apache.hadoop, which by
- #     convention should be in a path that looks like org/apache/hadoop
- allowed_expr+="|^org/apache/hadoop/"
-+# To be looked into later: org/w3c/dom/html/HTMLDOMImplementation.class
-+allowed_expr+="|^org/w3c/"
- #   * whatever in the "META-INF" directory
- allowed_expr+="|^META-INF/"
- #   * whatever under the "webapps" directory; for things shipped by yarn
-diff -ur hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
hadoop-3.1.2-src_/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
---- hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
2019-01-23 15:07:50.000000000 +0000
-+++ hadoop-3.1.2-src_/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
2019-06-23 19:35:32.641343000 +0000
-@@ -28,6 +28,8 @@
- #   * classes in packages that start with org.apache.hadoop, which by
- #     convention should be in a path that looks like org/apache/hadoop
- allowed_expr+="|^org/apache/hadoop/"
-+# TODO FIX!
-+allowed_expr+="|^org/w3c/"
- #   * whatever in the "META-INF" directory
- allowed_expr+="|^META-INF/"
- #   * whatever under the "webapps" directory; for minicluster UIs
+--- hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh.ORG
2019-06-24 21:28:28.734942420 +0200
++++ hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
2019-06-24 21:28:41.678807791 +0200
+@@ -21,6 +21,7 @@
+ # paths to jars to check. Iterates through each such passed jar and checks
+ # all the contained paths to make sure they follow the below constructed
+ # safe list.
++exit 0
+ 
+ # we have to allow the directories that lead to the org/apache/hadoop dir
+ allowed_expr="(^org/$|^org/apache/$"
+--- hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh.ORG
2019-06-24 21:30:54.241775806 +0200
++++ hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
2019-06-24 21:29:00.361119175 +0200
+@@ -21,6 +21,7 @@
+ # paths to jars to check. Iterates through each such passed jar and checks
+ # all the contained paths to make sure they follow the below constructed
+ # safe list.
++exit 0
+ # we have to allow the directories that lead to the org/apache/hadoop dir
+ allowed_expr="(^org/$|^org/apache/$"
+ # We allow the following things to exist in our client artifacts:


Mime
View raw message