You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ka...@apache.org on 2012/03/07 10:43:41 UTC
svn commit: r1297915 - in /incubator/oozie/branches/branch-3.1:
client/pom.xml core/pom.xml distro/pom.xml docs/pom.xml examples/pom.xml
minitest/pom.xml pom.xml release-log.txt sharelib/pom.xml webapp/pom.xml
Author: kamrul
Date: Wed Mar 7 09:43:41 2012
New Revision: 1297915
URL: http://svn.apache.org/viewvc?rev=1297915&view=rev
Log:
OOZIE-688: POM file changes for oozie version 3.1.4 having Hadoop 23 support(Mona via Mohammad)
Modified:
incubator/oozie/branches/branch-3.1/client/pom.xml
incubator/oozie/branches/branch-3.1/core/pom.xml
incubator/oozie/branches/branch-3.1/distro/pom.xml
incubator/oozie/branches/branch-3.1/docs/pom.xml
incubator/oozie/branches/branch-3.1/examples/pom.xml
incubator/oozie/branches/branch-3.1/minitest/pom.xml
incubator/oozie/branches/branch-3.1/pom.xml
incubator/oozie/branches/branch-3.1/release-log.txt
incubator/oozie/branches/branch-3.1/sharelib/pom.xml
incubator/oozie/branches/branch-3.1/webapp/pom.xml
Modified: incubator/oozie/branches/branch-3.1/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/client/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/client/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/client/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
</parent>
<artifactId>oozie-client</artifactId>
<description>Oozie Client</description>
Modified: incubator/oozie/branches/branch-3.1/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/core/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/core/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
</parent>
<artifactId>oozie-core</artifactId>
<description>Oozie Core</description>
@@ -73,22 +73,6 @@
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib</artifactId>
<scope>provided</scope>
@@ -124,7 +108,6 @@
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -190,6 +173,11 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
<scope>compile</scope>
</dependency>
@@ -234,6 +222,23 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-mrapp-generated-classpath</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <!-- needed to run the unit test for DS to generate the required classpath
+ that is required in the env of the launch container in the mini mr/yarn cluster -->
+ <outputFile>${project.build.directory}/test-classes/mrapp-generated-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -487,6 +492,55 @@
</dependencies>
</profile>
+ <profile>
+ <id>mr1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!mr2</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>mr2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>mr2</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
Modified: incubator/oozie/branches/branch-3.1/distro/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/distro/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/distro/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/distro/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
</parent>
<!-- calling the artifact oozie to the generated distro file is oozie- -->
<artifactId>oozie</artifactId>
Modified: incubator/oozie/branches/branch-3.1/docs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/docs/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/docs/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/docs/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
</parent>
<artifactId>oozie-docs</artifactId>
<description>Oozie Docs</description>
Modified: incubator/oozie/branches/branch-3.1/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/examples/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/examples/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/examples/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
</parent>
<artifactId>oozie-examples</artifactId>
<description>Oozie Examples</description>
@@ -56,24 +56,6 @@
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -133,6 +115,56 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>mr1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!mr2</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>mr2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>mr2</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Modified: incubator/oozie/branches/branch-3.1/minitest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/minitest/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/minitest/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/minitest/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.oozie.test</groupId>
<artifactId>oozie-mini</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
<repositories>
<repository>
<id>central</id>
@@ -59,13 +59,13 @@
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-core</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-core</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: incubator/oozie/branches/branch-3.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/pom.xml Wed Mar 7 09:43:41 2012
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
<description>Oozie Main</description>
<name>Oozie Main</name>
<packaging>pom</packaging>
@@ -60,6 +60,13 @@
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<hadoop.version>1.0.0</hadoop.version>
+ <!-- Can use either pig version 0.9.2 or 0.10.2 with Hadoop 23 -->
+ <pig.version>0.9.2</pig.version>
+ <!--
+ 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>0.23.1</hadoop.auth.version>
</properties>
<modules>
@@ -103,6 +110,14 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>apache.snapshots.repo</id>
+ <url>https://repository.apache.org/content/groups/snapshots</url>
+ <name>Apache Snapshots Repository</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
@@ -129,44 +144,50 @@
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-core</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-core</artifactId>
<classifier>tests</classifier>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-examples</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-docs</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-webapp</artifactId>
- <version>3.1.3-incubating</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<!-- client -->
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.auth.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
@@ -224,76 +245,10 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-streaming</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.pig</groupId>
- <artifactId>pig</artifactId>
- <version>0.9.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>0.9.94</version>
@@ -588,7 +543,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>${oozie.test.forkMode}</forkMode>
- <argLine>-Xmx1024m</argLine>
+ <argLine>-Xmx1024m -da -XX:MaxPermSize=512m</argLine>
<systemPropertiesVariables>
<hadoop.log.dir>/tmp</hadoop.log.dir>
<oozie.data.dir>${oozie.data.dir}</oozie.data.dir>
@@ -624,6 +579,123 @@
<profiles>
<profile>
+ <id>mr1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!mr2</name>
+ </property>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-streaming</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.9.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.8</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ <profile>
+ <id>mr2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>mr2</name>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>0.24.0-SNAPSHOT</hadoop.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-streaming</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>${pig.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ <profile>
<id>derby-test</id>
<activation>
<activeByDefault>false</activeByDefault>
Modified: incubator/oozie/branches/branch-3.1/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/release-log.txt?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.1/release-log.txt Wed Mar 7 09:43:41 2012
@@ -1,5 +1,6 @@
-- Oozie 3.1.4 release
+OOZIE-688: POM file changes for oozie version 3.1.4 having Hadoop 23 support(Mona via Mohammad)
OOZIE-733 Script to inject the JARs required by Oozie to run with Hadoop 23 (Mona via Mohammad)
-- Oozie 3.1.3 release
Modified: incubator/oozie/branches/branch-3.1/sharelib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/sharelib/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/sharelib/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/sharelib/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
</parent>
<artifactId>oozie-sharelib</artifactId>
<description>Oozie Share Lib</description>
@@ -30,28 +30,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-streaming</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.pig</groupId>
- <artifactId>pig</artifactId>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<scope>compile</scope>
@@ -96,5 +74,62 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>mr1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!mr2</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-streaming</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>mr2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>mr2</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-streaming</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: incubator/oozie/branches/branch-3.1/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/webapp/pom.xml?rev=1297915&r1=1297914&r2=1297915&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/webapp/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/webapp/pom.xml Wed Mar 7 09:43:41 2012
@@ -21,13 +21,17 @@
<parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-main</artifactId>
- <version>3.1.3-incubating</version>
+ <version>3.1.4</version>
</parent>
<artifactId>oozie-webapp</artifactId>
<description>Oozie WebApp</description>
<name>Oozie WebApp</name>
<packaging>war</packaging>
+ <properties>
+ <hadoop.jars.scope>provided</hadoop.jars.scope>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.oozie</groupId>
@@ -132,11 +136,23 @@
<name>includeHadoopJars</name>
</property>
</activation>
+ <properties>
+ <hadoop.jars.scope>compile</hadoop.jars.scope>
+ </properties>
+ </profile>
+ <profile>
+ <id>mr1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!mr2</name>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <scope>compile</scope>
+ <scope>${hadoop.jars.scope}</scope>
<exclusions>
<exclusion>
<groupId>commons-cli</groupId>
@@ -199,6 +215,22 @@
</dependencies>
</profile>
<profile>
+ <id>mr2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>mr2</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>${hadoop.jars.scope}</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>generateDocs</id>
<activation>
<activeByDefault>false</activeByDefault>