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/11/20 19:57:40 UTC
[1/3] bigtop git commit: BIGTOP-2534: Flume tests fail with
java.lang.NoClassDefFoundError: org/apache/commons/io/Charsets
Repository: bigtop
Updated Branches:
refs/heads/master 359d52a55 -> 83724e2e5
BIGTOP-2534: Flume tests fail with java.lang.NoClassDefFoundError: org/apache/commons/io/Charsets
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/83724e2e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/83724e2e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/83724e2e
Branch: refs/heads/master
Commit: 83724e2e51a54a9a24b87aa35844d485391bd12f
Parents: ae7ab00
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Nov 19 21:13:19 2016 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sun Nov 20 20:58:20 2016 +0100
----------------------------------------------------------------------
bigtop-packages/src/common/flume/patch0-FLUME-2662.diff | 11 +++++++++++
bigtop-packages/src/rpm/flume/SPECS/flume.spec | 3 +++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/83724e2e/bigtop-packages/src/common/flume/patch0-FLUME-2662.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/flume/patch0-FLUME-2662.diff b/bigtop-packages/src/common/flume/patch0-FLUME-2662.diff
new file mode 100644
index 0000000..9644c5e
--- /dev/null
+++ b/bigtop-packages/src/common/flume/patch0-FLUME-2662.diff
@@ -0,0 +1,11 @@
+--- apache-flume-1.7.0-src/pom.xml. 2016-11-19 20:56:05.683682127 +0100
++++ apache-flume-1.7.0-src/pom.xml 2016-11-19 20:56:22.707682094 +0100
+@@ -951,7 +951,7 @@
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+- <version>2.1</version>
++ <version>2.4</version>
+ </dependency>
+
+ <dependency>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/83724e2e/bigtop-packages/src/rpm/flume/SPECS/flume.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/flume/SPECS/flume.spec b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
index 520a2f2..f056564 100644
--- a/bigtop-packages/src/rpm/flume/SPECS/flume.spec
+++ b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
@@ -67,6 +67,7 @@ Source1: do-component-build
Source2: install_%{name}.sh
Source3: %{name}-agent.init
Source4: flume-agent.default
+#BIGTOP_PATCH_FILES
Requires: /usr/sbin/useradd
Requires: coreutils
Requires: hadoop, hadoop-hdfs
@@ -114,6 +115,8 @@ Flume is a reliable, scalable, and manageable distributed data collection applic
%prep
%setup -n %{flume_folder}
+#BIGTOP_PATCH_COMMANDS
+
%build
env FLUME_VERSION=%{version} sh %{SOURCE1}
[2/3] bigtop git commit: BIGTOP-2590: Flume build break on RPM
Posted by of...@apache.org.
BIGTOP-2590: Flume build break on RPM
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ae7ab00c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ae7ab00c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ae7ab00c
Branch: refs/heads/master
Commit: ae7ab00cacdd58b4be11d2dc28a941c304f97be5
Parents: 666c0e5
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Nov 19 21:11:13 2016 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sun Nov 20 20:58:20 2016 +0100
----------------------------------------------------------------------
bigtop-packages/src/common/flume/install_flume.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ae7ab00c/bigtop-packages/src/common/flume/install_flume.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/flume/install_flume.sh b/bigtop-packages/src/common/flume/install_flume.sh
index 8927e19..e6b50d8 100755
--- a/bigtop-packages/src/common/flume/install_flume.sh
+++ b/bigtop-packages/src/common/flume/install_flume.sh
@@ -109,8 +109,9 @@ for x in flume-ng-* \
DISCLAIMER \
LICENSE \
NOTICE \
- README \
+ README.md \
RELEASE-NOTES \
+ doap_Flume.rdf \
bin/ia64 \
bin/amd64; do
rm -rf ${PREFIX}/$LIB_DIR/$x
@@ -161,8 +162,9 @@ for x in CHANGELOG \
DEVNOTES \
LICENSE \
NOTICE \
- README \
- RELEASE-NOTES ; do
+ README.md \
+ RELEASE-NOTES \
+ doap_Flume.rdf ; do
if [ -e $x ] ; then
cp -r $x $PREFIX/${DOC_DIR}
fi
[3/3] bigtop git commit: BIGTOP-2588: Spark 2.0.1 installation fails
on DEB
Posted by of...@apache.org.
BIGTOP-2588: Spark 2.0.1 installation fails on DEB
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/666c0e53
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/666c0e53
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/666c0e53
Branch: refs/heads/master
Commit: 666c0e530492912627732c55c34c29981af53a83
Parents: 359d52a
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Nov 19 18:16:26 2016 +0100
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Sun Nov 20 20:58:20 2016 +0100
----------------------------------------------------------------------
bigtop-packages/src/deb/spark/rules | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/666c0e53/bigtop-packages/src/deb/spark/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/spark/rules b/bigtop-packages/src/deb/spark/rules
index 5881518..0bc7fc7 100644
--- a/bigtop-packages/src/deb/spark/rules
+++ b/bigtop-packages/src/deb/spark/rules
@@ -40,3 +40,8 @@ override_dh_auto_install: $(svcs)
--doc-dir=/usr/share/doc/spark \
--source-dir=debian \
--prefix=debian/tmp
+
+override_dh_install:
+ dh_install
+ # BIGTOP-2588 drop datanucleus jars from spark-core
+ rm -Rf debian/spark-core/usr/lib/spark/jars/datanucleus*