You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2013/04/12 20:12:21 UTC

svn commit: r1467391 - in /oozie/trunk: ./ core/src/test/java/org/apache/oozie/event/ hadooplibs/ hadooplibs/hadoop-0.23/ hadooplibs/hadoop-distcp-0.23/ hadooplibs/hadoop-test-0.23/

Author: mona
Date: Fri Apr 12 18:12:21 2013
New Revision: 1467391

URL: http://svn.apache.org/r1467391
Log:
OOZIE-1292 OOZIE-1317 (mona)

Added:
    oozie/trunk/hadooplibs/hadoop-0.23/
    oozie/trunk/hadooplibs/hadoop-0.23/pom.xml
    oozie/trunk/hadooplibs/hadoop-distcp-0.23/
    oozie/trunk/hadooplibs/hadoop-distcp-0.23/pom.xml
    oozie/trunk/hadooplibs/hadoop-test-0.23/
    oozie/trunk/hadooplibs/hadoop-test-0.23/pom.xml
Modified:
    oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
    oozie/trunk/hadooplibs/pom.xml
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java?rev=1467391&r1=1467390&r2=1467391&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java Fri Apr 12 18:12:21 2013
@@ -205,7 +205,6 @@ public class TestEventGeneration extends
         assertEquals(action.getJobId(), event.getParentId());
         assertEquals(action.getNominalTime(), event.getNominalTime());
         assertEquals(action.getCreatedTime(), event.getStartTime());
-        assertNotNull(event.getMissingDeps());
         assertEquals(coord.getUser(), event.getUser());
         assertEquals(coord.getAppName(), event.getAppName());
         assertEquals(0, queue.getCurrentSize());

Added: oozie/trunk/hadooplibs/hadoop-0.23/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/hadooplibs/hadoop-0.23/pom.xml?rev=1467391&view=auto
==============================================================================
--- oozie/trunk/hadooplibs/hadoop-0.23/pom.xml (added)
+++ oozie/trunk/hadooplibs/hadoop-0.23/pom.xml Fri Apr 12 18:12:21 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>4.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <groupId>org.apache.oozie</groupId>
+    <artifactId>oozie-hadoop</artifactId>
+    <version>0.23.6.oozie-4.1.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>0.23.6</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/trunk/hadooplibs/hadoop-distcp-0.23/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/hadooplibs/hadoop-distcp-0.23/pom.xml?rev=1467391&view=auto
==============================================================================
--- oozie/trunk/hadooplibs/hadoop-distcp-0.23/pom.xml (added)
+++ oozie/trunk/hadooplibs/hadoop-distcp-0.23/pom.xml Fri Apr 12 18:12:21 2013
@@ -0,0 +1,51 @@
+<?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.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <groupId>org.apache.oozie</groupId>
+    <artifactId>oozie-hadoop-distcp</artifactId>
+    <version>0.23.6.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>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-distcp</artifactId>
+            <version>0.23.6</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hadoop-core</artifactId>
+                    <groupId>org.apache.hadoop</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+</project>
+

Added: oozie/trunk/hadooplibs/hadoop-test-0.23/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/hadooplibs/hadoop-test-0.23/pom.xml?rev=1467391&view=auto
==============================================================================
--- oozie/trunk/hadooplibs/hadoop-test-0.23/pom.xml (added)
+++ oozie/trunk/hadooplibs/hadoop-test-0.23/pom.xml Fri Apr 12 18:12:21 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>4.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <groupId>org.apache.oozie</groupId>
+    <artifactId>oozie-hadoop-test</artifactId>
+    <version>0.23.6.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>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-minicluster</artifactId>
+            <version>0.23.6</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/trunk/hadooplibs/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/hadooplibs/pom.xml?rev=1467391&r1=1467390&r2=1467391&view=diff
==============================================================================
--- oozie/trunk/hadooplibs/pom.xml (original)
+++ oozie/trunk/hadooplibs/pom.xml Fri Apr 12 18:12:21 2013
@@ -38,6 +38,9 @@
         <module>hadoop-2</module>
         <module>hadoop-test-2</module>
         <module>hadoop-distcp-2</module>
+        <module>hadoop-0.23</module>
+        <module>hadoop-test-0.23</module>
+        <module>hadoop-distcp-0.23</module>
     </modules>
 
     <build>

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1467391&r1=1467390&r2=1467391&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Apr 12 18:12:21 2013
@@ -1,5 +1,7 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1317 TestEventGeneration.testCoordinatorActionEvent fails (mona)
+OOZIE-1292 Add Hadoop 0.23 Poms in hadooplibs to enable a build/tests against branch 0.23 (mona)
 OOZIE-1320 Tests for sharelib actions fail with ClassNotFoundException against Hadoop 2 (rkanter)
 OOZIE-1311 Refactor action Main classes into sharelibs (rkanter)
 OOZIE-897 remove special build handling for sqoop testcase (rkanter)