You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/06/20 22:44:08 UTC

svn commit: r1352309 - in /incubator/oozie/trunk: ./ hadooplibs/hadoop-distcp-1/ sharelib/distcp/ sharelib/hive/ sharelib/oozie/ sharelib/pig/ sharelib/sqoop/ sharelib/streaming/ src/main/assemblies/

Author: tucu
Date: Wed Jun 20 20:44:07 2012
New Revision: 1352309

URL: http://svn.apache.org/viewvc?rev=1352309&view=rev
Log:
OOZIE-879 distcp packaging with Hadoop 1 brings in lots of unwanted dependencies (rkanter via tucu)

Modified:
    incubator/oozie/trunk/hadooplibs/hadoop-distcp-1/pom.xml
    incubator/oozie/trunk/release-log.txt
    incubator/oozie/trunk/sharelib/distcp/pom.xml
    incubator/oozie/trunk/sharelib/hive/pom.xml
    incubator/oozie/trunk/sharelib/oozie/pom.xml
    incubator/oozie/trunk/sharelib/pig/pom.xml
    incubator/oozie/trunk/sharelib/sqoop/pom.xml
    incubator/oozie/trunk/sharelib/streaming/pom.xml
    incubator/oozie/trunk/src/main/assemblies/partial-sharelib.xml

Modified: incubator/oozie/trunk/hadooplibs/hadoop-distcp-1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/hadooplibs/hadoop-distcp-1/pom.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/hadooplibs/hadoop-distcp-1/pom.xml (original)
+++ incubator/oozie/trunk/hadooplibs/hadoop-distcp-1/pom.xml Wed Jun 20 20:44:07 2012
@@ -38,6 +38,12 @@
             <artifactId>hadoop-tools</artifactId>
             <version>1.0.1</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hadoop-core</artifactId>
+                    <groupId>org.apache.hadoop</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Wed Jun 20 20:44:07 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (trunk - unreleased)
 
+OOZIE-879 distcp packaging with Hadoop 1 brings in lots of unwanted dependencies (rkanter via tucu)
 OOZIE-559 Create DistCp WF example (rkanter via tucu)
 OOZIE-34  connProps should mask DB password when logging != DEBUG (rkanter via tucu)
 OOZIE-877 update hadooplib POMs to use hadoop-2.0.0-alpha release (tucu)

Modified: incubator/oozie/trunk/sharelib/distcp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/sharelib/distcp/pom.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/sharelib/distcp/pom.xml (original)
+++ incubator/oozie/trunk/sharelib/distcp/pom.xml Wed Jun 20 20:44:07 2012
@@ -34,6 +34,7 @@
 
     <properties>
         <sharelib.action.postfix>distcp</sharelib.action.postfix>
+        <sharelib.transitive.filtering>false</sharelib.transitive.filtering>
     </properties>
 
     <dependencies>

Modified: incubator/oozie/trunk/sharelib/hive/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/sharelib/hive/pom.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/sharelib/hive/pom.xml (original)
+++ incubator/oozie/trunk/sharelib/hive/pom.xml Wed Jun 20 20:44:07 2012
@@ -34,6 +34,7 @@
 
     <properties>
         <sharelib.action.postfix>hive</sharelib.action.postfix>
+        <sharelib.transitive.filtering>true</sharelib.transitive.filtering>
     </properties>
 
     <dependencies>

Modified: incubator/oozie/trunk/sharelib/oozie/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/sharelib/oozie/pom.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/sharelib/oozie/pom.xml (original)
+++ incubator/oozie/trunk/sharelib/oozie/pom.xml Wed Jun 20 20:44:07 2012
@@ -34,6 +34,7 @@
 
     <properties>
         <sharelib.action.postfix>oozie</sharelib.action.postfix>
+        <sharelib.transitive.filtering>true</sharelib.transitive.filtering>
     </properties>
 
     <dependencies>

Modified: incubator/oozie/trunk/sharelib/pig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/sharelib/pig/pom.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/sharelib/pig/pom.xml (original)
+++ incubator/oozie/trunk/sharelib/pig/pom.xml Wed Jun 20 20:44:07 2012
@@ -34,6 +34,7 @@
 
     <properties>
         <sharelib.action.postfix>pig</sharelib.action.postfix>
+        <sharelib.transitive.filtering>true</sharelib.transitive.filtering>
     </properties>
 
     <dependencies>

Modified: incubator/oozie/trunk/sharelib/sqoop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/sharelib/sqoop/pom.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/sharelib/sqoop/pom.xml (original)
+++ incubator/oozie/trunk/sharelib/sqoop/pom.xml Wed Jun 20 20:44:07 2012
@@ -34,6 +34,7 @@
 
     <properties>
         <sharelib.action.postfix>sqoop</sharelib.action.postfix>
+        <sharelib.transitive.filtering>true</sharelib.transitive.filtering>
     </properties>
 
     <dependencies>

Modified: incubator/oozie/trunk/sharelib/streaming/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/sharelib/streaming/pom.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/sharelib/streaming/pom.xml (original)
+++ incubator/oozie/trunk/sharelib/streaming/pom.xml Wed Jun 20 20:44:07 2012
@@ -34,6 +34,7 @@
 
     <properties>
         <sharelib.action.postfix>mapreduce-streaming</sharelib.action.postfix>
+        <sharelib.transitive.filtering>true</sharelib.transitive.filtering>
     </properties>
 
     <dependencies>

Modified: incubator/oozie/trunk/src/main/assemblies/partial-sharelib.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/src/main/assemblies/partial-sharelib.xml?rev=1352309&r1=1352308&r2=1352309&view=diff
==============================================================================
--- incubator/oozie/trunk/src/main/assemblies/partial-sharelib.xml (original)
+++ incubator/oozie/trunk/src/main/assemblies/partial-sharelib.xml Wed Jun 20 20:44:07 2012
@@ -28,8 +28,11 @@
             <outputDirectory>/share/lib/${sharelib.action.postfix}</outputDirectory>
             <unpack>false</unpack>
             <useTransitiveDependencies>true</useTransitiveDependencies>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <useTransitiveFiltering>${sharelib.transitive.filtering}</useTransitiveFiltering>
             <scope>runtime</scope>
+            <excludes>
+                <exclude>org.apache.oozie:oozie-hadoop-distcp:jar</exclude>
+            </excludes>
         </dependencySet>
     </dependencySets>