diff --git a/build.gradle b/build.gradle index 7cd317606e..a8de5960c9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,14 +20,15 @@ configure(allprojects) { project -> ext.hibValVersion = "4.3.1.Final" ext.hsqldbVersion = "2.3.2" ext.jackson1Version = "1.9.13" - ext.jackson2Version = "2.3.2" + ext.jackson2Version = "2.3.3" ext.jasperReportsVersion = "5.5.1" ext.jettyVersion = "9.1.4.v20140401" ext.jodaVersion = "2.3" ext.junitVersion = "4.11" - ext.slf4jVersion = "1.7.6" + ext.slf4jVersion = "1.7.7" ext.tiles2Version = "2.2.2" ext.tiles3Version = "3.0.3" + ext.tomcatVersion = "8.0.5" ext.xstreamVersion = "1.4.7" ext.gradleScriptDir = "${rootProject.projectDir}/gradle" @@ -374,7 +375,7 @@ project("spring-context") { optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.beanshell:bsh:2.0b4") - optional("org.jruby:jruby:1.7.10") + optional("org.jruby:jruby:1.7.12") testCompile("javax.inject:javax.inject-tck:1") testCompile("commons-dbcp:commons-dbcp:1.4") testCompile("org.slf4j:slf4j-api:${slf4jVersion}") @@ -416,9 +417,9 @@ project("spring-messaging") { testCompile("org.eclipse.jetty:jetty-webapp:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet-api" } - testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.3") - testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:8.0.3") - testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.3") + testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") + testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}") + testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}") testCompile("commons-dbcp:commons-dbcp:1.4") testCompile("log4j:log4j:1.2.17") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") @@ -457,8 +458,9 @@ project("spring-oxm") { dependencies { compile(project(":spring-beans")) compile(project(":spring-core")) - optional("org.codehaus.castor:castor-xml:1.3.2") { + optional("org.codehaus.castor:castor-xml:1.3.3") { exclude group: 'stax', module: 'stax-api' + exclude group: "org.springframework", module: "spring-context" } optional("org.apache.xmlbeans:xmlbeans:2.6.0") { exclude group: 'stax', module: 'stax-api' @@ -508,11 +510,11 @@ project("spring-jdbc") { compile(project(":spring-tx")) optional(project(":spring-context")) // for JndiDataSourceLookup optional("javax.transaction:javax.transaction-api:1.2") - optional("c3p0:c3p0:0.9.1.2") + optional("com.mchange:c3p0:0.9.2.1") optional("org.hsqldb:hsqldb:${hsqldbVersion}") - optional("com.h2database:h2:1.0.71") - optional("org.apache.derby:derby:10.10.1.1") - optional("org.apache.derby:derbyclient:10.10.1.1") + optional("com.h2database:h2:1.3.176") + optional("org.apache.derby:derby:10.10.2.0") + optional("org.apache.derby:derbyclient:10.10.2.0") } } @@ -527,7 +529,7 @@ project("spring-context-support") { optional(project(":spring-tx")) // for Quartz support optional("javax.mail:mail:1.4.7") optional("javax.cache:cache-api:1.0.0") - optional("com.google.guava:guava:16.0.1") + optional("com.google.guava:guava:17.0") optional("net.sf.ehcache:ehcache-core:2.6.5") optional("org.quartz-scheduler:quartz:1.8.6") { exclude group: "org.slf4j", module: "slf4j-log4j12" @@ -537,7 +539,7 @@ project("spring-context-support") { optional("org.freemarker:freemarker:2.3.20") optional("com.lowagie:itext:2.1.7") optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") - testCompile("org.apache.poi:poi:3.9") + testCompile("org.apache.poi:poi:3.10-FINAL") testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") @@ -598,7 +600,7 @@ project("spring-websocket") { optional(project(":spring-webmvc")) optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.websocket:javax.websocket-api:1.0") - optional("org.apache.tomcat:tomcat-websocket:8.0.3") { + optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") { exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" } @@ -611,19 +613,18 @@ project("spring-websocket") { exclude group: "javax.servlet", module: "javax.servlet" } optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}") - optional("io.undertow:undertow-core:1.0.0.Final") - optional("io.undertow:undertow-servlet:1.0.0.Final") { + optional("io.undertow:undertow-core:1.0.1.Final") + optional("io.undertow:undertow-servlet:1.0.1.Final") { exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_3.1_spec" exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.2_spec" } - optional("io.undertow:undertow-websockets-jsr:1.0.0.Final") { + optional("io.undertow:undertow-websockets-jsr:1.0.1.Final") { exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.0_spec" } optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") - testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.3") - testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:8.0.3") - testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.3") - + testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") + testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}") + testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}") testCompile("org.projectreactor:reactor-core:1.1.0.RELEASE") testCompile("org.projectreactor:reactor-net:1.1.0.RELEASE") testCompile("log4j:log4j:1.2.17") @@ -701,7 +702,7 @@ project("spring-webmvc") { optional("javax.servlet.jsp:jsp-api:2.2") optional("javax.servlet:jstl:1.2") optional("net.sourceforge.jexcelapi:jxl:2.6.12") - optional("org.apache.poi:poi:3.9") + optional("org.apache.poi:poi:3.10-FINAL") optional("org.apache.velocity:velocity:1.7") optional("velocity-tools:velocity-tools-view:1.4") optional("org.freemarker:freemarker:2.3.20") @@ -1176,7 +1177,7 @@ configure(rootProject) { task wrapper(type: Wrapper) { description = "Generates gradlew[.bat] scripts" - gradleVersion = "1.11" + gradleVersion = "1.12" doLast() { def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf127..0087cd3b18 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b964f07083..7dab6dc93c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 12 23:28:21 CET 2014 +#Wed Apr 30 13:06:57 CEST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip