From 4f24643fd396a4dbf1f1a91201996f30d9c5d967 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 5 Jan 2014 02:47:44 +0100 Subject: [PATCH] Upgraded selected build dependencies to early 2013 releases --- build.gradle | 41 +++++++++++++++++++++-------------------- spring-oxm/oxm.gradle | 4 ++-- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index b751cb9dd5..d1ebe30503 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ configure(allprojects) { project -> } ext.javadocLinks = [ - "http://docs.oracle.com/javase/6/docs/api/", + "http://docs.oracle.com/javase/7/docs/api/", "http://docs.oracle.com/javaee/6/api/", "http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ "http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/", @@ -91,14 +91,15 @@ configure(allprojects) { project -> "http://commons.apache.org/proper/commons-dbcp/apidocs/", "http://portals.apache.org/pluto/portlet-2.0-apidocs/", "http://tiles.apache.org/framework/apidocs/", - "http://ibatis.apache.org/docs/java/dev/", - "http://hc.apache.org/httpclient-3.x/apidocs/", "http://aopalliance.sourceforge.net/doc/", "http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", "http://ehcache.org/apidocs/", - "http://quartz-scheduler.org/api/2.1.5/", - "http://jackson.codehaus.org/1.4.2/javadoc/", - "http://fasterxml.github.com/jackson-core/javadoc/2.0.1/", + "http://quartz-scheduler.org/api/2.1.7/", + "http://jackson.codehaus.org/1.9.4/javadoc/", + "http://fasterxml.github.com/jackson-core/javadoc/2.3.0/", + "http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/", + "http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs", + "http://ibatis.apache.org/docs/java/dev/" ] as String[] } @@ -127,7 +128,7 @@ configure(subprojects - project(":spring-build-src")) { subproject -> options.author = true options.header = project.name options.links(project.ext.javadocLinks) - if(JavaVersion.current().isJava8Compatible()) { + if (JavaVersion.current().isJava8Compatible()) { options.addStringOption('Xdoclint:none', '-quiet') } @@ -320,15 +321,15 @@ project("spring-context") { compile(project(":spring-expression")) compile(project(":spring-core")) compile(files(project(":spring-core").cglibRepackJar)) - optional("backport-util-concurrent:backport-util-concurrent:3.0") optional("javax.ejb:ejb-api:3.0") optional("javax.inject:javax.inject:1") + optional("backport-util-concurrent:backport-util-concurrent:3.0") optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1") optional("javax.persistence:persistence-api:1.0") - optional("org.beanshell:bsh:2.0b4") - optional("org.codehaus.groovy:groovy-all:1.8.8") - optional("org.jruby:jruby:1.6.5.1") optional("joda-time:joda-time:2.1") + optional("org.beanshell:bsh:2.0b4") + optional("org.codehaus.groovy:groovy-all:1.8.9") + optional("org.jruby:jruby:1.7.2") optional("org.slf4j:slf4j-api:${slf4jVersion}") optional("javax.validation:validation-api:1.0.0.GA") optional("org.hibernate:hibernate-validator:4.3.0.Final") @@ -379,9 +380,9 @@ project("spring-oxm") { compile(project(":spring-beans")) compile(project(":spring-core")) testCompile(project(":spring-context")) - optional("com.thoughtworks.xstream:xstream:1.3.1") - optional("org.jibx:jibx-run:1.2.3") - optional("org.apache.xmlbeans:xmlbeans:2.4.0") + optional("com.thoughtworks.xstream:xstream:1.4.4") + optional("org.jibx:jibx-run:1.2.5") + optional("org.apache.xmlbeans:xmlbeans:2.6.0") optional("org.codehaus.castor:castor-xml:1.3.2") testCompile("org.codehaus.jettison:jettison:1.0.1") testCompile("xmlunit:xmlunit:1.3") @@ -437,13 +438,13 @@ project("spring-context-support") { compile(project(":spring-context")) optional(project(":spring-jdbc")) // for Quartz support optional(project(":spring-tx")) // for Quartz support - optional("javax.mail:mail:1.4") + optional("javax.mail:mail:1.4.7") optional("javax.cache:cache-api:0.5") optional("net.sf.ehcache:ehcache-core:2.0.0") optional("opensymphony:quartz:1.6.2") optional("org.codehaus.fabric3.api:commonj:1.1.0") optional("velocity:velocity:1.5") - optional("org.freemarker:freemarker:2.3.15") + optional("org.freemarker:freemarker:2.3.19") optional("com.lowagie:itext:2.1.7") optional("jasperreports:jasperreports:2.0.5") optional("org.slf4j:slf4j-api:${slf4jVersion}") @@ -460,6 +461,7 @@ project("spring-context-support") { project("spring-web") { description = "Spring Web" + dependencies { compile(project(":spring-core")) compile(project(":spring-beans")) // for MultiPartFilter @@ -576,7 +578,7 @@ project("spring-webmvc") { optional("rome:rome:1.0") optional("velocity:velocity:1.5") optional("velocity-tools:velocity-tools-view:1.4") - optional("org.freemarker:freemarker:2.3.15") + optional("org.freemarker:freemarker:2.3.19") optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2") optional("com.fasterxml.jackson.core:jackson-databind:2.0.1") provided("javax.servlet:jstl:1.2") @@ -707,7 +709,6 @@ project("spring-test") { // "TestCase" classes are run by other test classes, not the build. exclude(["**/*TestCase.class", "**/*TestSuite.class"]) } - } project("spring-test-mvc") { @@ -730,7 +731,7 @@ project("spring-test-mvc") { testCompile("com.thoughtworks.xstream:xstream:1.3.1") testCompile("rome:rome:1.0") testCompile("javax.activation:activation:1.1") - testCompile("javax.mail:mail:1.4") + testCompile("javax.mail:mail:1.4.7") testCompile("org.apache.tiles:tiles-request-api:1.0.1") testCompile("org.apache.tiles:tiles-api:3.0.1") testCompile("org.apache.tiles:tiles-core:3.0.1") { @@ -771,7 +772,7 @@ project("spring-aspects") { optional(project(":spring-orm")) // for JPA exception translation support aspects(project(":spring-orm")) provided("javax.persistence:persistence-api:1.0") - testCompile("javax.mail:mail:1.4") + testCompile("javax.mail:mail:1.4.7") ajc("org.aspectj:aspectjtools:${aspectjVersion}") rt("org.aspectj:aspectjrt:${aspectjVersion}") compile("org.aspectj:aspectjweaver:${aspectjVersion}") diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle index 0b8aee62e9..30b9535c6f 100644 --- a/spring-oxm/oxm.gradle +++ b/spring-oxm/oxm.gradle @@ -8,8 +8,8 @@ dependencies { castor "org.codehaus.castor:castor-anttasks:1.2" castor "velocity:velocity:1.5" xjc "com.sun.xml.bind:jaxb-xjc:2.1.7" - xmlbeans "org.apache.xmlbeans:xmlbeans:2.4.0" - jibx "org.jibx:jibx-bind:1.2.3" + xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0" + jibx "org.jibx:jibx-bind:1.2.5" jibx "bcel:bcel:5.1" }