From 391c4cd67aecedd605d09623906186a6f458bd35 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 16 Jun 2011 04:36:53 +0000
Subject: [PATCH] Update pom and .classpath to reflect Castor upgrade

Issue: SPR-8341 SPR-8453

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4558 50f2f4bb-b051-0410-bef5-90022cba6387
---
 org.springframework.oxm/.classpath |  5 +++--
 org.springframework.oxm/pom.xml    | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/org.springframework.oxm/.classpath b/org.springframework.oxm/.classpath
index 7cc796fbef5..686de87c13e 100644
--- a/org.springframework.oxm/.classpath
+++ b/org.springframework.oxm/.classpath
@@ -11,8 +11,10 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-2.1.7.jar" sourcepath="/IVY_CACHE/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-sources-2.1.7.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.jibx/com.springsource.org.jibx.runtime/1.1.5/com.springsource.org.jibx.runtime-1.1.5.jar" sourcepath="/IVY_CACHE/net.sourceforge.jibx/com.springsource.org.jibx.runtime/1.1.5/com.springsource.org.jibx.runtime-sources-1.1.5.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.lang/2.5.0/com.springsource.org.apache.commons.lang-2.5.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.lang/2.5.0/com.springsource.org.apache.commons.lang-sources-2.5.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.xmlbeans/com.springsource.org.apache.xmlbeans/2.4.0/com.springsource.org.apache.xmlbeans-2.4.0.jar" sourcepath="/IVY_CACHE/org.apache.xmlbeans/com.springsource.org.apache.xmlbeans/2.4.0/com.springsource.org.apache.xmlbeans-sources-2.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.castor/com.springsource.org.castor/1.2.0/com.springsource.org.castor-1.2.0.jar" sourcepath="/IVY_CACHE/org.codehaus.castor/com.springsource.org.castor/1.2.0/com.springsource.org.castor-sources-1.2.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.castor/com.springsource.org.castor.core/1.3.2/com.springsource.org.castor.core-1.3.2.jar" sourcepath="/IVY_CACHE/org.codehaus.castor.core/com.springsource.org.castor.core/1.3.2/com.springsource.org.castor.core-sources-1.3.2.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.castor/com.springsource.org.castor.xml/1.3.2/com.springsource.org.castor.xml-1.3.2.jar" sourcepath="/IVY_CACHE/org.codehaus.castor.xml/com.springsource.org.castor.xml/1.3.2/com.springsource.org.castor.xml-sources-1.3.2.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.context"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
@@ -21,6 +23,5 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.jettison/com.springsource.org.codehaus.jettison/1.0.1/com.springsource.org.codehaus.jettison-1.0.1.jar" sourcepath="/IVY_CACHE/org.codehaus.jettison/com.springsource.org.codehaus.jettison/1.0.1/com.springsource.org.codehaus.jettison-sources-1.0.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar" sourcepath="/IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.xmlpull/com.springsource.org.xmlpull/1.1.3.4-O/com.springsource.org.xmlpull-1.1.3.4-O.jar" sourcepath="/IVY_CACHE/org.xmlpull/com.springsource.org.xmlpull/1.1.3.4-O/com.springsource.org.xmlpull-sources-1.1.3.4-O.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-2.8.1.jar" sourcepath="/IVY_CACHE/org.apache.xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-sources-2.8.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 701b405249b..ffe6f8832dc 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -35,10 +35,10 @@
 		</dependency>
 		<!-- common logging dependency is in spring-core -->
 		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.8.1</version>
-			<optional>true</optional>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.5</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.xmlbeans</groupId>
@@ -48,8 +48,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.castor</groupId>
-			<artifactId>castor</artifactId>
-			<version>1.2</version>
+			<artifactId>castor-xml</artifactId>
+			<version>1.3.2</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>