You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ro...@apache.org on 2014/05/07 17:54:53 UTC
git commit: OOZIE-1243 libtools dir should not include hadoop JARs
(sathish.mittal via rohini)
Repository: oozie
Updated Branches:
refs/heads/master 6e2e46a98 -> 3e73f4e9a
OOZIE-1243 libtools dir should not include hadoop JARs (sathish.mittal via rohini)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3e73f4e9
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3e73f4e9
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3e73f4e9
Branch: refs/heads/master
Commit: 3e73f4e9aff0c3964067930355f7601c3c45cd89
Parents: 6e2e46a
Author: Rohini Palaniswamy <ro...@yahoo-inc.com>
Authored: Wed May 7 08:54:50 2014 -0700
Committer: Rohini Palaniswamy <ro...@yahoo-inc.com>
Committed: Wed May 7 08:54:50 2014 -0700
----------------------------------------------------------------------
release-log.txt | 1 +
src/main/assemblies/tools.xml | 3 ++-
tools/pom.xml | 8 +++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/3e73f4e9/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 795311a..b6cd061 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1243 libtools dir should not include hadoop JARs (sathish.mittal via rohini)
OOZIE-1806 Java Action type jobs are failing with hadoop-0.20.0 and earlier versions on oozie trunk (sathish.mittal via rohini)
OOZIE-1823 OozieSharelibCLI shouldn't load ext services (rkanter)
OOZIE-1762 Sharelib with oozie.action.ship.launcher.jar=true should copy oozie-hadoop-utils.jar (puru via mona)
http://git-wip-us.apache.org/repos/asf/oozie/blob/3e73f4e9/src/main/assemblies/tools.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/tools.xml b/src/main/assemblies/tools.xml
index 9b65773..a2b4482 100644
--- a/src/main/assemblies/tools.xml
+++ b/src/main/assemblies/tools.xml
@@ -39,7 +39,8 @@
<useProjectArtifact>true</useProjectArtifact>
<outputDirectory>oozie-tools-${project.version}/libtools</outputDirectory>
<unpack>false</unpack>
- <scope>compile</scope>
+ <!-- runtime scope assembles compile and runtime dependencies, but skips those with provided scope. -->
+ <scope>runtime</scope>
<excludes>
<exclude>*:*:pom:*</exclude>
</excludes>
http://git-wip-us.apache.org/repos/asf/oozie/blob/3e73f4e9/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index 1245e47..487783d 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -71,6 +71,12 @@
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -138,7 +144,7 @@
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>