Move JRuby dependency below Joda

philwebb · philwebb · commit 856fb2ccacf6 · 2012-11-03T16:55:22.000-07:00
JRuby includes a copy of joda classes with the same package names.
This commit changes the order of the loaded jars to load the original
joda classes first.
diff --git a/build.gradle b/build.gradle
@@ -262,12 +262,12 @@ project('spring-context') {
         }
         compile("org.beanshell:bsh:2.0b4", optional)
         compile("org.codehaus.groovy:groovy-all:1.6.3", optional)
-        compile("org.jruby:jruby:1.4.0", optional)
         compile("org.hibernate:hibernate-validator:4.2.0.Final") { dep ->
             optional dep
             exclude group: 'org.slf4j', module: 'slf4j-api'
         }
         compile("joda-time:joda-time:1.6", optional)
+        compile("org.jruby:jruby:1.4.0", optional)
         compile("javax.cache:cache-api:0.5", optional)
         compile("net.sf.ehcache:ehcache-core:2.0.0", optional)
         compile("org.slf4j:slf4j-api:1.6.1", optional)

Original file line number	Diff line number	Diff line change
`@@ -262,12 +262,12 @@ project('spring-context') {`
`262`	`262`	`}`
`263`	`263`	`compile("org.beanshell:bsh:2.0b4", optional)`
`264`	`264`	`compile("org.codehaus.groovy:groovy-all:1.6.3", optional)`
`265`		`- compile("org.jruby:jruby:1.4.0", optional)`
`266`	`265`	`compile("org.hibernate:hibernate-validator:4.2.0.Final") { dep ->`
`267`	`266`	`optional dep`
`268`	`267`	`exclude group: 'org.slf4j', module: 'slf4j-api'`
`269`	`268`	`}`
`270`	`269`	`compile("joda-time:joda-time:1.6", optional)`
	`270`	`+ compile("org.jruby:jruby:1.4.0", optional)`
`271`	`271`	`compile("javax.cache:cache-api:0.5", optional)`
`272`	`272`	`compile("net.sf.ehcache:ehcache-core:2.0.0", optional)`
`273`	`273`	`compile("org.slf4j:slf4j-api:1.6.1", optional)`