OOZIE-1830 Change hadoop-1 profile to use 1.2.1 (seoeun25 via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/1ea1717b Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/1ea1717b Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/1ea1717b Branch: refs/remotes/trunk Commit: 1ea1717bb83492a36749b8e7db1952afb223bcb9 Parents: cbcc64b Author: Robert Kanter <[email protected]> Authored: Fri Aug 29 13:35:12 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Aug 29 13:54:47 2014 -0700 ---------------------------------------------------------------------- client/pom.xml | 16 +-- core/pom.xml | 4 +- .../lite/TestLiteWorkflowAppParser.java | 6 + docs/src/site/twiki/ENG_Building.twiki | 8 +- hadooplibs/hadoop-1/pom.xml | 4 +- hadooplibs/hadoop-auth-0.23/pom.xml | 56 ++++++++ hadooplibs/hadoop-auth-1/pom.xml | 132 +++++++++++++++++++ hadooplibs/hadoop-auth-2/pom.xml | 56 ++++++++ hadooplibs/hadoop-distcp-1/pom.xml | 4 +- hadooplibs/hadoop-test-1/pom.xml | 4 +- hadooplibs/hadoop-utils-1/pom.xml | 2 +- hadooplibs/pom.xml | 3 + pom.xml | 21 +-- release-log.txt | 1 + .../hadoop/TestMapReduceActionExecutor.java | 16 ++- .../TestMapReduceActionExecutorUberJar.java | 77 ----------- tools/pom.xml | 4 +- 17 files changed, 287 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index a52060b..365276d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -73,21 +73,9 @@ <artifactId>activemq-client</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 5b2eedc..59b6ecd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -72,8 +72,8 @@ <scope>compile</scope> <exclusions> <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java index b47f808..578e3c5 100644 --- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java +++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java @@ -94,6 +94,8 @@ public class TestLiteWorkflowAppParser extends XTestCase { "</map-reduce>"; d = d.replaceAll(" xmlns=?(\"|\')(\"|\')", ""); d = d.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2 + d = d.replaceAll("\\s*<!--Loaded from Unknown-->", ""); // remove the <!--LoadedfromUnknown--> added by Hadoop 1.2.1 + System.out.println("\n" + d +"\n"); assertEquals(expectedD.replaceAll(" ",""), d.replaceAll(" ", "")); } @@ -138,6 +140,7 @@ public class TestLiteWorkflowAppParser extends XTestCase { "</map-reduce>"; d = d.replaceAll(" xmlns=?(\"|\')(\"|\')", ""); d = d.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2 + d = d.replaceAll("\\s*<!--Loaded from Unknown-->", ""); // remove the <!--LoadedfromUnknown--> added by Hadoop 1.2.1 assertEquals(expectedD.replaceAll(" ",""), d.replaceAll(" ", "")); } @@ -177,6 +180,7 @@ public class TestLiteWorkflowAppParser extends XTestCase { "</pig>"; e = e.replaceAll(" xmlns=?(\"|\')(\"|\')", ""); e = e.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2 + e = e.replaceAll("\\s*<!--Loaded from Unknown-->", ""); // remove the <!--LoadedfromUnknown--> added by Hadoop 1.2.1 assertEquals(expectedE.replaceAll(" ", ""), e.replaceAll(" ", "")); } @@ -219,6 +223,7 @@ public class TestLiteWorkflowAppParser extends XTestCase { "</hive>"; a = a.replaceAll(" xmlns=?(\"|\')(\"|\')", ""); a = a.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2 + a = a.replaceAll("\\s*<!--Loaded from Unknown-->", ""); // remove the <!--LoadedfromUnknown--> added by Hadoop 1.2.1 assertEquals(expectedA.replaceAll(" ",""), a.replaceAll(" ", "")); } @@ -255,6 +260,7 @@ public class TestLiteWorkflowAppParser extends XTestCase { "</distcp>"; b = b.replaceAll(" xmlns=?(\"|\')(\"|\')", ""); b = b.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2 + b = b.replaceAll("\\s*<!--Loaded from Unknown-->", ""); // remove the <!--LoadedfromUnknown--> added by Hadoop 1.2.1 assertEquals(expectedB.replaceAll(" ",""), b.replaceAll(" ", "")); } http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/docs/src/site/twiki/ENG_Building.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/ENG_Building.twiki b/docs/src/site/twiki/ENG_Building.twiki index 49e2cb5..8d74b72 100644 --- a/docs/src/site/twiki/ENG_Building.twiki +++ b/docs/src/site/twiki/ENG_Building.twiki @@ -112,10 +112,9 @@ Except for the options marked with =(*)=, the options can be specified in the =t of the Oozie project. The options marked with =(*)= are used in Maven POMs, thus they don't take effect if specified in the =test.properties= file (which is loaded by the =XTestCase= class at class initialization time). -*includeHadoopJars* (*): includes Hadoop JARs and its transitive dependencies in the Oozie WAR file, default is -undefined (Hadoop JARs are not included). - -*hadoop.version* =(*)=: indicates the Hadoop version(Hadoop-1 or Hadoop-2) you wish to build Oozie against specifically. It will substitute this value in the Oozie POM properties and pull the corresponding Hadoop artifacts from Maven. Default version is 1.0.1 for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is *2.0.0-alpha*. +*hadoop.version* =(*)=: indicates the Hadoop version(Hadoop-1 or Hadoop-2) you wish to build Oozie against specifically. It will +substitute this value in the Oozie POM properties and pull the corresponding Hadoop artifacts from Maven. Default version is 1.2.1 +for Hadoop-1 (the most common case). For Hadoop-2, the version you can pass is *2.3.0*. *generateSite* (*): generates Oozie documentation, default is undefined (no documentation is generated) @@ -226,7 +225,6 @@ $ mvn clean package assembly:single -Dhadoop.version=2.0.0-alpha If none of these parameters are specified, the defaults are * -Dhadoop.version : *1.0.1* - * -Dhadoop.auth.version : *2.0.0-alpha* * -Dpig.version : *0.9.0* *IMPORTANT:* It is strongly recommend to use a [[http://bigtop.apache.org][Bigtop]] distribution if using Hadoop 2.x because the http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/hadoop-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-1/pom.xml b/hadooplibs/hadoop-1/pom.xml index 8116b24..f0a32a5 100644 --- a/hadooplibs/hadoop-1/pom.xml +++ b/hadooplibs/hadoop-1/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop</artifactId> - <version>1.1.1.oozie-4.2.0-SNAPSHOT</version> + <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop ${project.version}</description> <name>Apache Oozie Hadoop ${project.version}</name> <packaging>jar</packaging> @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>1.1.1</version> + <version>1.2.1</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/hadoop-auth-0.23/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-auth-0.23/pom.xml b/hadooplibs/hadoop-auth-0.23/pom.xml new file mode 100644 index 0000000..59cc7f1 --- /dev/null +++ b/hadooplibs/hadoop-auth-0.23/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-main</artifactId> + <version>4.2.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> + <version>0.23.5.oozie-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop ${project.version} Test</description> + <name>Apache Oozie Hadoop ${project.version} Test</name> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>0.23.5</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + +</project> + http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/hadoop-auth-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-auth-1/pom.xml b/hadooplibs/hadoop-auth-1/pom.xml new file mode 100644 index 0000000..7da7639 --- /dev/null +++ b/hadooplibs/hadoop-auth-1/pom.xml @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-main</artifactId> + <version>4.2.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> + <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop ${project.version} Test</description> + <name>Apache Oozie Hadoop ${project.version} Test</name> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>1.2.1</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </exclusion> + <exclusion> + <groupId>xmlenc</groupId> + <artifactId>xmlenc</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + </exclusion> + <exclusion> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + </exclusion> + <exclusion> + <groupId>commons-el</groupId> + <artifactId>commons-el</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-api-2.1</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + </exclusion> + <exclusion> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + <exclusion> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jdt</groupId> + <artifactId>core</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + +</project> + http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/hadoop-auth-2/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-auth-2/pom.xml b/hadooplibs/hadoop-auth-2/pom.xml new file mode 100644 index 0000000..cbdb523 --- /dev/null +++ b/hadooplibs/hadoop-auth-2/pom.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-main</artifactId> + <version>4.2.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> + <version>2.3.0.oozie-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop ${project.version} Test</description> + <name>Apache Oozie Hadoop ${project.version} Test</name> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>2.3.0</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + +</project> + http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/hadoop-distcp-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-distcp-1/pom.xml b/hadooplibs/hadoop-distcp-1/pom.xml index fb09f64..01eb123 100644 --- a/hadooplibs/hadoop-distcp-1/pom.xml +++ b/hadooplibs/hadoop-distcp-1/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-distcp</artifactId> - <version>1.1.1.oozie-4.2.0-SNAPSHOT</version> + <version>1.2.1.oozie-4.2.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-tools</artifactId> - <version>1.1.1</version> + <version>1.2.1</version> <scope>compile</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/hadoop-test-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-test-1/pom.xml b/hadooplibs/hadoop-test-1/pom.xml index e124e24..baf5a4c 100644 --- a/hadooplibs/hadoop-test-1/pom.xml +++ b/hadooplibs/hadoop-test-1/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-test</artifactId> - <version>1.1.1.oozie-4.2.0-SNAPSHOT</version> + <version>1.2.1.oozie-4.2.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>1.1.1</version> + <version>1.2.1</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/hadoop-utils-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-utils-1/pom.xml b/hadooplibs/hadoop-utils-1/pom.xml index dfeb4ff..c81ea91 100644 --- a/hadooplibs/hadoop-utils-1/pom.xml +++ b/hadooplibs/hadoop-utils-1/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-utils</artifactId> - <version>1.1.1.oozie-4.2.0-SNAPSHOT</version> + <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop Utils ${project.version}</description> <name>Apache Oozie Hadoop Utils ${project.version}</name> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/hadooplibs/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/pom.xml b/hadooplibs/pom.xml index 29c891a..e5ea2e7 100644 --- a/hadooplibs/pom.xml +++ b/hadooplibs/pom.xml @@ -36,14 +36,17 @@ <module>hadoop-distcp-1</module> <module>hadoop-test-1</module> <module>hadoop-utils-1</module> + <module>hadoop-auth-1</module> <module>hadoop-2</module> <module>hadoop-test-2</module> <module>hadoop-distcp-2</module> <module>hadoop-utils-2</module> + <module>hadoop-auth-2</module> <module>hadoop-0.23</module> <module>hadoop-test-0.23</module> <module>hadoop-distcp-0.23</module> <module>hadoop-utils-0.23</module> + <module>hadoop-auth-0.23</module> </modules> <build> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 835ec19..0b19431 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ </oozie.test.default.config.file> <oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file> - <hadoop.version>1.1.1</hadoop.version> + <hadoop.version>1.2.1</hadoop.version> <hbase.version>0.94.2</hbase.version> <hcatalog.version>0.13.1</hcatalog.version> @@ -77,11 +77,6 @@ <hcataloglib.version>${hcatalog.version}.oozie-${project.version}</hcataloglib.version> <clover.license>/home/jenkins/tools/clover/latest/lib/clover.license</clover.license> - <!-- - This is required while we support a a pre 0.23 version of Hadoop which does not have - the hadoop-auth artifact. After we phase-out pre 0.23 we can get rid of this property. - --> - <hadoop.auth.version>2.0.2-alpha</hadoop.auth.version> <!-- Sharelib component versions --> <hive.version>0.13.1</hive.version> @@ -256,9 +251,9 @@ <!-- client --> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop.auth.version}</version> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> + <version>${hadooplib.version}</version> </dependency> <dependency> @@ -1026,11 +1021,6 @@ --> <exclude>**/TestSsh*.java</exclude> - <!-- Explictly use -Dtest=TestMapReduceActionExecutorUberJar to test the uber jar functionality. - Requires at least Hadoop 1.2.0 or 2.2.0. - --> - <exclude>**/TestMapReduceActionExecutorUberJar.java</exclude> - <!-- Explictly use -Dtest=TestZKUtilsWithSecurity to test the ZKUtils with security. It can conflict with other non-secure tests that use zookeeper --> @@ -1130,7 +1120,6 @@ </activation> <properties> <hadoop.version>0.23.5</hadoop.version> - <hadoop.auth.version>0.23.5</hadoop.auth.version> <pig.classifier>h2</pig.classifier> <sqoop.classifier>hadoop23</sqoop.classifier> </properties> @@ -1142,7 +1131,6 @@ </activation> <properties> <hadoop.version>2.3.0</hadoop.version> - <hadoop.auth.version>2.3.0</hadoop.auth.version> <pig.classifier>h2</pig.classifier> <sqoop.classifier>hadoop200</sqoop.classifier> </properties> @@ -1154,7 +1142,6 @@ </activation> <properties> <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> - <hadoop.auth.version>3.0.0-SNAPSHOT</hadoop.auth.version> <pig.classifier>h2</pig.classifier> <sqoop.classifier>hadoop200</sqoop.classifier> </properties> http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index c87db1f..cd33bc2 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-1830 Change hadoop-1 profile to use 1.2.1 (seoeun25 via rkanter) OOZIE-1677 Add Oozie servers to instrumentation info (rkanter) OOZIE-1968 Building modules independently (shwethags) OOZIE-1939 Incorrect job information is set while logging (seoeun25 via shwethags) http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java index e78c98a..8093a30 100644 --- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java +++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java @@ -657,9 +657,6 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { } // With the oozie.action.mapreduce.uber.jar.enable property set to false, a workflow with an uber jar should fail - // (this happens before we get to Hadoop, so not having the correct version of Hadoop doesn't matter here; the - // TestMapReduceActionExecutorUberJar.testMapReduceWithUberJarEnabled() test actually tests the uber jar functionality, but - // this test is excluded by default) public void testMapReduceWithUberJarDisabled() throws Exception { Services serv = Services.get(); boolean originalUberJarDisabled = serv.getConf().getBoolean("oozie.action.mapreduce.uber.jar.enable", false); @@ -678,6 +675,19 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { } } + public void testMapReduceWithUberJarEnabled() throws Exception { + Services serv = Services.get(); + boolean originalUberJarDisabled = serv.getConf().getBoolean("oozie.action.mapreduce.uber.jar.enable", false); + try { + serv.getConf().setBoolean("oozie.action.mapreduce.uber.jar.enable", true); + _testMapReduceWithUberJar(); + } catch (Exception e) { + throw e; + } finally { + serv.getConf().setBoolean("oozie.action.mapreduce.uber.jar.enable", originalUberJarDisabled); + } + } + protected XConfiguration getStreamingConfig(String inputDir, String outputDir) { XConfiguration conf = new XConfiguration(); conf.set("mapred.input.dir", inputDir); http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutorUberJar.java ---------------------------------------------------------------------- diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutorUberJar.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutorUberJar.java deleted file mode 100644 index bcc22f2..0000000 --- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutorUberJar.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.oozie.action.hadoop; - -import org.apache.oozie.service.Services; - -public class TestMapReduceActionExecutorUberJar extends TestMapReduceActionExecutor { - - // This test requires at least Hadoop 2.2.x or 1.2.x or it will fail so it is excluded from the default tests in the pom.xml - public void testMapReduceWithUberJarEnabled() throws Exception { - Services serv = Services.get(); - boolean originalUberJarDisabled = serv.getConf().getBoolean("oozie.action.mapreduce.uber.jar.enable", false); - try { - serv.getConf().setBoolean("oozie.action.mapreduce.uber.jar.enable", true); - _testMapReduceWithUberJar(); - } catch (Exception e) { - throw e; - } finally { - serv.getConf().setBoolean("oozie.action.mapreduce.uber.jar.enable", originalUberJarDisabled); - } - } - - @Override - public void testDefaultShareLibName() { - // skip test - } - - @Override - public void testMapReduce() throws Exception { - // skip test - } - - @Override - public void testMapReduceWithCredentials() throws Exception { - // skip test - } - - @Override - public void testMapReduceWithUberJarDisabled() throws Exception { - // skip test - } - - @Override - public void testSetExecutionStats_when_user_has_specified_stats_write_FALSE() throws Exception { - // skip test - } - - @Override - public void testSetExecutionStats_when_user_has_specified_stats_write_TRUE() throws Exception { - // skip test - } - - @Override - public void testStreaming() throws Exception { - // skip test - } - - @Override - public void testPipes() throws Exception { - // skip test - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/oozie/blob/1ea1717b/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index a8c69cc..80fa425 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -73,8 +73,8 @@ <artifactId>oozie-client</artifactId> <exclusions> <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-auth</artifactId> </exclusion> </exclusions> </dependency>
