You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2012/02/08 21:14:46 UTC
svn commit: r1242072 - in /hadoop/common/branches/branch-1.0: CHANGES.txt
build.xml ivy/hadoop-client-pom-template.xml
ivy/hadoop-minicluster-pom-template.xml
Author: mattf
Date: Wed Feb 8 20:14:45 2012
New Revision: 1242072
URL: http://svn.apache.org/viewvc?rev=1242072&view=rev
Log:
HADOOP-8009. Create hadoop-client and hadoop-minicluster artifacts for downstream projects. Contributed by Alejandro Abdelnur.
Added:
hadoop/common/branches/branch-1.0/ivy/hadoop-client-pom-template.xml
hadoop/common/branches/branch-1.0/ivy/hadoop-minicluster-pom-template.xml
Modified:
hadoop/common/branches/branch-1.0/CHANGES.txt
hadoop/common/branches/branch-1.0/build.xml
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1242072&r1=1242071&r2=1242072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Wed Feb 8 20:14:45 2012
@@ -1,6 +1,6 @@
Hadoop Change Log
-Release 1.0.1 - 2012.01.30
+Release 1.0.1 - 2012.02.08
NEW FEATURES
@@ -21,6 +21,9 @@ Release 1.0.1 - 2012.01.30
HDFS-2379. Allow block reports to proceed without holding FSDataset lock.
(todd via suresh)
+ HADOOP-8009. Create hadoop-client and hadoop-minicluster artifacts for
+ downstream projects. (Alejandro Abdelnur via mattf)
+
BUG FIXES
HADOOP-7960. Port HADOOP-5203 to branch-1, build version comparison is too
Modified: hadoop/common/branches/branch-1.0/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/build.xml?rev=1242072&r1=1242071&r2=1242072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/build.xml (original)
+++ hadoop/common/branches/branch-1.0/build.xml Wed Feb 8 20:14:45 2012
@@ -40,6 +40,8 @@
<property name="tools.final.name" value="${name}-tools-${version}"/>
<property name="ant.final.name" value="${name}-ant-${version}"/>
<property name="streaming.final.name" value="${name}-streaming-${version}"/>
+ <property name="hadoop-client.final.name" value="${name}-client-${version}"/>
+ <property name="hadoop-minicluster.final.name" value="${name}-minicluster-${version}"/>
<property name="src.dir" value="${basedir}/src"/>
<property name="core.src.dir" value="${src.dir}/core"/>
@@ -256,6 +258,18 @@
location="${ivy.dir}/hadoop-streaming-pom-template.xml"/>
<property name="hadoop-streaming.jar"
location="${build.dir}/contrib/streaming/${streaming.final.name}.jar"/>
+ <property name="hadoop-client.pom"
+ location="${ivy.dir}/hadoop-client-pom.xml"/>
+ <property name="hadoop-client-pom-template.xml"
+ location="${ivy.dir}/hadoop-client-pom-template.xml"/>
+ <property name="hadoop-client.jar"
+ location="${build.dir}/${hadoop-client.final.name}.jar"/>
+ <property name="hadoop-minicluster.pom"
+ location="${ivy.dir}/hadoop-minicluster-pom.xml"/>
+ <property name="hadoop-minicluster-pom-template.xml"
+ location="${ivy.dir}/hadoop-minicluster-pom-template.xml"/>
+ <property name="hadoop-minicluster.jar"
+ location="${build.dir}/${hadoop-minicluster.final.name}.jar"/>
<!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.artifact.retrieve.pattern"
@@ -717,6 +731,27 @@
<fileset file="${jar.extra.properties.list}" />
<zipfileset dir="${build.webapps}" prefix="webapps"/>
</jar>
+ <mkdir dir="${build.dir}/empty"/>
+ <jar jarfile="${build.dir}/${hadoop-client.final.name}.jar"
+ basedir="${build.dir}/empty">
+ <manifest>
+ <section name="org/apache/hadoop">
+ <attribute name="Implementation-Title" value="Hadoop Client"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </section>
+ </manifest>
+ </jar>
+ <jar jarfile="${build.dir}/${hadoop-minicluster.final.name}.jar"
+ basedir="${build.dir}/empty">
+ <manifest>
+ <section name="org/apache/hadoop">
+ <attribute name="Implementation-Title" value="Hadoop Minicluster"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </section>
+ </manifest>
+ </jar>
</target>
<!-- ================================================================== -->
@@ -1873,6 +1908,8 @@
<delete file="${basedir}/ivy/hadoop-examples-pom.xml"/>
<delete file="${basedir}/ivy/hadoop-tools-pom.xml"/>
<delete file="${basedir}/ivy/hadoop-streaming-pom.xml"/>
+ <delete file="${basedir}/ivy/hadoop-client-pom.xml"/>
+ <delete file="${basedir}/ivy/hadoop-minicluster-pom.xml"/>
</target>
<target name="clean-sign" description="Clean. Delete .asc files">
@@ -2457,6 +2494,8 @@
<artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
<artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
<artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
+ <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
+ <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
<artifact:install file="${hadoop-core.jar}">
<pom refid="hadoop.core"/>
@@ -2473,6 +2512,12 @@
<artifact:install file="${hadoop-streaming.jar}">
<pom refid="hadoop.streaming"/>
</artifact:install>
+ <artifact:install file="${hadoop-client.jar}">
+ <pom refid="hadoop.client"/>
+ </artifact:install>
+ <artifact:install file="${hadoop-minicluster.jar}">
+ <pom refid="hadoop.minicluster"/>
+ </artifact:install>
</target>
<target name="mvn-deploy" depends="mvn-taskdef, bin-package, set-version, signanddeploy, simpledeploy"
@@ -2484,6 +2529,8 @@
<artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
<artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
<artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
+ <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
+ <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
<artifact:install-provider artifactId="wagon-http"
version="${wagon-http.version}"/>
<artifact:deploy file="${hadoop-core.jar}">
@@ -2516,6 +2563,18 @@
<attach file="${hadoop-streaming.jar}.asc" type="jar.asc"/>
<attach file="${hadoop-streaming.pom}.asc" type="pom.asc"/>
</artifact:deploy>
+ <artifact:deploy file="${hadoop-client.jar}">
+ <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+ <pom refid="hadoop.client"/>
+ <attach file="${hadoop-client.jar}.asc" type="jar.asc"/>
+ <attach file="${hadoop-client.pom}.asc" type="pom.asc"/>
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-minicluster.jar}">
+ <remoteRepository id="apache.minicluster.https" url="${asfstagingrepo}"/>
+ <pom refid="hadoop.minicluster"/>
+ <attach file="${hadoop-minicluster.jar}.asc" type="jar.asc"/>
+ <attach file="${hadoop-minicluster.pom}.asc" type="pom.asc"/>
+ </artifact:deploy>
</target>
<target name="sign" depends="clean-sign" if="staging">
@@ -2559,6 +2618,10 @@
output.file="${hadoop-examples.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${hadoop-streaming.pom}"
output.file="${hadoop-streaming.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${hadoop-client.pom}"
+ output.file="${hadoop-client.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${hadoop-minicluster.pom}"
+ output.file="${hadoop-minicluster.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
</target>
<target name="simpledeploy" unless="staging">
@@ -2567,6 +2630,8 @@
<artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
<artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
<artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
+ <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
+ <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
<artifact:install-provider artifactId="wagon-http" version="${wagon-http.version}"/>
<artifact:deploy file="${hadoop-core.jar}">
@@ -2589,6 +2654,14 @@
<remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
<pom refid="hadoop.streaming"/>
</artifact:deploy>
+ <artifact:deploy file="${hadoop-client.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+ <pom refid="hadoop.client"/>
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-minicluster.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+ <pom refid="hadoop.minicluster"/>
+ </artifact:deploy>
</target>
<target name="set-version">
@@ -2597,11 +2670,15 @@
<delete file="${hadoop-examples.pom}"/>
<delete file="${hadoop-tools.pom}"/>
<delete file="${hadoop-streaming.pom}"/>
+ <delete file="${hadoop-client.pom}"/>
+ <delete file="${hadoop-minicluster.pom}"/>
<copy file="${hadoop-core-pom-template.xml}" tofile="${hadoop-core.pom}"/>
<copy file="${hadoop-test-pom-template.xml}" tofile="${hadoop-test.pom}"/>
<copy file="${hadoop-examples-pom-template.xml}" tofile="${hadoop-examples.pom}"/>
<copy file="${hadoop-tools-pom-template.xml}" tofile="${hadoop-tools.pom}"/>
<copy file="${hadoop-streaming-pom-template.xml}" tofile="${hadoop-streaming.pom}"/>
+ <copy file="${hadoop-client-pom-template.xml}" tofile="${hadoop-client.pom}"/>
+ <copy file="${hadoop-minicluster-pom-template.xml}" tofile="${hadoop-minicluster.pom}"/>
<replaceregexp byline="true">
<regexp pattern="@version"/>
<substitution expression="${version}"/>
@@ -2611,6 +2688,8 @@
<include name="hadoop-tools-pom.xml"/>
<include name="hadoop-examples-pom.xml"/>
<include name="hadoop-streaming-pom.xml"/>
+ <include name="hadoop-client-pom.xml"/>
+ <include name="hadoop-minicluster-pom.xml"/>
</fileset>
</replaceregexp>
</target>
Added: hadoop/common/branches/branch-1.0/ivy/hadoop-client-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/ivy/hadoop-client-pom-template.xml?rev=1242072&view=auto
==============================================================================
--- hadoop/common/branches/branch-1.0/ivy/hadoop-client-pom-template.xml (added)
+++ hadoop/common/branches/branch-1.0/ivy/hadoop-client-pom-template.xml Wed Feb 8 20:14:45 2012
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+<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</groupId>
+ <artifactId>apache</artifactId>
+ <version>9</version>
+ </parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>@version</version>
+ <packaging>jar</packaging>
+
+ <description>Apache Hadoop Client</description>
+ <name>Apache Hadoop Client</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+</project>
+
Added: hadoop/common/branches/branch-1.0/ivy/hadoop-minicluster-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/ivy/hadoop-minicluster-pom-template.xml?rev=1242072&view=auto
==============================================================================
--- hadoop/common/branches/branch-1.0/ivy/hadoop-minicluster-pom-template.xml (added)
+++ hadoop/common/branches/branch-1.0/ivy/hadoop-minicluster-pom-template.xml Wed Feb 8 20:14:45 2012
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+<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</groupId>
+ <artifactId>apache</artifactId>
+ <version>9</version>
+ </parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>@version</version>
+ <packaging>jar</packaging>
+
+ <description>Apache Hadoop Mini-Cluster</description>
+ <name>Apache Hadoop Mini-Cluster</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+