Author: omalley
Date: Fri Mar 4 03:45:55 2011
New Revision: 1077147
URL: http://svn.apache.org/viewvc?rev=1077147&view=rev
Log:
commit d2fa1dc3ef06146faf0820cd2a32302d2be76ff6
Author: Boris Shkolnik <[email protected]>
Date: Fri Feb 5 20:23:24 2010 +0000
HADOOP:6544 from
https://issues.apache.org/jira/secure/attachment/12435002/contrib.ivy.jackson.patch-3
+++ b/YAHOO-CHANGES.txt
+
+ HADOOP-6544. fix ivy settings to include JSON jackson.codehause.org
+ libs for .20 (boryas)
Modified:
hadoop/common/branches/branch-0.20-security-patches/.eclipse.templates/.classpath
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/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/streaming/ivy.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/streaming/ivy/libraries.properties
Modified:
hadoop/common/branches/branch-0.20-security-patches/.eclipse.templates/.classpath
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/.eclipse.templates/.classpath?rev=1077147&r1=1077146&r2=1077147&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/.eclipse.templates/.classpath
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/.eclipse.templates/.classpath
Fri Mar 4 03:45:55 2011
@@ -35,15 +35,17 @@
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/servlet-api-2.5-6.1.14.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/core-3.1.1.jar"/>
<classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/slf4j-api-1.4.3.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/slf4j-log4j12-1.4.3.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/xmlenc-0.52.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/aspectjrt-1.6.5.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/aspectjtools-1.6.5.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/xmlenc-0.52.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jackson-mapper-asl-1.0.1.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/jackson-core-asl-1.0.1.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/aspectjrt-1.6.5.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/aspectjtools-1.6.5.jar"/>
<classpathentry kind="lib"
path="src/test/lib/ftplet-api-1.0.0-SNAPSHOT.jar"/>
<classpathentry kind="lib"
path="src/test/lib/ftpserver-core-1.0.0-SNAPSHOT.jar"/>
<classpathentry kind="lib"
path="src/test/lib/ftpserver-server-1.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib"
path="src/test/lib/mina-core-2.0.0-M2-20080407.124109-12.jar"/>
- <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/mockito-all-1.8.0.jar"/>i
+ <classpathentry kind="lib"
path="src/test/lib/mina-core-2.0.0-M2-20080407.124109-12.jar"/>
+ <classpathentry kind="lib"
path="build/ivy/lib/Hadoop/common/mockito-all-1.8.0.jar"/>
<classpathentry kind="lib" path="build/test/classes"/>
<classpathentry kind="output" path="build/eclipse-classes"/>
</classpath>
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=1077147&r1=1077146&r2=1077147&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 03:45:55 2011
@@ -56,5 +56,13 @@
name="commons-codec"
rev="${commons-codec.version}"
conf="common->default"/>
+ <dependency org="org.codehaus.jackson"
+ name="jackson-mapper-asl"
+ rev="${jackson.version}"
+ conf="common->default"/>
+ <dependency org="org.codehaus.jackson"
+ name="jackson-core-asl"
+ rev="${jackson.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=1077147&r1=1077146&r2=1077147&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 03:45:55 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)
+
+jackson.version=1.0.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=1077147&r1=1077146&r2=1077147&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 03:45:55 2011
@@ -78,5 +78,13 @@
name="core"
rev="${core.version}"
conf="common->default"/>
+ <dependency org="org.codehaus.jackson"
+ name="jackson-mapper-asl"
+ rev="${jackson.version}"
+ conf="common->default"/>
+ <dependency org="org.codehaus.jackson"
+ name="jackson-core-asl"
+ rev="${jackson.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=1077147&r1=1077146&r2=1077147&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 03:45:55 2011
@@ -3,3 +3,5 @@
#These are the versions of our dependencies (in alphabetical order)
log4j.version=1.2.15
slf4j-api.version=1.4.3
+jackson.version=1.0.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=1077147&r1=1077146&r2=1077147&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 03:45:55 2011
@@ -80,5 +80,13 @@
name="commons-codec"
rev="${commons-codec.version}"
conf="common->default"/>
+ <dependency org="org.codehaus.jackson"
+ name="jackson-mapper-asl"
+ rev="${jackson.version}"
+ conf="common->default"/>
+ <dependency org="org.codehaus.jackson"
+ name="jackson-core-asl"
+ rev="${jackson.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=1077147&r1=1077146&r2=1077147&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 03:45:55 2011
@@ -3,3 +3,6 @@
#Please list the dependencies name with version if they are different from the
ones
#listed in the global libraries.properties file (in alphabetical order)
+
+jackson.version=1.0.1
+
