Repository: falcon Updated Branches: refs/heads/master 0897c346a -> f0928981b
FALCON-1000 ITs fail with NoSuchFieldError: INSTANCE. Contributed by Shwetha GS Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f0928981 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f0928981 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f0928981 Branch: refs/heads/master Commit: f0928981b9ea9cdd64cc1ad2f43c70b8115f830c Parents: 0897c34 Author: shwethags <[email protected]> Authored: Tue Jan 20 17:47:55 2015 +0530 Committer: shwethags <[email protected]> Committed: Tue Jan 20 17:47:55 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ build-tools/src/bin/build-oozie.sh | 2 +- test-tools/hadoop-webapp/pom.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/f0928981/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d212fba..5dfcb49 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -75,6 +75,8 @@ Trunk (Unreleased) (Suhas vasu) BUG FIXES + FALCON-1000 ITs fail with NoSuchFieldError: INSTANCE. (Shwetha GS) + FALCON-109 submission of clusters for non registered colos (Pallavi Rao via Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/f0928981/build-tools/src/bin/build-oozie.sh ---------------------------------------------------------------------- diff --git a/build-tools/src/bin/build-oozie.sh b/build-tools/src/bin/build-oozie.sh index b5f3179..1899ff4 100755 --- a/build-tools/src/bin/build-oozie.sh +++ b/build-tools/src/bin/build-oozie.sh @@ -61,6 +61,6 @@ esac rm `find . -name 'pom.xml.bak'` -$MVN_CMD clean install -DskipTests -Phadoop-2 +$MVN_CMD clean source:jar install -DskipTests -Phadoop-2 popd http://git-wip-us.apache.org/repos/asf/falcon/blob/f0928981/test-tools/hadoop-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/test-tools/hadoop-webapp/pom.xml b/test-tools/hadoop-webapp/pom.xml index cc246aa..cadc7f5 100644 --- a/test-tools/hadoop-webapp/pom.xml +++ b/test-tools/hadoop-webapp/pom.xml @@ -233,6 +233,7 @@ </goals> <configuration> <outputDirectory>${project.build.directory}/oozie/WEB-INF/lib</outputDirectory> + <excludeArtifactIds>httpclient,httpcore</excludeArtifactIds> </configuration> </execution> </executions>
