From dc80cad45c791f97faae4f9ef63888b2b774a438 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 15 Jun 2011 10:39:04 +0000
Subject: [PATCH] Upgrade to Castor 1.3.2

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4547 50f2f4bb-b051-0410-bef5-90022cba6387
---
 org.springframework.oxm/ivy.xml |  5 +----
 org.springframework.oxm/oxm.iml | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/org.springframework.oxm/ivy.xml b/org.springframework.oxm/ivy.xml
index 265c32a3a6f..b6f2564cb16 100644
--- a/org.springframework.oxm/ivy.xml
+++ b/org.springframework.oxm/ivy.xml
@@ -36,12 +36,9 @@
 					conf="optional, jibx->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
 					conf="compile, commons-logging->compile"/>
-		<!--Xerces dependency should be removed when BRITS-259 is fixed-->
-		<dependency org="org.apache.xerces" name="com.springsource.org.apache.xerces" rev="2.8.1"
-					conf="optional, castor->compile"/>
 		<dependency org="org.apache.xmlbeans" name="com.springsource.org.apache.xmlbeans" rev="2.4.0"
 					conf="optional, xmlbeans->compile"/>
-		<dependency org="org.codehaus.castor" name="com.springsource.org.castor" rev="1.2.0"
+		<dependency org="org.codehaus.castor" name="com.springsource.org.castor.xml" rev="1.3.2"
 					conf="optional, castor->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
 					conf="compile->compile"/>
diff --git a/org.springframework.oxm/oxm.iml b/org.springframework.oxm/oxm.iml
index f1939f9d5a5..573279c1457 100644
--- a/org.springframework.oxm/oxm.iml
+++ b/org.springframework.oxm/oxm.iml
@@ -88,17 +88,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.castor/com.springsource.org.castor/1.2.0/com.springsource.org.castor-1.2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.castor/com.springsource.org.castor/1.2.0/com.springsource.org.castor-sources-1.2.0.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -152,6 +141,26 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.codehaus.castor/com.springsource.org.castor.core/1.3.2/com.springsource.org.castor.core-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.codehaus.castor/com.springsource.org.castor.xml/1.3.2/com.springsource.org.castor.xml-1.3.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/org.codehaus.castor/com.springsource.org.castor.xml/1.3.2/com.springsource.org.castor.xml-sources-1.3.2.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
   </component>
   <component name="copyright">
     <Base>