Author: stevel
Date: Fri Aug 21 19:19:09 2009
New Revision: 806683
URL: http://svn.apache.org/viewvc?rev=806683&view=rev
Log:
HDFS-560 patches
Added:
hadoop/hdfs/branches/HDFS-326/ivy/hadoop-hdfs.pom
- copied, changed from r806496,
hadoop/hdfs/branches/HDFS-326/ivy/hadoop-core.pom
Modified:
hadoop/hdfs/branches/HDFS-326/build.xml
hadoop/hdfs/branches/HDFS-326/ivy.xml
hadoop/hdfs/branches/HDFS-326/ivy/libraries.properties
Modified: hadoop/hdfs/branches/HDFS-326/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/build.xml?rev=806683&r1=806682&r2=806683&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/build.xml (original)
+++ hadoop/hdfs/branches/HDFS-326/build.xml Fri Aug 21 19:19:09 2009
@@ -1417,7 +1417,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/hdfs/branches/HDFS-326/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/ivy.xml?rev=806683&r1=806682&r2=806683&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/ivy.xml (original)
+++ hadoop/hdfs/branches/HDFS-326/ivy.xml Fri Aug 21 19:19:09 2009
@@ -252,10 +252,6 @@
name="slf4j-api"
rev="${slf4j-api.version}"
conf="common->master"/>
- <dependency org="org.apache.hadoop"
- name="avro"
- rev="1.0.0"
- conf="common->default"/>
<dependency org="org.eclipse.jdt"
name="core"
rev="${core.version}"
@@ -279,6 +275,19 @@
rev="${aspectj.version}"
conf="common->default">
</dependency>
+
+ <dependency org="org.apache.hadoop"
+ name="avro"
+ rev="${avro.version}"
+ conf="mandatory->default"/>
+ <dependency org="org.codehaus.jackson"
+ name="jackson-mapper-asl"
+ rev="${jackson-mapper-asl.version}"
+ conf="mandatory->default"/>
+ <dependency org="com.thoughtworks.paranamer"
+ name="paranamer"
+ rev="${paranamer.version}"
+ conf="mandatory->default"/>
</dependencies>
</ivy-module>
Copied: hadoop/hdfs/branches/HDFS-326/ivy/hadoop-hdfs.pom (from r806496,
hadoop/hdfs/branches/HDFS-326/ivy/hadoop-core.pom)
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/ivy/hadoop-hdfs.pom?p2=hadoop/hdfs/branches/HDFS-326/ivy/hadoop-hdfs.pom&p1=hadoop/hdfs/branches/HDFS-326/ivy/hadoop-core.pom&r1=806496&r2=806683&rev=806683&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/ivy/hadoop-core.pom (original)
+++ hadoop/hdfs/branches/HDFS-326/ivy/hadoop-hdfs.pom Fri Aug 21 19:19:09 2009
@@ -21,11 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
+ <artifactId>hadoop-hdfs</artifactId>
<packaging>jar</packaging>
<version>${hadoop.version}</version>
<description>
- Apache Hadoop Core is a software platform that lets one easily write and
run applications that process vast amounts of datata
+ Apache Hadoop Core is a software platform that lets one easily write and
run applications
+ that process vast amounts of data.
+ hadoop-hdfs contains the server-side and client-side code to work with the
Hadoop Distributed File System
</description>
<licenses>
<license>
@@ -35,222 +37,11 @@
</licenses>
<dependencies>
-
- <!-- always include commons-logging and log4J -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>optional</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--SLF4J is a JAR-based dependency; this POM binds it to log4J-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-api.version}</version>
- <scope>optional</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-log4j12.version}</version>
- <scope>optional</scope>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--Httpclient and its components are optional-->
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>optional</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>optional</scope>
- </dependency>
-
- <!--CLI is needed to scan the command line, but only the 1.0 branch is
released -->
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>2.0-20070823</version>
- <scope>optional</scope>
- </dependency>
-
-
- <!-- this is used for the ftp:// filesystem-->
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- <scope>optional</scope>
- </dependency>
-
- <!-- Jetty is used to serve up the application. It is marked as optional
because
- clients do not need it. All server-side deployments will need
- all of these files.-->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>optional</scope>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>optional</scope>
- </dependency>
-
-
- <!--JSP support -->
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>${jetty.version}</version>
- <scope>optional</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1</artifactId>
- <version>${jetty.version}</version>
- <scope>optional</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>${commons-el.version}</version>
- <scope>optional</scope>
- </dependency>
-
-
- <!--JSPC assistance-->
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <version>${core.version}</version>
- <scope>optional</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${apacheant.version}</version>
- <scope>optional</scope>
- </dependency>
-
- <!-- JetS3t is a client library for S3.
- -It is only needed if you want to work with S3 filesystems
- -It pulls in commons-logging 1.1.1 and does not exclude all the cruft that
comes with it.
- By excluding it we stay in control of versions and dependencies
- -->
-
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>${jets3t.version}</version>
- <scope>optional</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--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>
- -->
-
- <!--
- http://xmlenc.sourceforge.net/
- "The xmlenc library is a fast stream-based XML output library for Java."
- -->
- <dependency>
- <groupId>xmlenc</groupId>
- <artifactId>xmlenc</artifactId>
- <version>0.52</version>
- <scope>optional</scope>
- </dependency>
</dependencies>
</project>
Modified: hadoop/hdfs/branches/HDFS-326/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/ivy/libraries.properties?rev=806683&r1=806682&r2=806683&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/ivy/libraries.properties (original)
+++ hadoop/hdfs/branches/HDFS-326/ivy/libraries.properties Fri Aug 21 19:19:09
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
@@ -40,11 +40,11 @@
#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
-jets3t.version=0.6.1
+jets3t.version=0.7.1
jetty.version=6.1.14
jetty-util.version=6.1.14
junit.version=4.5
@@ -59,7 +59,7 @@
mina-core.version=2.0.0-M6
oro.version=2.0.8
-
+paranamer.version=1.5
rats-lib.version=0.6
servlet.version=4.0.6
