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 <[email protected]> Authored: Sat Nov 19 21:13:19 2016 +0100 Committer: Olaf Flebbe <[email protected]> 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}
