You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2013/02/13 01:52:00 UTC
svn commit: r1445444 - in /oozie/branches/hcat-intre: minitest/pom.xml
minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java
release-log.txt
Author: virag
Date: Wed Feb 13 00:51:59 2013
New Revision: 1445444
URL: http://svn.apache.org/r1445444
Log:
OOZIE-1170 Update minitest module (MiniOozie) to use main pom as its parent (jaoki via virag)
Modified:
oozie/branches/hcat-intre/minitest/pom.xml
oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java
oozie/branches/hcat-intre/release-log.txt
Modified: oozie/branches/hcat-intre/minitest/pom.xml
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/minitest/pom.xml?rev=1445444&r1=1445443&r2=1445444&view=diff
==============================================================================
--- oozie/branches/hcat-intre/minitest/pom.xml (original)
+++ oozie/branches/hcat-intre/minitest/pom.xml Wed Feb 13 00:51:59 2013
@@ -17,148 +17,86 @@
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>
- <groupId>org.apache.oozie.test</groupId>
- <artifactId>oozie-mini</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <repositories>
- <repository>
- <id>central</id>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>Codehaus repository</id>
- <url>http://repository.codehaus.org/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>m2apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <test.exclude>_</test.exclude>
- <test.exclude.pattern>_</test.exclude.pattern>
- <oozie.data.dir>${project.build.directory}/test-data</oozie.data.dir>
- </properties>
+ <parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-main</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.oozie</groupId>
- <artifactId>oozie-core</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.oozie</groupId>
- <artifactId>oozie-core</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>0.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <groupId>org.apache.oozie.test</groupId>
+ <artifactId>oozie-mini</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <description>Apache Oozie MiniOozie</description>
+ <name>Apache Oozie MiniOozie</name>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>0.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <plugins>
+ <build>
+ <plugins>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <!-- excluding all as the root POM does the full check-->
- <exclude>**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- <argLine>-Xmx1024m</argLine>
- <systemPropertiesVariables>
- <hadoop.log.dir>/tmp</hadoop.log.dir>
- <oozie.data.dir>${oozie.data.dir}</oozie.data.dir>
- </systemPropertiesVariables>
- <excludes>
- <exclude>**/${test.exclude}.java</exclude>
- <exclude>${test.exclude.pattern}</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <!-- minitest does not necessary have .java files under src/main
+ and this causes [WARNING] JAR will be empty upon mvn package -->
+ <phase>never</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java?rev=1445444&r1=1445443&r2=1445444&view=diff
==============================================================================
--- oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java (original)
+++ oozie/branches/hcat-intre/minitest/src/test/java/org/apache/oozie/test/WorkflowTest.java Wed Feb 13 00:51:59 2013
@@ -68,7 +68,6 @@ public class WorkflowTest extends MiniOo
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.APP_PATH, appPath.toString() + File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
- conf.setProperty(OozieClient.GROUP_NAME, getTestGroup());
final String jobId = wc.submit(conf);
@@ -112,7 +111,6 @@ public class WorkflowTest extends MiniOo
Properties conf = wc.createConfiguration();
conf.setProperty(OozieClient.APP_PATH, appPath.toString() + File.separator + "workflow.xml");
conf.setProperty(OozieClient.USER_NAME, getTestUser());
- conf.setProperty(OozieClient.GROUP_NAME, getTestGroup());
conf.setProperty("nnbase", path.toString());
conf.setProperty("base", path.toUri().getPath());
Modified: oozie/branches/hcat-intre/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1445444&r1=1445443&r2=1445444&view=diff
==============================================================================
--- oozie/branches/hcat-intre/release-log.txt (original)
+++ oozie/branches/hcat-intre/release-log.txt Wed Feb 13 00:51:59 2013
@@ -14,6 +14,7 @@ OOZIE-944 Implement Workflow Generator U
-- Oozie 3.3.2 unreleased
+OOZIE-1170 Update minitest module (MiniOozie) to use main pom as its parent (jaoki via virag)
OOZIE-1196 HCat EL functions for database and table should be modified (mona)
OOZIE-1210 Rework uri handling for Prepare actions and jms server mapping (rohini via virag)
OOZIE-1179 coord action in WAITING when no definition of dataset in coord job xml (mona)