Author: rkanter
Date: Mon Feb 4 17:54:58 2013
New Revision: 1442207
URL: http://svn.apache.org/viewvc?rev=1442207&view=rev
Log:
OOZIE-973 Allow Oozie to run against Hadoop trunk branch (rkanter via tucu)
Added:
oozie/branches/branch-3.3/hadooplibs/hadoop-3/
oozie/branches/branch-3.3/hadooplibs/hadoop-3/pom.xml
oozie/branches/branch-3.3/hadooplibs/hadoop-distcp-3/
oozie/branches/branch-3.3/hadooplibs/hadoop-distcp-3/pom.xml
oozie/branches/branch-3.3/hadooplibs/hadoop-test-3/
oozie/branches/branch-3.3/hadooplibs/hadoop-test-3/pom.xml
Modified:
oozie/branches/branch-3.3/hadooplibs/pom.xml
oozie/branches/branch-3.3/pom.xml
oozie/branches/branch-3.3/release-log.txt
Added: oozie/branches/branch-3.3/hadooplibs/hadoop-3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/hadooplibs/hadoop-3/pom.xml?rev=1442207&view=auto
==============================================================================
--- oozie/branches/branch-3.3/hadooplibs/hadoop-3/pom.xml (added)
+++ oozie/branches/branch-3.3/hadooplibs/hadoop-3/pom.xml Mon Feb 4 17:54:58
2013
@@ -0,0 +1,61 @@
+<?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>3.4.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop</artifactId>
+ <version>3.0.0-SNAPSHOT.oozie-3.4.0-SNAPSHOT</version>
+ <description>Apache Oozie Hadoop ${project.version}</description>
+ <name>Apache Oozie Hadoop ${project.version}</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>../../src/main/assemblies/hadooplib.xml</descriptor>
+ </descriptors>
+ <finalName>hadooplibs</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Added: oozie/branches/branch-3.3/hadooplibs/hadoop-distcp-3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/hadooplibs/hadoop-distcp-3/pom.xml?rev=1442207&view=auto
==============================================================================
--- oozie/branches/branch-3.3/hadooplibs/hadoop-distcp-3/pom.xml (added)
+++ oozie/branches/branch-3.3/hadooplibs/hadoop-distcp-3/pom.xml Mon Feb 4
17:54:58 2013
@@ -0,0 +1,45 @@
+<?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>3.4.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-distcp</artifactId>
+ <version>3.0.0-SNAPSHOT.oozie-3.4.0-SNAPSHOT</version>
+ <description>Apache Oozie Hadoop Distcp ${project.version}</description>
+ <name>Apache Oozie Hadoop Distcp ${project.version}</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+
Added: oozie/branches/branch-3.3/hadooplibs/hadoop-test-3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/hadooplibs/hadoop-test-3/pom.xml?rev=1442207&view=auto
==============================================================================
--- oozie/branches/branch-3.3/hadooplibs/hadoop-test-3/pom.xml (added)
+++ oozie/branches/branch-3.3/hadooplibs/hadoop-test-3/pom.xml Mon Feb 4
17:54:58 2013
@@ -0,0 +1,59 @@
+<?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>3.4.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-test</artifactId>
+ <version>3.0.0-SNAPSHOT.oozie-3.4.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-minicluster</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>../../src/main/assemblies/empty.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Modified: oozie/branches/branch-3.3/hadooplibs/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/hadooplibs/pom.xml?rev=1442207&r1=1442206&r2=1442207&view=diff
==============================================================================
--- oozie/branches/branch-3.3/hadooplibs/pom.xml (original)
+++ oozie/branches/branch-3.3/hadooplibs/pom.xml Mon Feb 4 17:54:58 2013
@@ -62,5 +62,18 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>hadoop-3</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>hadoop-3</module>
+ <module>hadoop-test-3</module>
+ <module>hadoop-distcp-3</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: oozie/branches/branch-3.3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/pom.xml?rev=1442207&r1=1442206&r2=1442207&view=diff
==============================================================================
--- oozie/branches/branch-3.3/pom.xml (original)
+++ oozie/branches/branch-3.3/pom.xml Mon Feb 4 17:54:58 2013
@@ -910,6 +910,16 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>hadoop-3</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
+ <hadoop.auth.version>3.0.0-SNAPSHOT</hadoop.auth.version>
+ </properties>
+ </profile>
</profiles>
</project>
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442207&r1=1442206&r2=1442207&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb 4 17:54:58 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-973 Allow Oozie to run against Hadoop trunk branch (rkanter via tucu)
OOZIE-984 Allow EL Functions in Coordinator timeout (rkanter via tucu)
OOZIE-972 Provide EL function to append a string in each substring of another
string separated by delimiter (kamrul via virag)
OOZIE-977 NotificationXCommand (job.notification queue entry) should set a
timeout in the HTTP connections it makes (tucu)
