Author: omalley
Date: Fri Mar 4 04:35:42 2011
New Revision: 1077608
URL: http://svn.apache.org/viewvc?rev=1077608&view=rev
Log:
commit 6c82059c8a9ef8f51283dd5e78ccfc11fa4ed612
Author: Luke Lu <[email protected]>
Date: Tue Jul 27 17:33:29 2010 -0700
Fix ivy dependencies for contrib tests.
Modified:
hadoop/common/branches/branch-0.20-security-patches/.gitignore
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy/libraries.properties
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy/libraries.properties
Modified: hadoop/common/branches/branch-0.20-security-patches/.gitignore
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/.gitignore?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/.gitignore (original)
+++ hadoop/common/branches/branch-0.20-security-patches/.gitignore Fri Mar 4
04:35:42 2011
@@ -34,6 +34,8 @@ conf/capacity-scheduler.xml
docs/api/
ivy/ivy-*.jar
ivy/maven-ant-tasks-*.jar
+junitvmwatch*.properties
+junit[0-9]*.properties
logs/
src/contrib/ec2/bin/hadoop-ec2-env.sh
src/contrib/index/conf/index-config.xml
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -64,5 +64,13 @@
name="jackson-core-asl"
rev="${jackson.version}"
conf="common->default"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/capacity-scheduler/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -5,3 +5,5 @@
#listed in the global libraries.properties file (in alphabetical order)
jackson.version=1.0.1
+commons-configuration.version=1.6
+commons-math.version=2.1
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -32,5 +32,13 @@
name="log4j"
rev="${log4j.version}"
conf="common->master"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/data_join/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -3,3 +3,5 @@
#Please list the dependencies name with version if they are different from the
ones
#listed in the global libraries.properties file (in alphabetical order)
+commons-configuration.version=1.6
+commons-math.version=2.1
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -32,6 +32,13 @@
name="log4j"
rev="${log4j.version}"
conf="common->master"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
-
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/fuse-dfs/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -3,3 +3,5 @@
#Please list the dependencies name with version if they are different from the
ones
#listed in the global libraries.properties file (in alphabetical order)
+commons-configuration.version=1.6
+commons-math.version=2.1
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -93,5 +93,13 @@
name="jackson-core-asl"
rev="${jackson.version}"
conf="common->default"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/gridmix/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -20,3 +20,5 @@
#listed in the global libraries.properties file (in alphabetical order)
jackson.version=1.0.1
+commons-configuration.version=1.6
+commons-math.version=2.1
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -86,5 +86,13 @@
name="jackson-core-asl"
rev="${jackson.version}"
conf="common->default"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -4,4 +4,5 @@
log4j.version=1.2.15
slf4j-api.version=1.4.3
jackson.version=1.0.1
-
+commons-configuration.version=1.6
+commons-math.version=2.1
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -36,5 +36,13 @@
name="lucene-core"
rev="${lucene-core.version}"
conf="common->default"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/index/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -2,3 +2,5 @@
#These are the versions of our dependencies (in alphabetical order)
#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
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -88,5 +88,13 @@
name="jackson-core-asl"
rev="${jackson.version}"
conf="common->default"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -5,4 +5,5 @@
#listed in the global libraries.properties file (in alphabetical order)
jackson.version=1.0.1
-
+commons-configuration.version=1.6
+commons-math.version=2.1
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy.xml?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy.xml
Fri Mar 4 04:35:42 2011
@@ -32,5 +32,13 @@
name="log4j"
rev="${log4j.version}"
conf="common->master"/>
+ <dependency org="commons-configuration"
+ name="commons-configuration"
+ rev="${commons-configuration.version}"
+ conf="common->default"/>
+ <dependency org="org.apache.commons"
+ name="commons-math"
+ rev="${commons-math.version}"
+ conf="common->default"/>
</dependencies>
</ivy-module>
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy/libraries.properties?rev=1077608&r1=1077607&r2=1077608&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy/libraries.properties
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/contrib/thriftfs/ivy/libraries.properties
Fri Mar 4 04:35:42 2011
@@ -3,3 +3,5 @@
#Please list the dependencies name with version if they are different from the
ones
#listed in the global libraries.properties file (in alphabetical order)
+commons-configuration.version=1.6
+commons-math.version=2.1