Author: rkanter
Date: Thu Oct 24 23:00:33 2013
New Revision: 1535579
URL: http://svn.apache.org/r1535579
Log:
OOZIE-1551 Change hadoop-2 profile to use 2.2.0 (rkanter,rohini,mona via
rkanter)
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
oozie/trunk/hadooplibs/hadoop-2/pom.xml
oozie/trunk/hadooplibs/hadoop-distcp-2/pom.xml
oozie/trunk/hadooplibs/hadoop-test-2/pom.xml
oozie/trunk/pom.xml
oozie/trunk/release-log.txt
oozie/trunk/sharelib/pig/pom.xml
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestShareLibService.java?rev=1535579&r1=1535578&r2=1535579&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
Thu Oct 24 23:00:33 2013
@@ -100,42 +100,56 @@ public class TestShareLibService extends
public void testCreateLauncherLibPath() throws Exception {
services = new Services();
setSystemProps();
- services.init();
- ShareLibService shareLibService =
Services.get().get(ShareLibService.class);
- List<Path> launcherPath =
shareLibService.getActionSystemLibCommonJars(JavaActionExecutor.OOZIE_COMMON_LIBDIR);
- assertNotNull(launcherPath);
- assertTrue(getFileSystem().exists(launcherPath.get(0)));
- List<Path> pigLauncherPath =
shareLibService.getActionSystemLibCommonJars("pig");
- assertTrue(getFileSystem().exists(pigLauncherPath.get(0)));
- services.destroy();
+ try {
+ services.init();
+ ShareLibService shareLibService =
Services.get().get(ShareLibService.class);
+ List<Path> launcherPath =
shareLibService.getActionSystemLibCommonJars(JavaActionExecutor.OOZIE_COMMON_LIBDIR);
+ assertNotNull(launcherPath);
+ assertTrue(getFileSystem().exists(launcherPath.get(0)));
+ List<Path> pigLauncherPath =
shareLibService.getActionSystemLibCommonJars("pig");
+ assertTrue(getFileSystem().exists(pigLauncherPath.get(0)));
+ }
+ finally {
+ services.destroy();
+ }
}
@Test
public void testAddShareLibDistributedCache() throws Exception {
services = new Services();
setSystemProps();
- services.init();
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() +
"</job-tracker>" +
- "<name-node>" + getNameNodeUri() + "</name-node>" +
- "</java>";
- Element eActionXml = XmlUtils.parseXml(actionXml);
- XConfiguration protoConf = new XConfiguration();
- protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
- WorkflowJobBean wfj = new WorkflowJobBean();
- wfj.setProtoActionConf(XmlUtils.prettyPrint(protoConf).toString());
- wfj.setConf(XmlUtils.prettyPrint(new XConfiguration()).toString());
- Context context = new TestJavaActionExecutor().new Context(wfj, new
WorkflowActionBean());
- PigActionExecutor ae = new PigActionExecutor();
- Configuration jobConf = ae.createBaseHadoopConf(context, eActionXml);
- ae.setLibFilesArchives(context, eActionXml, new
Path("hdfs://dummyAppPath"), jobConf);
-
- URI[] cacheFiles = DistributedCache.getCacheFiles(jobConf);
- String cacheFilesStr = Arrays.toString(cacheFiles);
- assertEquals(2, cacheFiles.length);
- assertTrue(cacheFilesStr.contains(MyPig.class.getName() + ".jar"));
- assertTrue(cacheFilesStr.contains(MyOozie.class.getName() + ".jar"));
- services.destroy();
-
+ try {
+ services.init();
+ String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri()
+ "</job-tracker>" +
+ "<name-node>" + getNameNodeUri() + "</name-node>" +
+ "</java>";
+ Element eActionXml = XmlUtils.parseXml(actionXml);
+ XConfiguration protoConf = new XConfiguration();
+ protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
+ WorkflowJobBean wfj = new WorkflowJobBean();
+ wfj.setProtoActionConf(XmlUtils.prettyPrint(protoConf).toString());
+ wfj.setConf(XmlUtils.prettyPrint(new XConfiguration()).toString());
+ Context context = new TestJavaActionExecutor().new Context(wfj,
new WorkflowActionBean());
+ PigActionExecutor ae = new PigActionExecutor();
+ Configuration jobConf = ae.createBaseHadoopConf(context,
eActionXml);
+ ae.setLibFilesArchives(context, eActionXml, new
Path("hdfs://dummyAppPath"), jobConf);
+
+ URI[] cacheFiles = DistributedCache.getCacheFiles(jobConf);
+ String cacheFilesStr = Arrays.toString(cacheFiles);
+ assertTrue(cacheFilesStr.contains(MyPig.class.getName() + ".jar"));
+ assertTrue(cacheFilesStr.contains(MyOozie.class.getName() +
".jar"));
+ // Hadoop 2 has two extra jars
+ if (cacheFiles.length == 4) {
+ assertTrue(cacheFilesStr.contains("MRAppJar.jar"));
+
assertTrue(cacheFilesStr.contains("hadoop-mapreduce-client-jobclient-"));
+ }
+ else {
+ assertEquals(2, cacheFiles.length);
+ }
+ }
+ finally {
+ services.destroy();
+ }
}
@Test
@@ -163,12 +177,16 @@ public class TestShareLibService extends
fs.mkdirs(expirePath);
fs.mkdirs(noexpirePath);
fs.mkdirs(noexpirePath1);
- services.init();
- assertEquals(3, fs.listStatus(basePath).length);
- assertTrue(fs.exists(noexpirePath));
- assertTrue(fs.exists(noexpirePath1));
- assertTrue(!fs.exists(expirePath));
- services.destroy();
+ try {
+ services.init();
+ assertEquals(3, fs.listStatus(basePath).length);
+ assertTrue(fs.exists(noexpirePath));
+ assertTrue(fs.exists(noexpirePath1));
+ assertTrue(!fs.exists(expirePath));
+ }
+ finally {
+ services.destroy();
+ }
}
}
Modified: oozie/trunk/hadooplibs/hadoop-2/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/hadooplibs/hadoop-2/pom.xml?rev=1535579&r1=1535578&r2=1535579&view=diff
==============================================================================
--- oozie/trunk/hadooplibs/hadoop-2/pom.xml (original)
+++ oozie/trunk/hadooplibs/hadoop-2/pom.xml Thu Oct 24 23:00:33 2013
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop</artifactId>
- <version>2.2.0-SNAPSHOT.oozie-4.1.0-SNAPSHOT</version>
+ <version>2.2.0.oozie-4.1.0-SNAPSHOT</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/trunk/hadooplibs/hadoop-distcp-2/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/hadooplibs/hadoop-distcp-2/pom.xml?rev=1535579&r1=1535578&r2=1535579&view=diff
==============================================================================
--- oozie/trunk/hadooplibs/hadoop-distcp-2/pom.xml (original)
+++ oozie/trunk/hadooplibs/hadoop-distcp-2/pom.xml Thu Oct 24 23:00:33 2013
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-distcp</artifactId>
- <version>2.2.0-SNAPSHOT.oozie-4.1.0-SNAPSHOT</version>
+ <version>2.2.0.oozie-4.1.0-SNAPSHOT</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/trunk/hadooplibs/hadoop-test-2/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/hadooplibs/hadoop-test-2/pom.xml?rev=1535579&r1=1535578&r2=1535579&view=diff
==============================================================================
--- oozie/trunk/hadooplibs/hadoop-test-2/pom.xml (original)
+++ oozie/trunk/hadooplibs/hadoop-test-2/pom.xml Thu Oct 24 23:00:33 2013
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-test</artifactId>
- <version>2.2.0-SNAPSHOT.oozie-4.1.0-SNAPSHOT</version>
+ <version>2.2.0.oozie-4.1.0-SNAPSHOT</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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1535579&r1=1535578&r2=1535579&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Thu Oct 24 23:00:33 2013
@@ -1088,8 +1088,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/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1535579&r1=1535578&r2=1535579&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Oct 24 23:00:33 2013
@@ -60,6 +60,7 @@ OOZIE-1440 Build fails in certain enviro
-- 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/trunk/sharelib/pig/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/sharelib/pig/pom.xml?rev=1535579&r1=1535578&r2=1535579&view=diff
==============================================================================
--- oozie/trunk/sharelib/pig/pom.xml (original)
+++ oozie/trunk/sharelib/pig/pom.xml Thu Oct 24 23:00:33 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>
