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/01/10 23:15:55 UTC

svn commit: r1229765 - in /incubator/oozie/branches/3.2: release-log.txt sharelib/hive/pom.xml

Author: tucu
Date: Tue Jan 10 22:15:55 2012
New Revision: 1229765

URL: http://svn.apache.org/viewvc?rev=1229765&view=rev
Log:
Merge -r 1229719:1229720 from trunk to branch. FIXES: OOZIE-639

Modified:
    incubator/oozie/branches/3.2/release-log.txt
    incubator/oozie/branches/3.2/sharelib/hive/pom.xml

Modified: incubator/oozie/branches/3.2/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/3.2/release-log.txt?rev=1229765&r1=1229764&r2=1229765&view=diff
==============================================================================
--- incubator/oozie/branches/3.2/release-log.txt (original)
+++ incubator/oozie/branches/3.2/release-log.txt Tue Jan 10 22:15:55 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.2.0 release
 
+OOZIE-639 Hive sharelib POM must exclude hadoop-core. (tucu)
 OOZIE-635 ShellMain closes the STD/ERR stream while shell is processing. (tucu)
 OOZIE-629 Oozie server to prevent usage of dataset initial-instance earlier than the system-defined default value.(Mona via Mohammad)
 OOZIE-621 Option to add timeunit for frequency for coordinator jobs filtering.(Kiran via Mohammad)

Modified: incubator/oozie/branches/3.2/sharelib/hive/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/3.2/sharelib/hive/pom.xml?rev=1229765&r1=1229764&r2=1229765&view=diff
==============================================================================
--- incubator/oozie/branches/3.2/sharelib/hive/pom.xml (original)
+++ incubator/oozie/branches/3.2/sharelib/hive/pom.xml Tue Jan 10 22:15:55 2012
@@ -43,6 +43,10 @@
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.apache.hive</groupId>
                     <artifactId>hive-hwi</artifactId>
                 </exclusion>
@@ -87,7 +91,13 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-contrib</artifactId>
-            <scope>runtime</scope>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>