Author: shv
Date: Tue Nov 15 22:53:57 2011
New Revision: 1202457
URL: http://svn.apache.org/viewvc?rev=1202457&view=rev
Log:
HADOOP-7450. Upgrade jetty to 6.1.26. Contributed by Konstantin Boudnik and
Jitendra Nath Pandey.
Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt
hadoop/common/branches/branch-0.22/common/build.xml
hadoop/common/branches/branch-0.22/common/ivy.xml
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-test-template.xml
hadoop/common/branches/branch-0.22/common/ivy/libraries.properties
Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1202457&r1=1202456&r2=1202457&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Tue Nov 15 22:53:57
2011
@@ -553,6 +553,9 @@ Release 0.22.0 - Unreleased
HADOOP-7730. Allow TestCLI to be run against a cluster (cos)
+ HADOOP-7450. Upgrade jetty to 6.1.26.
+ (Konstantin Boudnik and Jitendra Nath Pandey via shv)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.22/common/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/build.xml?rev=1202457&r1=1202456&r2=1202457&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/build.xml (original)
+++ hadoop/common/branches/branch-0.22/common/build.xml Tue Nov 15 22:53:57 2011
@@ -1395,8 +1395,9 @@
</target>
<target name="veryclean" depends="clean" description="Delete mvn ant task
jar and ivy ant taks jar">
- <delete file="${ant_task.jar}"/>
- <delete file="${ivy.jar}"/>
+ <delete>
+ <fileset dir="${ivy.dir}" includes="*.jar"/>
+ </delete>
</target>
<target name="clover" depends="clover.setup, clover.info"
description="Instrument the Unit tests using Clover.
Modified: hadoop/common/branches/branch-0.22/common/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy.xml?rev=1202457&r1=1202456&r2=1202457&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/ivy.xml (original)
+++ hadoop/common/branches/branch-0.22/common/ivy.xml Tue Nov 15 22:53:57 2011
@@ -99,16 +99,6 @@
<!--Configuration: httpclient-->
- <!--
- commons-httpclient asks for too many files.
- All it needs is commons-codec and commons-logging JARs
- -->
- <dependency org="commons-httpclient"
- name="commons-httpclient"
- rev="${commons-httpclient.version}"
- conf="httpclient->master">
- </dependency>
-
<dependency org="commons-codec"
name="commons-codec"
rev="${commons-codec.version}"
@@ -120,19 +110,12 @@
conf="ftp->default"/>
<!--Configuration: Jetty -->
-
-<!-- <dependency org="javax.servlet"
- name="servlet-api"
- rev="${servlet-api.version}"
- conf="jetty->master"/> -->
<dependency org="org.mortbay.jetty"
name="jetty"
rev="${jetty.version}"
- conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jetty-util"
- rev="${jetty-util.version}"
- conf="jetty->master"/>
+ conf="jetty->default">
+ <exclude module="ant"/>
+ </dependency>
<dependency org="tomcat"
name="jasper-runtime"
@@ -143,13 +126,9 @@
rev="${jasper.version}"
conf="jetty->master"/>
<dependency org="org.mortbay.jetty"
- name="jsp-api-2.1"
- rev="${jetty.version}"
- conf="jetty->master"/>
- <dependency org="org.mortbay.jetty"
- name="jsp-2.1"
+ name="jsp-2.1-jetty"
rev="${jetty.version}"
- conf="jetty->master"/>
+ conf="jetty->default"/>
<dependency org="commons-el"
name="commons-el"
rev="${commons-el.version}"
@@ -182,15 +161,11 @@
<dependency org="net.java.dev.jets3t"
name="jets3t"
rev="${jets3t.version}"
- conf="s3-client->master"/>
+ conf="s3-client->default"/>
<dependency org="commons-net"
name="commons-net"
rev="${commons-net.version}"
conf="s3-client->master"/>
- <dependency org="org.mortbay.jetty"
- name="servlet-api-2.5"
- rev="${servlet-api-2.5.version}"
- conf="s3-client->master"/>
<dependency org="net.sf.kosmosfs"
name="kfs"
rev="${kfs.version}"
@@ -199,23 +174,6 @@
<!--Configuration: test -->
<!--artifacts needed for testing -->
- <dependency org="org.apache.ftpserver"
- name="ftplet-api"
- rev="${ftplet-api.version}"
- conf="test->default"/>
- <dependency org="org.apache.mina"
- name="mina-core"
- rev="${mina-core.version}"
- conf="test->default"/>
- <dependency org="org.apache.ftpserver"
- name="ftpserver-core"
- rev="${ftpserver-core.version}"
- conf="test->default"/>
- <dependency org="org.apache.ftpserver"
- name="ftpserver-deprecated"
- rev="${ftpserver-deprecated.version}"
- conf="test->default"/>
-
<dependency org="junit"
name="junit"
rev="${junit.version}"
@@ -252,10 +210,6 @@
name="core"
rev="${core.version}"
conf="common->master"/>
- <dependency org="oro"
- name="oro"
- rev="${oro.version}"
- conf="common->default"/>
<dependency org="org.slf4j"
name="slf4j-log4j12"
rev="${slf4j-log4j12.version}"
@@ -280,11 +234,9 @@
<exclude module="ant"/>
<exclude module="jetty"/>
<exclude module="slf4j-api"/>
+ <exclude module="velocity"/>
+ <exclude module="netty" />
</dependency>
- <dependency org="org.codehaus.jackson"
- name="jackson-mapper-asl"
- rev="${jackson.version}"
- conf="common->default"/>
<dependency org="com.thoughtworks.paranamer"
name="paranamer"
rev="${paranamer.version}"
Modified:
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml?rev=1202457&r1=1202456&r2=1202457&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
(original)
+++
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
Tue Nov 15 22:53:57 2011
@@ -23,134 +23,20 @@
<packaging>jar</packaging>
<version>@version</version>
<dependencies>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>xmlenc</groupId>
- <artifactId>xmlenc</artifactId>
- <version>0.52</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.14</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.14</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.12</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>6.1.14</version>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.7.1</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>6.1.14</version>
- </dependency>
- <dependency>
- <groupId>net.sf.kosmosfs</groupId>
- <artifactId>kfs</artifactId>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
- </dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>@version</version>
</dependency>
<dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>1.5.3</version>
- <exclusions>
- <exclusion>
- <!-- Don't pull in Avro's version of SLF4J.-->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-ipc</artifactId>
- <version>1.5.3</version>
- <exclusions>
- <exclusion>
- <!-- Don't pull in Avro's (later) version of Jetty.-->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <!-- Exclude Avro's version of ant since it conflicts with
Jetty's.-->
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <!-- Don't pull in Avro's version of SLF4J.-->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjtools</artifactId>
+ <version>1.6.5</version>
</dependency>
</dependencies>
</project>
Modified:
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml?rev=1202457&r1=1202456&r2=1202457&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
(original)
+++ hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
Tue Nov 15 22:53:57 2011
@@ -23,40 +23,45 @@
<packaging>jar</packaging>
<version>@version</version>
<dependencies>
- <dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>xmlenc</groupId>
<artifactId>xmlenc</artifactId>
<version>0.52</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.4</version>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.14</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.14</version>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
@@ -70,13 +75,14 @@
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1</artifactId>
- <version>6.1.14</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>6.1.14</version>
+ <artifactId>jsp-2.1-jetty</artifactId>
+ <version>6.1.26</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-el</groupId>
@@ -94,11 +100,6 @@
<version>1.4.1</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>6.1.14</version>
- </dependency>
- <dependency>
<groupId>net.sf.kosmosfs</groupId>
<artifactId>kfs</artifactId>
<version>0.3</version>
@@ -136,15 +137,21 @@
<version>1.5.3</version>
<exclusions>
<exclusion>
- <!-- Don't pull in Avro's (later) version of Jetty.-->
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
<exclusion>
- <!-- Exclude Avro's version of ant since it conflicts with
Jetty's.-->
- <groupId>org.apache.ant</groupId>
+ <groupId>org.apache.tools.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
<exclusion>
<!-- Don't pull in Avro's version of SLF4J.-->
<groupId>org.slf4j</groupId>
Modified:
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-test-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-test-template.xml?rev=1202457&r1=1202456&r2=1202457&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-test-template.xml
(original)
+++
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-test-template.xml
Tue Nov 15 22:53:57 2011
@@ -30,24 +30,9 @@
<version>@version</version>
</dependency>
<dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftplet-api</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-deprecated</artifactId>
- <version>1.0.0-M2</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
</dependency>
</dependencies>
</project>
Modified: hadoop/common/branches/branch-0.22/common/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy/libraries.properties?rev=1202457&r1=1202456&r2=1202457&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/ivy/libraries.properties
(original)
+++ hadoop/common/branches/branch-0.22/common/ivy/libraries.properties Tue Nov
15 22:53:57 2011
@@ -15,16 +15,15 @@
#These are the versions of our dependencies (in alphabetical order)
ant-task.version=2.0.10
+aspectj.version=1.6.5
avro.version=1.5.3
checkstyle.version=4.2
commons-cli.version=1.2
-commons-cli2.version=2.0-mahout
commons-codec.version=1.4
commons-collections.version=3.1
-commons-httpclient.version=3.1
commons-lang.version=2.5
commons-logging.version=1.1.1
commons-logging-api.version=1.1
@@ -33,55 +32,35 @@ commons-fileupload.version=1.2
commons-io.version=1.4
commons-net.version=1.4.1
core.version=3.1.1
-coreplugin.version=1.3.2
-
-ftplet-api.version=1.0.0
-ftpserver-core.version=1.0.0
-ftpserver-deprecated.version=1.0.0-M2
guava.version=r09
hsqldb.version=1.8.0.10
-ivy.version=2.1.0
+ivy.version=2.2.0
jasper.version=5.5.12
-jsp.version=2.1
-jsp-api.version=5.5.12
jets3t.version=0.7.1
-jetty.version=6.1.14
-jetty-util.version=6.1.14
+jetty.version=6.1.26
junit.version=4.8.1
jdiff.version=1.0.9
-json.version=1.0
+jsch.version=0.1.42
kfs.version=0.3
-log4j.version=1.2.15
+log4j.version=1.2.16
lucene-core.version=2.3.1
-mina-core.version=2.0.0-M5
-
-oro.version=2.0.8
+mockito-all.version=1.8.5
paranamer.version=2.3
+protobuf.version=2.4.0a
rats-lib.version=0.6
-servlet.version=4.0.6
-servlet-api-2.5.version=6.1.14
-servlet-api.version=2.5
-slf4j-api.version=1.5.11
-slf4j-log4j12.version=1.5.11
-
-wagon-http.version=1.0-beta-2
+slf4j-api.version=1.6.1
+slf4j-log4j12.version=1.6.1
xmlenc.version=0.52
xerces.version=1.4.4
-aspectj.version=1.6.5
-
-mockito-all.version=1.8.2
-
-jsch.version=0.1.42
-
