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: fix again
Date Mon, 24 Jun 2019 19:48:30 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 f671121  fix again
f671121 is described below

commit f671121a5bf833ce78310c39edd9f349dae37b28
Author: Olaf Flebbe <of@oflebbe.de>
AuthorDate: Mon Jun 24 21:49:17 2019 +0200

    fix again
---
 .../src/common/hadoop/patch0-maven-enforcer.diff   | 52 +++++++++++++---------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff b/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff
index b9b180d..c214e55 100644
--- a/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff
+++ b/bigtop-packages/src/common/hadoop/patch0-maven-enforcer.diff
@@ -1,5 +1,7 @@
---- hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-invariants/pom.xml	2019-01-23
16:07:50.000000000 +0100
-+++ hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-invariants/pom.xml_	2019-06-22
23:36:50.531792133 +0200
+diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
+index 5c366da..c540b7c 100644
+--- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
++++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
 @@ -92,7 +92,7 @@
                      <exclude>com.google.code.findbugs:jsr305</exclude>
                    </excludes>
@@ -18,8 +20,22 @@
                </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:
---- hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml	2019-01-23
16:07:50.000000000 +0100
-+++ hadoop-3.1.2-src/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml_	2019-06-22
23:37:00.251792363 +0200
+diff --git a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+index 84efe7e..404e485 100644
+--- a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
++++ b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+@@ -14,6 +14,7 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
++exit 0
+ 
+ # Usage: $0 [/path/to/some/example.jar:/path/to/another/example/created.jar]
+ #
+diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
+index 7edacf9..80c802f 100644
+--- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
++++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
 @@ -100,7 +100,7 @@
                      <exclude>com.google.code.findbugs:jsr305</exclude>
                    </excludes>
@@ -38,23 +54,15 @@
                </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:
---- 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.
+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..dba57f8 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
+@@ -14,6 +14,7 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
 +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:
+ # Usage: $0 [/path/to/some/example.jar:/path/to/another/example/created.jar]
+ #


Mime
View raw message