Author: stevel
Date: Fri Aug 21 19:17:04 2009
New Revision: 806679
URL: http://svn.apache.org/viewvc?rev=806679&view=rev
Log:
HADOOP-6206
Modified:
hadoop/common/branches/HADOOP-6194/build.xml
hadoop/common/branches/HADOOP-6194/ivy/hadoop-core.pom
hadoop/common/branches/HADOOP-6194/ivy/libraries.properties
Modified: hadoop/common/branches/HADOOP-6194/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/build.xml?rev=806679&r1=806678&r2=806679&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/build.xml (original)
+++ hadoop/common/branches/HADOOP-6194/build.xml Fri Aug 21 19:17:04 2009
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project name="hadoop-core" default="compile"
+<project name="hadoop-common" default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- Load all the default properties, and any the user wants -->
@@ -25,8 +25,8 @@
<property file="${user.home}/build.properties" />
<property file="${basedir}/build.properties" />
- <property name="Name" value="Hadoop-core"/>
- <property name="name" value="hadoop-core"/>
+ <property name="Name" value="Hadoop-common"/>
+ <property name="name" value="hadoop-common"/>
<property name="version" value="0.21.0-dev"/>
<property name="final.name" value="${name}-${version}"/>
<property name="test.final.name" value="${name}-test-${version}"/>
@@ -144,7 +144,7 @@
<property name="ivy.artifact.retrieve.pattern"
value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
<!--this is how artifacts that get built are named-->
- <property name="ivy.publish.pattern" value="hadoop-core-[revision].[ext]"/>
+ <property name="ivy.publish.pattern" value="hadoop-common-[revision].[ext]"/>
<property name="hadoop-core.jar" location="${build.dir}/${final.name}.jar" />
<property name="hadoop-core-test.jar"
location="${build.dir}/${test.final.name}.jar" />
@@ -1292,7 +1292,7 @@
<ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
</target>
- <target name="ivy-report" depends="ivy-resolve-releaseaudit"
+ <target name="ivy-report" depends="ivy-resolve"
description="Generate">
<ivy:report todir="${build.ivy.report.dir}"
settingsRef="${ant.project.name}.ivy.settings"/>
<echo>
Modified: hadoop/common/branches/HADOOP-6194/ivy/hadoop-core.pom
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/ivy/hadoop-core.pom?rev=806679&r1=806678&r2=806679&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/ivy/hadoop-core.pom (original)
+++ hadoop/common/branches/HADOOP-6194/ivy/hadoop-core.pom Fri Aug 21 19:17:04
2009
@@ -36,6 +36,22 @@
</licenses>
<dependencies>
+ <!-- Avro-->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-mapper-asl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.paranamer</groupId>
+ <artifactId>paranamer</artifactId>
+ <version>${paranamer.version}</version>
+ </dependency>
<!-- always include commons-logging and log4J -->
<dependency>
@@ -116,7 +132,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>${commons-httpclient.version}</version>
<scope>optional</scope>
<exclusions>
<exclusion>
@@ -132,15 +148,15 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>${commons-codec.version}</version>
<scope>optional</scope>
</dependency>
- <!--CLI is needed to scan the command line, but only the 1.0 branch is
released -->
+ <!--CLI is needed to scan the command line -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>2.0-20070823</version>
+ <version>${commons-cli.version}</version>
<scope>optional</scope>
</dependency>
@@ -149,7 +165,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>1.4.1</version>
+ <version>${commons-net.version}</version>
<scope>optional</scope>
</dependency>
@@ -232,16 +248,14 @@
<!--Kosmos filesystem
http://kosmosfs.sourceforge.net/
- This is not in the central repository
- -->
- <!--
- <dependency>
- <groupId>org.kosmix</groupId>
- <artifactId>kfs</artifactId>
- <version>0.1</version>
- <scope>optional</scope>
- </dependency>
-->
+ <dependency>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ <version>${kfs.version}</version>
+ <scope>optional</scope>
+ </dependency>
+
<!--
http://xmlenc.sourceforge.net/
@@ -250,7 +264,7 @@
<dependency>
<groupId>xmlenc</groupId>
<artifactId>xmlenc</artifactId>
- <version>0.52</version>
+ <version>${xmlenc.version}</version>
<scope>optional</scope>
</dependency>
</dependencies>
Modified: hadoop/common/branches/HADOOP-6194/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HADOOP-6194/ivy/libraries.properties?rev=806679&r1=806678&r2=806679&view=diff
==============================================================================
--- hadoop/common/branches/HADOOP-6194/ivy/libraries.properties (original)
+++ hadoop/common/branches/HADOOP-6194/ivy/libraries.properties Fri Aug 21
19:17:04 2009
@@ -15,7 +15,7 @@
#These are the versions of our dependencies (in alphabetical order)
apacheant.version=1.7.0
-
+avro.version=1.0.0
checkstyle.version=4.2
commons-cli.version=1.2
@@ -41,7 +41,7 @@
#ivy.version=2.0.0-beta2
ivy.version=2.0.0-rc2
-
+jackson-mapper-asl.version=1.0.1
jasper.version=5.5.12
jsp.version=2.1
jsp-api.version=5.5.12
@@ -60,7 +60,7 @@
mina-core.version=2.0.0-M5
oro.version=2.0.8
-
+paranamer.version=1.5
rats-lib.version=0.6
servlet.version=4.0.6
