You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/12/23 09:58:40 UTC
[1/2] bigtop git commit: BIGTOP-2643: Force giraph to compile by
removing findbugs from all pom.xml
Repository: bigtop
Updated Branches:
refs/heads/master c26f65235 -> b42e016c1
BIGTOP-2643: Force giraph to compile by removing findbugs from all pom.xml
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b42e016c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b42e016c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b42e016c
Branch: refs/heads/master
Commit: b42e016c10ea32ac59f3ecb8836958d29f6be403
Parents: c6d1de5
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Thu Dec 22 19:42:13 2016 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Fri Dec 23 10:58:10 2016 +0100
----------------------------------------------------------------------
.../common/giraph/patch1-remove-findbugs.diff | 140 +++++++++++++++++++
1 file changed, 140 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b42e016c/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff b/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff
new file mode 100644
index 0000000..33090e2
--- /dev/null
+++ b/bigtop-packages/src/common/giraph/patch1-remove-findbugs.diff
@@ -0,0 +1,140 @@
+diff -ur giraph-1.1.0/giraph-accumulo/pom.xml giraph-1.1.0.new/giraph-accumulo/pom.xml
+--- giraph-1.1.0/giraph-accumulo/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-accumulo/pom.xml 2016-12-22 19:16:52.000000000 +0100
+@@ -76,10 +76,6 @@
+ </systemProperties>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-core/pom.xml giraph-1.1.0.new/giraph-core/pom.xml
+--- giraph-1.1.0/giraph-core/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-core/pom.xml 2016-12-22 19:17:12.000000000 +0100
+@@ -142,24 +142,6 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- <version>2.5.1</version>
+- <configuration>
+- <xmlOutput>true</xmlOutput>
+- <findbugsXmlOutput>false</findbugsXmlOutput>
+- <excludeFilterFile>${top.dir}/findbugs-exclude.xml</excludeFilterFile>
+- </configuration>
+- <executions>
+- <execution>
+- <phase>verify</phase>
+- <goals>
+- <goal>check</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-examples/pom.xml giraph-1.1.0.new/giraph-examples/pom.xml
+--- giraph-1.1.0/giraph-examples/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-examples/pom.xml 2016-12-22 19:17:29.000000000 +0100
+@@ -93,10 +93,6 @@
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-gora/pom.xml giraph-1.1.0.new/giraph-gora/pom.xml
+--- giraph-1.1.0/giraph-gora/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-gora/pom.xml 2016-12-22 19:17:36.000000000 +0100
+@@ -67,10 +67,6 @@
+ </systemProperties>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-hbase/pom.xml giraph-1.1.0.new/giraph-hbase/pom.xml
+--- giraph-1.1.0/giraph-hbase/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-hbase/pom.xml 2016-12-22 19:17:42.000000000 +0100
+@@ -80,10 +80,6 @@
+ </systemProperties>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-hcatalog/pom.xml giraph-1.1.0.new/giraph-hcatalog/pom.xml
+--- giraph-1.1.0/giraph-hcatalog/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-hcatalog/pom.xml 2016-12-22 19:17:48.000000000 +0100
+@@ -75,10 +75,6 @@
+ </systemProperties>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-hive/pom.xml giraph-1.1.0.new/giraph-hive/pom.xml
+--- giraph-1.1.0/giraph-hive/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-hive/pom.xml 2016-12-22 19:17:55.000000000 +0100
+@@ -85,10 +85,6 @@
+ </systemProperties>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-rexster/giraph-kibble/pom.xml giraph-1.1.0.new/giraph-rexster/giraph-kibble/pom.xml
+--- giraph-1.1.0/giraph-rexster/giraph-kibble/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-rexster/giraph-kibble/pom.xml 2016-12-22 19:32:12.000000000 +0100
+@@ -79,10 +79,6 @@
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+diff -ur giraph-1.1.0/giraph-rexster/giraph-rexster-io/pom.xml giraph-1.1.0.new/giraph-rexster/giraph-rexster-io/pom.xml
+--- giraph-1.1.0/giraph-rexster/giraph-rexster-io/pom.xml 2014-11-01 06:25:12.000000000 +0100
++++ giraph-1.1.0.new/giraph-rexster/giraph-rexster-io/pom.xml 2016-12-22 19:32:19.000000000 +0100
+@@ -80,10 +80,6 @@
+ </systemProperties>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>findbugs-maven-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
[2/2] bigtop git commit: BIGTOP-2642: zookeeper does not compile on
Fedora-25
Posted by of...@apache.org.
BIGTOP-2642: zookeeper does not compile on Fedora-25
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c6d1de51
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c6d1de51
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c6d1de51
Branch: refs/heads/master
Commit: c6d1de5159bbc9532768109bc2b3bf09a528ace1
Parents: c26f652
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Thu Dec 22 19:12:06 2016 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Fri Dec 23 10:58:10 2016 +0100
----------------------------------------------------------------------
bigtop-packages/src/common/zookeeper/do-component-build | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c6d1de51/bigtop-packages/src/common/zookeeper/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/do-component-build b/bigtop-packages/src/common/zookeeper/do-component-build
index ce166cf..57fd09e 100644
--- a/bigtop-packages/src/common/zookeeper/do-component-build
+++ b/bigtop-packages/src/common/zookeeper/do-component-build
@@ -18,6 +18,9 @@ set -ex
. `dirname ${0}`/bigtop.bom
+# ZOOKEEPER-2654, BIGTOP-2642
+sed -i -e 's@AM_PATH_CPPUNIT(1.10.2)@PKG_CHECK_MODULES([CPPUNIT], [cppunit])@' src/c/configure.ac
+
ANT_OPTS="-Dversion=$ZOOKEEPER_VERSION -f build.xml $@"
sed -i.orig -e 's#test-jar,api-report#test-jar#g' build.xml
ant compile ${ANT_OPTS}