You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2014/05/01 19:22:25 UTC

git commit: OOZIE-1762 Sharelib with oozie.action.ship.launcher.jar=true should copy oozie-hadoop-utils.jar (puru via mona)

Repository: oozie
Updated Branches:
  refs/heads/master ef513d285 -> 7c35bec3f


OOZIE-1762 Sharelib with oozie.action.ship.launcher.jar=true should copy oozie-hadoop-utils.jar (puru via mona)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7c35bec3
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7c35bec3
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7c35bec3

Branch: refs/heads/master
Commit: 7c35bec3f4fc9c67540a97f42d99ef7c94f12425
Parents: ef513d2
Author: mona <ch...@yahoo-inc.com>
Authored: Thu May 1 10:22:18 2014 -0700
Committer: mona <ch...@yahoo-inc.com>
Committed: Thu May 1 10:22:18 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/oozie/action/hadoop/JavaActionExecutor.java  | 1 +
 release-log.txt                                                  | 1 +
 webapp/pom.xml                                                   | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/7c35bec3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
index 59ad143..d4b4f5e 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
@@ -134,6 +134,7 @@ public class JavaActionExecutor extends ActionExecutor {
         List<Class> classes = new ArrayList<Class>();
         classes.add(LauncherMapper.class);
         classes.add(OozieLauncherInputFormat.class);
+        classes.add(LauncherMainHadoopUtils.class);
         classes.addAll(Services.get().get(URIHandlerService.class).getClassesForLauncher());
         return classes;
     }

http://git-wip-us.apache.org/repos/asf/oozie/blob/7c35bec3/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 030fe98..99106de 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1762 Sharelib with oozie.action.ship.launcher.jar=true should copy oozie-hadoop-utils.jar (puru via mona)
 OOZIE-1709 CoordELFunctions.getCurrentInstance() is expensive (shwethags via rohini) 
 OOZIE-1787 parameterize interval of SLAService updating SlaStatus (ryota)
 OOZIE-1777 duplicated log message in Pig launcher's stdout (ryota)

http://git-wip-us.apache.org/repos/asf/oozie/blob/7c35bec3/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 4f36ac8..93cfcef 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -114,10 +114,12 @@
             <scope>provided</scope>
          </dependency>
 
+        <!-- All oozie sharelib has to be part of webapp, so that ShareLibService can copy all systemlib
+        jars when "oozie.action.ship.launcher.jar" is set to true -->
         <dependency>
             <groupId>org.apache.oozie</groupId>
             <artifactId>oozie-sharelib-oozie</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>