Upgraded SLF4J, JOpt, JRuby, Commons Pool & Commons DBCP to latest versions

This commit is contained in:
Juergen Hoeller
2014-01-26 00:12:21 +01:00
parent 56b7d7a94a
commit e0fd54b8c2

View File

@@ -24,7 +24,7 @@ configure(allprojects) { project ->
ext.jettyVersion = "9.1.1.v20140108" ext.jettyVersion = "9.1.1.v20140108"
ext.jodaVersion = "2.3" ext.jodaVersion = "2.3"
ext.junitVersion = "4.11" ext.junitVersion = "4.11"
ext.slf4jVersion = "1.6.1" ext.slf4jVersion = "1.7.5"
ext.xstreamVersion = "1.4.6" ext.xstreamVersion = "1.4.6"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle" ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
@@ -233,7 +233,7 @@ project("spring-core") {
compile(files(cglibRepackJar)) compile(files(cglibRepackJar))
compile("commons-logging:commons-logging:1.1.1") compile("commons-logging:commons-logging:1.1.1")
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("net.sf.jopt-simple:jopt-simple:4.4") optional("net.sf.jopt-simple:jopt-simple:4.6")
optional("log4j:log4j:1.2.17") optional("log4j:log4j:1.2.17")
testCompile("xmlunit:xmlunit:1.3") testCompile("xmlunit:xmlunit:1.3")
testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") { testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
@@ -309,7 +309,7 @@ project("spring-aop") {
compile(files(project(":spring-core").objenesisRepackJar)) compile(files(project(":spring-core").objenesisRepackJar))
compile("aopalliance:aopalliance:1.0") compile("aopalliance:aopalliance:1.0")
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("commons-pool:commons-pool:1.5.3") optional("commons-pool:commons-pool:1.6")
optional("com.jamonapi:jamon:2.4") optional("com.jamonapi:jamon:2.4")
} }
} }
@@ -365,10 +365,10 @@ project("spring-context") {
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.beanshell:bsh:2.0b4") optional("org.beanshell:bsh:2.0b4")
optional("org.jruby:jruby:1.7.2") optional("org.jruby:jruby:1.7.10")
optional("org.slf4j:slf4j-api:${slf4jVersion}")
testCompile("commons-dbcp:commons-dbcp:1.2.2")
testCompile("javax.inject:javax.inject-tck:1") testCompile("javax.inject:javax.inject-tck:1")
testCompile("commons-dbcp:commons-dbcp:1.4")
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
} }
// pick up RmiInvocationWrapperRTD.xml in src/main // pick up RmiInvocationWrapperRTD.xml in src/main
@@ -408,7 +408,7 @@ project("spring-messaging") {
} }
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10") testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10")
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC10") testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC10")
testCompile("commons-dbcp:commons-dbcp:1.2.2") testCompile("commons-dbcp:commons-dbcp:1.4")
testCompile("log4j:log4j:1.2.17") testCompile("log4j:log4j:1.2.17")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
} }
@@ -522,11 +522,11 @@ project("spring-context-support") {
optional("org.freemarker:freemarker:2.3.20") optional("org.freemarker:freemarker:2.3.20")
optional("com.lowagie:itext:2.1.7") optional("com.lowagie:itext:2.1.7")
optional("net.sf.jasperreports:jasperreports:5.5.0") optional("net.sf.jasperreports:jasperreports:5.5.0")
optional("org.slf4j:slf4j-api:${slf4jVersion}")
testCompile("org.apache.poi:poi:3.9") testCompile("org.apache.poi:poi:3.9")
testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
} }
// pick up **/*.types files in src/main // pick up **/*.types files in src/main
@@ -605,10 +605,10 @@ project("spring-websocket") {
} }
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10") testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testCompile("log4j:log4j:1.2.17")
testCompile("org.projectreactor:reactor-core:1.0.0.RELEASE") testCompile("org.projectreactor:reactor-core:1.0.0.RELEASE")
testCompile("org.projectreactor:reactor-tcp:1.0.0.RELEASE") testCompile("org.projectreactor:reactor-tcp:1.0.0.RELEASE")
testCompile("log4j:log4j:1.2.17")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
} }
} }
@@ -632,7 +632,7 @@ project("spring-orm") {
optional("org.apache.openjpa:openjpa:2.2.1") optional("org.apache.openjpa:openjpa:2.2.1")
optional("javax.jdo:jdo-api:3.0") optional("javax.jdo:jdo-api:3.0")
optional("javax.servlet:javax.servlet-api:3.0.1") optional("javax.servlet:javax.servlet-api:3.0.1")
testCompile("commons-dbcp:commons-dbcp:1.2.2") testCompile("commons-dbcp:commons-dbcp:1.4")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
} }
@@ -697,7 +697,6 @@ project("spring-webmvc") {
exclude group: "org.springframework", module: "spring-web" exclude group: "org.springframework", module: "spring-web"
} }
testCompile(project(":spring-aop")) testCompile(project(":spring-aop"))
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testCompile("rhino:js:1.7R1") testCompile("rhino:js:1.7R1")
testCompile("xmlunit:xmlunit:1.3") testCompile("xmlunit:xmlunit:1.3")
testCompile("dom4j:dom4j:1.6.1") { testCompile("dom4j:dom4j:1.6.1") {
@@ -720,6 +719,7 @@ project("spring-webmvc") {
testCompile("commons-fileupload:commons-fileupload:1.3") testCompile("commons-fileupload:commons-fileupload:1.3")
testCompile("commons-io:commons-io:1.3") testCompile("commons-io:commons-io:1.3")
testCompile("joda-time:joda-time:${jodaVersion}") testCompile("joda-time:joda-time:${jodaVersion}")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
} }
// pick up DispatcherServlet.properties in src/main // pick up DispatcherServlet.properties in src/main
@@ -807,8 +807,6 @@ project("spring-test") {
testCompile(project(":spring-webmvc-tiles3")) testCompile(project(":spring-webmvc-tiles3"))
testCompile("javax.mail:mail:1.4.7") testCompile("javax.mail:mail:1.4.7")
testCompile("javax.ejb:ejb-api:3.0") testCompile("javax.ejb:ejb-api:3.0")
testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-core:${hibernate3Version}") testCompile("org.hibernate:hibernate-core:${hibernate3Version}")
testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}") testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
testCompile("org.hibernate:hibernate-validator:${hibValVersion}") testCompile("org.hibernate:hibernate-validator:${hibValVersion}")
@@ -824,6 +822,8 @@ project("spring-test") {
testCompile("org.apache.tiles:tiles-servlet:3.0.1") { testCompile("org.apache.tiles:tiles-servlet:3.0.1") {
exclude group: "org.slf4j", module: "jcl-over-slf4j" exclude group: "org.slf4j", module: "jcl-over-slf4j"
} }
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
} }
task testNG(type: Test) { task testNG(type: Test) {