Update dependencies to latest maintenance releases

This commit is contained in:
Rossen Stoyanchev
2016-06-16 11:17:42 -04:00
parent 21cd54eca4
commit 4379eef725

View File

@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
classpath("io.spring.gradle:spring-io-plugin:0.0.4.RELEASE")
classpath("io.spring.gradle:spring-io-plugin:0.0.5.RELEASE")
classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
classpath("me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1")
}
@@ -69,16 +69,20 @@ configure(subprojects.findAll {
}
dependencies {
testCompile("junit:junit-dep:4.10")
testCompile("junit:junit-dep:4.11")
testCompile("org.hamcrest:hamcrest-all:1.3")
testCompile("org.easymock:easymock:3.1")
testCompile("org.easymock:easymock:3.4")
}
subproject.ext {
springVersion = "4.2.0.RELEASE"
springSecurityVersion = "4.0.1.RELEASE"
slf4jVersion = "1.7.5"
log4jVersion = "1.2.17"
springVersion = "4.2.6.RELEASE"
springSecurityVersion = "4.0.4.RELEASE"
slf4jVersion = "1.7.21"
log4jVersion = "1.2.17"
tiles2Version = "2.2.2"
tiles3Version = "3.0.5"
hibernate4Version = "4.2.21.Final"
}
tasks.withType(Test).all {
@@ -134,14 +138,14 @@ project("spring-binding") {
compile("org.springframework:spring-context:$springVersion")
compile("org.springframework:spring-core:$springVersion")
compile("org.springframework:spring-expression:$springVersion")
provided("javax.el:javax.el-api:2.2.4")
provided("javax.el:javax.el-api:2.2.5")
testCompile("log4j:log4j:$log4jVersion") {
exclude group: "javax.mail", module: "mail"
exclude group: "javax.jms", module: "jms"
exclude group: "com.sun.jdmk", module: "jmxtools"
exclude group: "com.sun.jmx", module: "jmxri"
}
testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.39")
testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.69")
}
}
@@ -167,14 +171,14 @@ project("spring-js") {
compile("org.springframework:spring-web:$springVersion")
compile("org.springframework:spring-webmvc:$springVersion")
provided("javax.servlet:javax.servlet-api:3.0.1")
optional("org.apache.tiles:tiles-api:2.2.2")
optional("org.apache.tiles:tiles-core:2.2.2") {
optional("org.apache.tiles:tiles-api:$tiles2Version")
optional("org.apache.tiles:tiles-core:$tiles2Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.apache.tiles:tiles-jsp:2.2.2") {
optional("org.apache.tiles:tiles-jsp:$tiles2Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.apache.tiles:tiles-servlet:2.2.2") {
optional("org.apache.tiles:tiles-servlet:$tiles2Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
testCompile("javax.servlet:jstl:1.2") {
@@ -200,24 +204,24 @@ project("spring-js-tiles3") {
compile("commons-logging:commons-logging:1.1.1")
compile("org.springframework:spring-core:$springVersion")
compile("org.springframework:spring-webmvc:$springVersion")
optional("javax.el:javax.el-api:2.2.4")
optional("javax.el:javax.el-api:2.2.5")
optional("javax.servlet:javax.servlet-api:3.0.1")
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
optional("org.apache.tiles:tiles-request-api:1.0.1")
optional("org.apache.tiles:tiles-api:3.0.1")
optional("org.apache.tiles:tiles-core:3.0.1") {
optional("org.apache.tiles:tiles-api:$tiles3Version")
optional("org.apache.tiles:tiles-core:$tiles3Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.apache.tiles:tiles-servlet:3.0.1") {
optional("org.apache.tiles:tiles-servlet:$tiles3Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.apache.tiles:tiles-jsp:3.0.1") {
optional("org.apache.tiles:tiles-jsp:$tiles3Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.apache.tiles:tiles-el:3.0.1") {
optional("org.apache.tiles:tiles-el:$tiles3Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.apache.tiles:tiles-extras:3.0.1") {
optional("org.apache.tiles:tiles-extras:$tiles3Version") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
exclude group: "org.springframework", module: "spring-web"
exclude group: "ognl", module: "ognl"
@@ -243,12 +247,12 @@ project("spring-webflow") {
compile("org.springframework:spring-expression:$springVersion")
compile("org.springframework:spring-web:$springVersion")
compile("org.springframework:spring-webmvc:$springVersion")
provided("javax.el:javax.el-api:2.2.4")
provided("javax.el:javax.el-api:2.2.5")
provided("javax.servlet:javax.servlet-api:3.0.1")
provided("javax.portlet:portlet-api:2.0")
provided("junit:junit:3.8.2")
provided("org.eclipse.persistence:javax.persistence:2.0.0")
optional("org.hibernate:hibernate-core:4.2.8.Final") {
provided("org.eclipse.persistence:javax.persistence:2.0.5")
optional("org.hibernate:hibernate-core:$hibernate4Version") {
exclude group: "org.slf4j", module: "slf4j-api"
}
optional("org.slf4j:slf4j-api:$slf4jVersion")
@@ -257,10 +261,9 @@ project("spring-webflow") {
optional("org.springframework:spring-tx:$springVersion")
optional("org.springframework:spring-webmvc-portlet:$springVersion")
testCompile("javax.validation:validation-api:1.0.0.GA")
testCompile("org.hibernate:hibernate-core:4.2.10.Final")
testCompile("org.hibernate:hibernate-entitymanager:4.2.10.Final")
testCompile("org.hibernate:hibernate-validator:4.3.1.Final")
testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.39")
testCompile("org.hibernate:hibernate-entitymanager:$hibernate4Version")
testCompile("org.hibernate:hibernate-validator:4.3.2.Final")
testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.69")
testCompile("org.hsqldb:hsqldb:2.3.1")
testCompile("org.springframework:spring-aop:$springVersion")
testCompile("org.springframework:spring-jdbc:$springVersion")
@@ -281,12 +284,12 @@ project("spring-faces") {
compile("org.springframework:spring-expression:$springVersion")
compile("org.springframework:spring-web:$springVersion")
compile("org.springframework:spring-webmvc:$springVersion")
provided("javax.el:javax.el-api:2.2.4")
provided("javax.el:javax.el-api:2.2.5")
provided("javax.servlet:javax.servlet-api:3.0.1")
provided("javax.portlet:portlet-api:2.0")
provided("com.sun.faces:jsf-api:2.2.10")
provided("com.sun.faces:jsf-impl:2.2.10")
provided("org.apache.myfaces.core:myfaces-impl:2.1.14")
provided("com.sun.faces:jsf-api:2.2.13")
provided("com.sun.faces:jsf-impl:2.2.13")
provided("org.apache.myfaces.core:myfaces-impl:2.1.18")
optional("com.sun.facelets:jsf-facelets:1.1.14")
optional("org.springframework.security:spring-security-core:$springSecurityVersion")
optional("org.springframework.security:spring-security-web:$springSecurityVersion")
@@ -298,8 +301,8 @@ project("spring-faces") {
exclude group: "com.sun.jdmk", module: "jmxtools"
exclude group: "com.sun.jmx", module: "jmxri"
}
testCompile("org.apache.myfaces.test:myfaces-test22:1.0.6")
testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.39")
testCompile("org.apache.myfaces.test:myfaces-test22:1.0.7")
testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.69")
testCompile("org.slf4j:jcl-over-slf4j:$slf4jVersion")
testCompile("org.slf4j:slf4j-log4j12:$slf4jVersion") {
exclude group: "log4j", module: "log4j"