From ef41a12fea97384de709c7e40ae4af6374367db8 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Fri, 27 Mar 2009 00:01:41 +0000
Subject: [PATCH] updated to JRuby 1.2 (remaining compatible with JRuby 1.1 and
 above)

---
 org.springframework.context/context.iml | 13 +++++++++++--
 org.springframework.context/ivy.xml     |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/org.springframework.context/context.iml b/org.springframework.context/context.iml
index 78208a078f..89325e9ac4 100644
--- a/org.springframework.context/context.iml
+++ b/org.springframework.context/context.iml
@@ -30,11 +30,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.1.0/com.springsource.org.jruby-1.1.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-1.2.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.1.0/com.springsource.org.jruby-sources-1.1.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.jruby/com.springsource.org.jruby/1.2.0/com.springsource.org.jruby-sources-1.2.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -202,6 +202,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../org.springframework.asm/target/artifacts/org.springframework.asm.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
   <component name="copyright">
     <Base>
diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index 89c125b907..8004b5c753 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -42,10 +42,10 @@
 		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="test->compile"/>
 		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional, aspectj->compile"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.3.RELEASE" conf="optional, aspectj->compile"/>
 		<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
 		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.5.1" conf="optional, groovy->compile"/>
-		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.1.0" conf="optional, jruby->compile"/>
+		<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.2.0" conf="optional, jruby->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>