Author: tucu
Date: Thu May 10 23:41:04 2012
New Revision: 1336960
URL: http://svn.apache.org/viewvc?rev=1336960&view=rev
Log:
OOZIE-831 POMs cleanup/fixing of hadoop version and to be able to publish oozie
JARs to maven repo (tucu)
Added:
incubator/oozie/trunk/hadooplibs/hadoop-1/
incubator/oozie/trunk/hadooplibs/hadoop-1/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-2/
incubator/oozie/trunk/hadooplibs/hadoop-2/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-test-1/
incubator/oozie/trunk/hadooplibs/hadoop-test-1/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-test-2/
incubator/oozie/trunk/hadooplibs/hadoop-test-2/pom.xml
Removed:
incubator/oozie/trunk/hadooplibs/hadoop-0_23_1/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-0_23_2/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-0_24_0/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-1_0_1/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-test-0_23_1/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-test-0_23_2/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-test-0_24_0/pom.xml
incubator/oozie/trunk/hadooplibs/hadoop-test-1_0_1/pom.xml
Modified:
incubator/oozie/trunk/hadooplibs/pom.xml
incubator/oozie/trunk/pom.xml
incubator/oozie/trunk/release-log.txt
incubator/oozie/trunk/src/main/assemblies/hadooplibs.xml
Added: incubator/oozie/trunk/hadooplibs/hadoop-1/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/hadooplibs/hadoop-1/pom.xml?rev=1336960&view=auto
==============================================================================
--- incubator/oozie/trunk/hadooplibs/hadoop-1/pom.xml (added)
+++ incubator/oozie/trunk/hadooplibs/hadoop-1/pom.xml Thu May 10 23:41:04 2012
@@ -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.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop</artifactId>
+ <version>1.0.1.oozie-3.2.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>1.0.1</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: incubator/oozie/trunk/hadooplibs/hadoop-2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/hadooplibs/hadoop-2/pom.xml?rev=1336960&view=auto
==============================================================================
--- incubator/oozie/trunk/hadooplibs/hadoop-2/pom.xml (added)
+++ incubator/oozie/trunk/hadooplibs/hadoop-2/pom.xml Thu May 10 23:41:04 2012
@@ -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.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop</artifactId>
+ <version>2.0.0-SNAPSHOT.oozie-3.2.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>2.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: incubator/oozie/trunk/hadooplibs/hadoop-test-1/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/hadooplibs/hadoop-test-1/pom.xml?rev=1336960&view=auto
==============================================================================
--- incubator/oozie/trunk/hadooplibs/hadoop-test-1/pom.xml (added)
+++ incubator/oozie/trunk/hadooplibs/hadoop-test-1/pom.xml Thu May 10 23:41:04
2012
@@ -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.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-test</artifactId>
+ <version>1.0.1.oozie-3.2.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>1.0.1</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>
+
Added: incubator/oozie/trunk/hadooplibs/hadoop-test-2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/hadooplibs/hadoop-test-2/pom.xml?rev=1336960&view=auto
==============================================================================
--- incubator/oozie/trunk/hadooplibs/hadoop-test-2/pom.xml (added)
+++ incubator/oozie/trunk/hadooplibs/hadoop-test-2/pom.xml Thu May 10 23:41:04
2012
@@ -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.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-test</artifactId>
+ <version>2.0.0-SNAPSHOT.oozie-3.2.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>2.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: incubator/oozie/trunk/hadooplibs/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/hadooplibs/pom.xml?rev=1336960&r1=1336959&r2=1336960&view=diff
==============================================================================
--- incubator/oozie/trunk/hadooplibs/pom.xml (original)
+++ incubator/oozie/trunk/hadooplibs/pom.xml Thu May 10 23:41:04 2012
@@ -32,14 +32,10 @@
<packaging>pom</packaging>
<modules>
- <module>hadoop-1_0_1</module>
- <module>hadoop-test-1_0_1</module>
- <module>hadoop-0_23_1</module>
- <module>hadoop-test-0_23_1</module>
- <module>hadoop-0_23_2</module>
- <module>hadoop-test-0_23_2</module>
- <module>hadoop-0_24_0</module>
- <module>hadoop-test-0_24_0</module>
+ <module>hadoop-1</module>
+ <module>hadoop-test-1</module>
+ <module>hadoop-2</module>
+ <module>hadoop-test-2</module>
</modules>
<build>
Modified: incubator/oozie/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/pom.xml?rev=1336960&r1=1336959&r2=1336960&view=diff
==============================================================================
--- incubator/oozie/trunk/pom.xml (original)
+++ incubator/oozie/trunk/pom.xml Thu May 10 23:41:04 2012
@@ -39,11 +39,12 @@
</organization>
<properties>
+ <distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
+
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+
<!-- to be able to run a single test case from the main project -->
<failIfNoTests>false</failIfNoTests>
-
<internal.maven.repository>file:///tmp/internalmavenrepo</internal.maven.repository>
-
<test.timeout>3600</test.timeout>
<!-- platform encoding override -->
@@ -66,12 +67,15 @@
<oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file>
<hadoop.version>1.0.1</hadoop.version>
+
+
<hadooplib.version>${hadoop.version}.oozie-${project.version}</hadooplib.version>
+
<clover.license>/home/jenkins/tools/clover/latest/lib/clover.license</clover.license>
<!--
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>
+ <hadoop.auth.version>2.0.0-SNAPSHOT</hadoop.auth.version>
<!-- Sharelib component versions -->
<hive.version>0.9.0</hive.version>
@@ -94,22 +98,19 @@
<distributionManagement>
<repository>
- <id>internal.maven.repo</id>
- <name>Internal Repository for Integration</name>
- <url>${internal.maven.repository}</url>
+ <id>apache.staging.https</id>
+ <name>Apache Release Distribution Repository</name>
+
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
</repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
</distributionManagement>
<repositories>
<repository>
- <id>internal.maven.repo</id>
- <name>Internal Repository for Integration</name>
- <url>${internal.maven.repository}</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
<snapshots>
@@ -139,19 +140,10 @@
<enabled>false</enabled>
</snapshots>
</repository>
-
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>internal.maven.repo</id>
- <name>Internal Repository for Integration</name>
- <url>${internal.maven.repository}</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
<id>repository.cloudera.com</id>
<name>repository.cloudera.com-releases</name>
<url>https://repository.cloudera.com/artifactory/ext-release-local</url>
@@ -262,13 +254,13 @@
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadooplib.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-test</artifactId>
- <version>${hadoop.version}</version>
+ <version>${hadooplib.version}</version>
</dependency>
<dependency>
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1336960&r1=1336959&r2=1336960&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Thu May 10 23:41:04 2012
@@ -1,5 +1,6 @@
-- Oozie trunk
+OOZIE-831 POMs cleanup/fixing of hadoop version and to be able to publish
oozie JARs to maven repo (tucu)
OOZIE-830 add support for multiple/configurable sharelibs for each action type
(tucu)
OOZIE-773 AuthorizationService should be able to use a group to identify
superusers (tucu)
OOZIE-783 Upgrade to Junit4 (virag via tucu)
Modified: incubator/oozie/trunk/src/main/assemblies/hadooplibs.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/src/main/assemblies/hadooplibs.xml?rev=1336960&r1=1336959&r2=1336960&view=diff
==============================================================================
--- incubator/oozie/trunk/src/main/assemblies/hadooplibs.xml (original)
+++ incubator/oozie/trunk/src/main/assemblies/hadooplibs.xml Thu May 10
23:41:04 2012
@@ -26,19 +26,11 @@
<fileSets>
<!-- Hadoop libs -->
<fileSet>
-
<directory>${basedir}/../hadooplibs/hadoop-1_0_0/target/hadooplibs</directory>
+
<directory>${basedir}/../hadooplibs/hadoop-1/target/hadooplibs</directory>
<outputDirectory>/hadooplibs</outputDirectory>
</fileSet>
<fileSet>
-
<directory>${basedir}/../hadooplibs/hadoop-0_22_0/target/hadooplibs</directory>
- <outputDirectory>/hadooplibs</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>${basedir}/../hadooplibs/hadoop-0_23_1/target/hadooplibs</directory>
- <outputDirectory>/hadooplibs</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>${basedir}/../hadooplibs/hadoop-0_24_0/target/hadooplibs</directory>
+
<directory>${basedir}/../hadooplibs/hadoop-2/target/hadooplibs</directory>
<outputDirectory>/hadooplibs</outputDirectory>
</fileSet>
</fileSets>
