Author: tucu
Date: Fri Feb 10 23:17:38 2012
New Revision: 1242972
URL: http://svn.apache.org/viewvc?rev=1242972&view=rev
Log:
OOZIE-601 Oozie's POMs should use org.apache.oozie as group (tucu)
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/client/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/client/pom.xml Fri Feb 10 23:17:38 2012
@@ -28,18 +28,6 @@
<name>Oozie Client</name>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
- </organization>
-
<dependencies>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/core/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/core/pom.xml Fri Feb 10 23:17:38 2012
@@ -28,18 +28,6 @@
<name>Oozie Core</name>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
- </organization>
-
<dependencies>
<dependency>
@@ -85,17 +73,20 @@
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <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>
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/distro/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/distro/pom.xml Fri Feb 10 23:17:38 2012
@@ -29,18 +29,6 @@
<name>Oozie Distro</name>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
- </organization>
-
<dependencies>
<dependency>
<groupId>org.apache.oozie</groupId>
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/docs/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/docs/pom.xml Fri Feb 10 23:17:38 2012
@@ -28,18 +28,6 @@
<name>Oozie Docs</name>
<packaging>war</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
- </organization>
-
<dependencies>
<dependency>
<groupId>org.apache.oozie</groupId>
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/examples/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/examples/pom.xml Fri Feb 10 23:17:38
2012
@@ -28,18 +28,6 @@
<name>Oozie Examples</name>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
- </organization>
-
<dependencies>
<dependency>
@@ -68,18 +56,22 @@
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <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>
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/minitest/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/minitest/pom.xml Fri Feb 10 23:17:38
2012
@@ -38,13 +38,6 @@
</snapshots>
</repository>
<repository>
- <id>yahoo.github</id>
- <url>http://yahoo.github.com/maven/repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
<id>m2apache.snapshots</id>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
<releases>
@@ -77,17 +70,23 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>0.20.104.2</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>0.20.104.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
Modified: incubator/oozie/branches/branch-3.1/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/pom.xml?rev=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/pom.xml Fri Feb 10 23:17:38 2012
@@ -33,8 +33,8 @@
</licenses>
<organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
</organization>
<scm>
@@ -58,6 +58,8 @@
<oozie.data.dir>${project.build.directory}/test-data</oozie.data.dir>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+
+ <hadoop.version>1.0.0</hadoop.version>
</properties>
<modules>
@@ -101,13 +103,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <id>yahoo.github</id>
- <url>http://yahoo.github.com/maven/repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
@@ -233,10 +228,9 @@
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>0.20.104.2</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -246,10 +240,9 @@
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
- <version>0.20.104.2</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -271,10 +264,15 @@
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <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>0.20.104.2</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -284,18 +282,11 @@
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>
<version>0.9.0</version>
<exclusions>
<exclusion>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- <!-- this exclusion to be removed by GH-0226 -->
- <exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.1/release-log.txt Fri Feb 10 23:17:38 2012
@@ -1,6 +1,7 @@
-- Oozie 3.1.3 release
-OZIE-685 Update License file with 3rd party license information. (Mohammad)
+OOZIE-601 Oozie's POMs should use org.apache.oozie as group (tucu)
+OOZIE-685 Update License file with 3rd party license information. (Mohammad)
OOZIE-682 Update version 3.1.3 to 3.1.3-incubating in all pom.xml.(Mohammad)
OOZIE-683 Add DISCLAIMER file in the root.(Mohammad)
OOZIE 682 Update version 3.1.3 to 3.1.3-incubating in all pom.xml(Mohammad).
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/sharelib/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/sharelib/pom.xml Fri Feb 10 23:17:38
2012
@@ -28,41 +28,25 @@
<name>Oozie Share Lib</name>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
- </organization>
-
<dependencies>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-streaming</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <!-- groupId to be correct by GH-0226 -->
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
- <!-- groupId to be correct by GH-0226 -->
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
</exclusions>
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=1242972&r1=1242971&r2=1242972&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/webapp/pom.xml (original)
+++ incubator/oozie/branches/branch-3.1/webapp/pom.xml Fri Feb 10 23:17:38 2012
@@ -28,18 +28,6 @@
<name>Oozie WebApp</name>
<packaging>war</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Yahoo</name>
- <url>http://www.yahoo.com</url>
- </organization>
-
<dependencies>
<dependency>
<groupId>org.apache.oozie</groupId>
@@ -146,7 +134,7 @@
</activation>
<dependencies>
<dependency>
- <groupId>com.yahoo.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<scope>compile</scope>
<exclusions>
