Author: rkanter
Date: Thu Oct 24 23:00:36 2013
New Revision: 1535580
URL: http://svn.apache.org/r1535580
Log:
OOZIE-1551 Change hadoop-2 profile to use 2.2.0 (rkanter,rohini,mona via
rkanter)
Modified:
oozie/branches/branch-4.0/hadooplibs/hadoop-2/pom.xml
oozie/branches/branch-4.0/hadooplibs/hadoop-distcp-2/pom.xml
oozie/branches/branch-4.0/hadooplibs/hadoop-test-2/pom.xml
oozie/branches/branch-4.0/pom.xml
oozie/branches/branch-4.0/release-log.txt
oozie/branches/branch-4.0/sharelib/pig/pom.xml
Modified: oozie/branches/branch-4.0/hadooplibs/hadoop-2/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/hadooplibs/hadoop-2/pom.xml?rev=1535580&r1=1535579&r2=1535580&view=diff
==============================================================================
--- oozie/branches/branch-4.0/hadooplibs/hadoop-2/pom.xml (original)
+++ oozie/branches/branch-4.0/hadooplibs/hadoop-2/pom.xml Thu Oct 24 23:00:36
2013
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop</artifactId>
- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
+ <version>2.2.0.oozie-4.0.0</version>
<description>Apache Oozie Hadoop ${project.version}</description>
<name>Apache Oozie Hadoop ${project.version}</name>
<packaging>jar</packaging>
@@ -36,9 +36,14 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <artifactId>protobuf-java</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <version>2.5.0</version>
+ </dependency>
</dependencies>
<build>
Modified: oozie/branches/branch-4.0/hadooplibs/hadoop-distcp-2/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/hadooplibs/hadoop-distcp-2/pom.xml?rev=1535580&r1=1535579&r2=1535580&view=diff
==============================================================================
--- oozie/branches/branch-4.0/hadooplibs/hadoop-distcp-2/pom.xml (original)
+++ oozie/branches/branch-4.0/hadooplibs/hadoop-distcp-2/pom.xml Thu Oct 24
23:00:36 2013
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-distcp</artifactId>
- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
+ <version>2.2.0.oozie-4.0.0</version>
<description>Apache Oozie Hadoop Distcp ${project.version}</description>
<name>Apache Oozie Hadoop Distcp ${project.version}</name>
<packaging>jar</packaging>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: oozie/branches/branch-4.0/hadooplibs/hadoop-test-2/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/hadooplibs/hadoop-test-2/pom.xml?rev=1535580&r1=1535579&r2=1535580&view=diff
==============================================================================
--- oozie/branches/branch-4.0/hadooplibs/hadoop-test-2/pom.xml (original)
+++ oozie/branches/branch-4.0/hadooplibs/hadoop-test-2/pom.xml Thu Oct 24
23:00:36 2013
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-test</artifactId>
- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
+ <version>2.2.0.oozie-4.0.0</version>
<description>Apache Oozie Hadoop ${project.version} Test</description>
<name>Apache Oozie Hadoop ${project.version} Test</name>
<packaging>jar</packaging>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: oozie/branches/branch-4.0/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/pom.xml?rev=1535580&r1=1535579&r2=1535580&view=diff
==============================================================================
--- oozie/branches/branch-4.0/pom.xml (original)
+++ oozie/branches/branch-4.0/pom.xml Thu Oct 24 23:00:36 2013
@@ -1040,8 +1040,8 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <hadoop.version>2.2.0-SNAPSHOT</hadoop.version>
- <hadoop.auth.version>2.2.0-SNAPSHOT</hadoop.auth.version>
+ <hadoop.version>2.2.0</hadoop.version>
+ <hadoop.auth.version>2.2.0</hadoop.auth.version>
<pig.classifier>h2</pig.classifier>
<sqoop.classifier>hadoop200</sqoop.classifier>
</properties>
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1535580&r1=1535579&r2=1535580&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Thu Oct 24 23:00:36 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.1 release (unreleased)
+OOZIE-1551 Change hadoop-2 profile to use 2.2.0 (rkanter,rohini,mona via
rkanter)
OOZIE-1573 coord:tzOffset() gives incorrect offset for daylight saving
timezones (rohini)
OOZIE-1582 Bump up Tomcat version to 6.0.37 (rkanter)
OOZIE-1563 colt jar includes GPL licence (rkanter)
Modified: oozie/branches/branch-4.0/sharelib/pig/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/sharelib/pig/pom.xml?rev=1535580&r1=1535579&r2=1535580&view=diff
==============================================================================
--- oozie/branches/branch-4.0/sharelib/pig/pom.xml (original)
+++ oozie/branches/branch-4.0/sharelib/pig/pom.xml Thu Oct 24 23:00:36 2013
@@ -43,6 +43,12 @@
<artifactId>pig</artifactId>
<classifier>${pig.classifier}</classifier>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jline</groupId>
