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 2011/09/23 09:35:57 UTC
svn commit: r1174566 - in /hadoop/common/branches/branch-0.20-security: ./
src/contrib/capacity-scheduler/ src/contrib/capacity-scheduler/ivy/
src/contrib/data_join/ src/contrib/data_join/ivy/ src/contrib/gridmix/
src/contrib/gridmix/ivy/ src/contrib/h...
Author: mattf
Date: Fri Sep 23 07:35:57 2011
New Revision: 1174566
URL: http://svn.apache.org/viewvc?rev=1174566&view=rev
Log:
HDFS-2342. add Jersey libraries to ivy.xml files in contrib, to fix TestSleepJob and TestHdfsProxy. Contributed by TTsz Wo (Nicholas), SZE.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy.xml
hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy.xml
hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy.xml
hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy.xml
hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy.xml
hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy.xml
hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy/libraries.properties
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Sep 23 07:35:57 2011
@@ -76,6 +76,9 @@ Release 0.20.205.0 - unreleased
BUG FIXES
+ HDFS-2342. add Jersey libraries to ivy.xml files in contrib, to fix
+ TestSleepJob and TestHdfsProxy. (Tsz Wo (Nicholas), SZE via mattf)
+
MAPREDUCE-2324. Removed usage of broken
ResourceEstimator.getEstimatedReduceInputSize to check against usable
disk-space on TaskTracker. (Robert Evans via acmurthy)
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy.xml?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy.xml Fri Sep 23 07:35:57 2011
@@ -44,6 +44,24 @@
name="jetty"
rev="${jetty.version}"
conf="common->default"/>
+
+ <dependency org="asm"
+ name="asm"
+ rev="${asm.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-core"
+ rev="${jersey-core.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-json"
+ rev="${jersey-json.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-server"
+ rev="${jersey-server.version}"
+ conf="common->master"/>
+
<dependency org="commons-httpclient"
name="commons-httpclient"
rev="${commons-httpclient.version}"
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy/libraries.properties?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/capacity-scheduler/ivy/libraries.properties Fri Sep 23 07:35:57 2011
@@ -7,3 +7,9 @@
jackson.version=1.0.1
commons-configuration.version=1.6
commons-math.version=2.1
+
+asm.version=3.2
+
+jersey-core.version=1.8
+jersey-json.version=1.8
+jersey-server.version=1.8
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy.xml?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy.xml Fri Sep 23 07:35:57 2011
@@ -52,6 +52,24 @@
name="jetty"
rev="${jetty.version}"
conf="common->default"/>
+
+ <dependency org="asm"
+ name="asm"
+ rev="${asm.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-core"
+ rev="${jersey-core.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-json"
+ rev="${jersey-json.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-server"
+ rev="${jersey-server.version}"
+ conf="common->master"/>
+
<dependency org="org.codehaus.jackson"
name="jackson-core-asl"
rev="${jackson.version}"
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy/libraries.properties?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/data_join/ivy/libraries.properties Fri Sep 23 07:35:57 2011
@@ -5,3 +5,9 @@
#listed in the global libraries.properties file (in alphabetical order)
commons-configuration.version=1.6
commons-math.version=2.1
+
+asm.version=3.2
+
+jersey-core.version=1.8
+jersey-json.version=1.8
+jersey-server.version=1.8
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy.xml?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy.xml Fri Sep 23 07:35:57 2011
@@ -77,6 +77,24 @@
name="jsp-2.1"
rev="${jsp-2.1.version}"
conf="common->master"/>
+
+ <dependency org="asm"
+ name="asm"
+ rev="${asm.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-core"
+ rev="${jersey-core.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-json"
+ rev="${jersey-json.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-server"
+ rev="${jersey-server.version}"
+ conf="common->master"/>
+
<dependency org="commons-cli"
name="commons-cli"
rev="${commons-cli.version}"
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy/libraries.properties?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/gridmix/ivy/libraries.properties Fri Sep 23 07:35:57 2011
@@ -22,3 +22,9 @@
jackson.version=1.0.1
commons-configuration.version=1.6
commons-math.version=2.1
+
+asm.version=3.2
+
+jersey-core.version=1.8
+jersey-json.version=1.8
+jersey-server.version=1.8
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy.xml?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy.xml Fri Sep 23 07:35:57 2011
@@ -66,6 +66,24 @@
name="jetty"
rev="${jetty.version}"
conf="common->default"/>
+
+ <dependency org="asm"
+ name="asm"
+ rev="${asm.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-core"
+ rev="${jersey-core.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-json"
+ rev="${jersey-json.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-server"
+ rev="${jersey-server.version}"
+ conf="common->master"/>
+
<dependency org="org.eclipse.jdt"
name="core"
rev="${core.version}"
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy/libraries.properties?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/hdfsproxy/ivy/libraries.properties Fri Sep 23 07:35:57 2011
@@ -6,3 +6,9 @@ slf4j-api.version=1.4.3
jackson.version=1.0.1
commons-configuration.version=1.6
commons-math.version=2.1
+
+asm.version=3.2
+
+jersey-core.version=1.8
+jersey-json.version=1.8
+jersey-server.version=1.8
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy.xml?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy.xml Fri Sep 23 07:35:57 2011
@@ -44,6 +44,24 @@
name="jetty"
rev="${jetty.version}"
conf="common->default"/>
+
+ <dependency org="asm"
+ name="asm"
+ rev="${asm.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-core"
+ rev="${jersey-core.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-json"
+ rev="${jersey-json.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-server"
+ rev="${jersey-server.version}"
+ conf="common->master"/>
+
<dependency org="org.apache.lucene"
name="lucene-core"
rev="${lucene-core.version}"
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy/libraries.properties?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/index/ivy/libraries.properties Fri Sep 23 07:35:57 2011
@@ -4,3 +4,9 @@
#Please list the dependencies name with version if they are different from the ones listed in the global libraries.propertiesfile
commons-configuration.version=1.6
commons-math.version=2.1
+
+asm.version=3.2
+
+jersey-core.version=1.8
+jersey-json.version=1.8
+jersey-server.version=1.8
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy.xml?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy.xml (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy.xml Fri Sep 23 07:35:57 2011
@@ -44,6 +44,24 @@
name="jetty"
rev="${jetty.version}"
conf="common->default"/>
+
+ <dependency org="asm"
+ name="asm"
+ rev="${asm.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-core"
+ rev="${jersey-core.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-json"
+ rev="${jersey-json.version}"
+ conf="common->master"/>
+ <dependency org="com.sun.jersey"
+ name="jersey-server"
+ rev="${jersey-server.version}"
+ conf="common->master"/>
+
<!-- <dependency org="tomcat"
name="jasper-runtime"
rev="${jasper.version}"
Modified: hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy/libraries.properties?rev=1174566&r1=1174565&r2=1174566&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.20-security/src/contrib/streaming/ivy/libraries.properties Fri Sep 23 07:35:57 2011
@@ -6,3 +6,9 @@
commons-configuration.version=1.6
commons-math.version=2.1
+
+asm.version=3.2
+
+jersey-core.version=1.8
+jersey-json.version=1.8
+jersey-server.version=1.8