Repository: oozie Updated Branches: refs/heads/master 476ec57bd -> fc6cfb1b2
OOZIE-2113 Oozie Command Line Utilities are failing as hadoop-auth jar not found (shwethags) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/fc6cfb1b Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/fc6cfb1b Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/fc6cfb1b Branch: refs/heads/master Commit: fc6cfb1b275876962adddd93709d41fada54aa9c Parents: 476ec57 Author: Shwetha GS <[email protected]> Authored: Wed Feb 11 10:57:15 2015 +0530 Committer: Shwetha GS <[email protected]> Committed: Wed Feb 11 10:57:15 2015 +0530 ---------------------------------------------------------------------- client/pom.xml | 1 + client/src/main/bin/oozie | 3 +++ docs/pom.xml | 8 -------- pom.xml | 1 - release-log.txt | 1 + webapp/pom.xml | 6 ++++++ 6 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/fc6cfb1b/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 365276d..73f7ef5 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -76,6 +76,7 @@ <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-auth</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/fc6cfb1b/client/src/main/bin/oozie ---------------------------------------------------------------------- diff --git a/client/src/main/bin/oozie b/client/src/main/bin/oozie index 266e0fa..e1e584e 100644 --- a/client/src/main/bin/oozie +++ b/client/src/main/bin/oozie @@ -46,6 +46,9 @@ OOZIECPPATH="" for i in "${BASEDIR}/lib/"*.jar; do OOZIECPPATH="${OOZIECPPATH}:$i" done +for i in "${BASEDIR}/libext/"*.jar; do + OOZIECPPATH="${OOZIECPPATH}:$i" +done if test -z ${JAVA_HOME} http://git-wip-us.apache.org/repos/asf/oozie/blob/fc6cfb1b/docs/pom.xml ---------------------------------------------------------------------- diff --git a/docs/pom.xml b/docs/pom.xml index 3c0ad3e..c8ae25a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -31,14 +31,6 @@ <name>Apache Oozie Docs</name> <packaging>war</packaging> - <dependencies> - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-core</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/oozie/blob/fc6cfb1b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index db54451..3e54436 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,6 @@ <openjpa.version>2.2.2</openjpa.version> <xerces.version>2.10.0</xerces.version> <curator.version>2.5.0</curator.version> - <oozie.dependencies.scope>provided</oozie.dependencies.scope> </properties> <modules> http://git-wip-us.apache.org/repos/asf/oozie/blob/fc6cfb1b/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 42bceeb..02462d7 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2113 Oozie Command Line Utilities are failing as hadoop-auth jar not found (shwethags) OOZIE-1688 New configuration to specify server-server authentication type (puru) OOZIE-2090 wf:lastErrorNode does not take into account transient errors with retries (ranter) OOZIE-2133 Support getting ATS delegation tokens for tez jobs (rohini) http://git-wip-us.apache.org/repos/asf/oozie/blob/fc6cfb1b/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 990280d..9901816 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -35,6 +35,12 @@ <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-client</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
