diff --git a/acl/pom.xml b/acl/pom.xml index a4d7a75a2c..efca1c23bc 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -52,19 +52,19 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -76,33 +76,33 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true net.sf.ehcache ehcache - 2.6.5 + 2.9.0 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -120,7 +120,7 @@ org.hsqldb hsqldb - 2.3.1 + 2.3.2 test @@ -132,25 +132,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-context-support - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/aspects/pom.xml b/aspects/pom.xml index 2479e5a05b..24f4de49d5 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -46,19 +46,19 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -70,14 +70,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true org.aspectj aspectjrt - 1.6.10 + 1.8.4 compile true @@ -90,7 +90,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -114,19 +114,19 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/build.gradle b/build.gradle index cce671e8d2..637ca3b6c8 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7") classpath("org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE") - classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3") + classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.5") classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1') classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.1') classpath("io.spring.gradle:docbook-reference-plugin:0.3.0") @@ -25,8 +25,8 @@ allprojects { ext.releaseBuild = version.endsWith('RELEASE') ext.snapshotBuild = version.endsWith('SNAPSHOT') - ext.springVersion = '4.1.1.BUILD-SNAPSHOT' - ext.springLdapVersion = '2.0.1.RELEASE' + ext.springVersion = '4.1.3.RELEASE' + ext.springLdapVersion = '2.0.2.RELEASE' group = 'org.springframework.security' diff --git a/cas/cas.gradle b/cas/cas.gradle index 1050de61bf..d7f2727615 100644 --- a/cas/cas.gradle +++ b/cas/cas.gradle @@ -6,7 +6,7 @@ dependencies { "org.springframework:spring-context:$springVersion", "org.springframework:spring-beans:$springVersion", "org.springframework:spring-web:$springVersion", - "org.jasig.cas.client:cas-client-core:3.3.3" + "org.jasig.cas.client:cas-client-core:$casClientVersion" optional "net.sf.ehcache:ehcache:$ehcacheVersion" diff --git a/cas/pom.xml b/cas/pom.xml index 8ddca612db..2c03a886ac 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -58,19 +58,19 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -82,20 +82,20 @@ org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true net.sf.ehcache ehcache - 2.6.5 + 2.9.0 compile true @@ -108,7 +108,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -132,13 +132,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/config/config.gradle b/config/config.gradle index 17fd5c1a4f..221dbbe152 100644 --- a/config/config.gradle +++ b/config/config.gradle @@ -51,7 +51,7 @@ dependencies { 'ldapsdk:ldapsdk:4.1', powerMockDependencies, "org.hibernate:hibernate-entitymanager:3.6.10.Final", - "org.hsqldb:hsqldb:2.2.8", + "org.hsqldb:hsqldb:$hsqlVersion", spockDependencies testCompile('org.openid4java:openid4java-nodeps:0.9.6') { @@ -62,7 +62,7 @@ dependencies { } testRuntime "org.hsqldb:hsqldb:$hsqlVersion", - "cglib:cglib-nodep:2.2" + "cglib:cglib-nodep:$cglibVersion" } test { diff --git a/config/pom.xml b/config/pom.xml index dee0eeb5c1..409a142ef7 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -52,25 +52,25 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -82,14 +82,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true org.aspectj aspectjweaver - 1.6.10 + 1.8.4 compile true @@ -124,35 +124,35 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true org.springframework spring-websocket - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true @@ -165,13 +165,13 @@ cglib cglib-nodep - 2.2 + 3.1 test ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -231,7 +231,7 @@ org.codehaus.groovy groovy-all - 2.0.5 + 2.3.8 test @@ -261,13 +261,7 @@ org.hsqldb hsqldb - 2.2.8 - test - - - org.hsqldb - hsqldb - 2.3.1 + 2.3.2 test @@ -291,7 +285,7 @@ org.powermock powermock-api-mockito - 1.5.1 + 1.6.0 test @@ -303,37 +297,37 @@ org.powermock powermock-api-support - 1.5.1 + 1.6.0 test org.powermock powermock-core - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4 - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4-common - 1.5.1 + 1.6.0 test org.powermock powermock-reflect - 1.5.1 + 1.6.0 test org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test @@ -363,7 +357,7 @@ org.springframework.data spring-data-jpa - 1.7.0.RC1 + 1.7.1.RELEASE test @@ -375,7 +369,7 @@ org.springframework.ldap spring-ldap-core - 2.0.1.RELEASE + 2.0.2.RELEASE test @@ -393,19 +387,19 @@ org.springframework spring-expression - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-orm - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/core/core.gradle b/core/core.gradle index 37aea84f98..d44ddc1636 100644 --- a/core/core.gradle +++ b/core/core.gradle @@ -28,7 +28,7 @@ dependencies { included cryptoProject - testCompile 'commons-collections:commons-collections:3.2', + testCompile "commons-collections:commons-collections:$commonsCollectionsVersion", "org.springframework:spring-test:$springVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion", powerMockDependencies diff --git a/core/pom.xml b/core/pom.xml index 7b46b40a12..25ca636380 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -46,25 +46,25 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -76,13 +76,13 @@ org.springframework spring-expression - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -96,41 +96,41 @@ net.sf.ehcache ehcache - 2.6.5 + 2.9.0 compile true org.aspectj aspectjrt - 1.6.10 + 1.8.4 compile true org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test commons-collections commons-collections - 3.2 + 3.2.1 test @@ -166,7 +166,7 @@ org.hsqldb hsqldb - 2.3.1 + 2.3.2 test @@ -184,7 +184,7 @@ org.powermock powermock-api-mockito - 1.5.1 + 1.6.0 test @@ -196,7 +196,7 @@ org.powermock powermock-api-support - 1.5.1 + 1.6.0 test @@ -208,7 +208,7 @@ org.powermock powermock-core - 1.5.1 + 1.6.0 test @@ -220,7 +220,7 @@ org.powermock powermock-module-junit4 - 1.5.1 + 1.6.0 test @@ -232,7 +232,7 @@ org.powermock powermock-module-junit4-common - 1.5.1 + 1.6.0 test @@ -244,7 +244,7 @@ org.powermock powermock-reflect - 1.5.1 + 1.6.0 test @@ -256,7 +256,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test @@ -268,7 +268,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java index 98a48bc455..1688f94c2d 100644 --- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java +++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java @@ -23,7 +23,7 @@ public class SpringSecurityCoreVersion { */ public static final long SERIAL_VERSION_UID = 400L; - static final String MIN_SPRING_VERSION = "4.1.1.BUILD-SNAPSHOT"; + static final String MIN_SPRING_VERSION = "4.1.3.RELEASE"; static { performVersionChecks(); diff --git a/crypto/pom.xml b/crypto/pom.xml index fdc8b76836..b78b5de7e2 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -40,14 +40,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -71,13 +71,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/data/pom.xml b/data/pom.xml index ef8a89eda9..63b04b1834 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -40,7 +40,7 @@ org.springframework.data spring-data-commons - 1.9.0.RC1 + 1.9.1.RELEASE compile @@ -52,7 +52,7 @@ org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -64,14 +64,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -95,13 +95,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index eeea8be7fa..9b8c11adf9 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -12,24 +12,30 @@ apply plugin: 'propdeps-eclipse' sourceCompatibility = 1.5 targetCompatibility = 1.5 -ext.ehcacheVersion = '2.6.5' -ext.aspectjVersion = '1.8.4' ext.apacheDsVersion = '1.5.5' -ext.jstlVersion = '1.2.1' +ext.aspectjVersion = '1.8.4' +ext.casClientVersion = '3.3.3' +ext.cglibVersion = '3.1' +ext.commonsCodecVersion = '1.10' +ext.commonsCollectionsVersion = '3.2.1' +ext.commonsLoggingVersion = '1.2' +ext.ehcacheVersion = '2.9.0' +ext.gebVersion = '0.10.0' +ext.groovyVersion = '2.3.8' +ext.hsqlVersion = '2.3.2' +ext.jacksonDatavindVersion = '2.4.4' ext.jettyVersion = '6.1.26' -ext.hsqlVersion = '2.3.1' -ext.slf4jVersion = '1.7.5' -ext.logbackVersion = '0.9.29' -ext.cglibVersion = '2.2' -ext.powerMockVersion = '1.5.1' +ext.jstlVersion = '1.2.1' +ext.junitVersion = '4.11' +ext.logbackVersion = '1.1.2' +ext.powerMockVersion = '1.6.0' +ext.seleniumVersion = '2.44.0' ext.servletApiVersion = '3.0.1' -ext.seleniumVersion = '2.33.0' -ext.groovyVersion = '2.0.5' +ext.slf4jVersion = '1.7.7' ext.spockVersion = '0.7-groovy-2.0' -ext.gebVersion = '0.9.0' +ext.springDataCommonsVersion = '1.9.1.RELEASE' +ext.springDataJpaVersion = '1.7.1.RELEASE' ext.thymeleafVersion = '2.1.3.RELEASE' -ext.springDataJpaVersion = '1.7.0.RC1' -ext.springDataCommonsVersion = '1.9.0.RC1' ext.spockDependencies = [ dependencies.create("org.spockframework:spock-spring:$spockVersion") { @@ -119,9 +125,9 @@ project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 2, pro check.dependsOn integrationTest dependencies { - optional 'commons-logging:commons-logging:1.1.1' + optional "commons-logging:commons-logging:$commonsLoggingVersion" - testCompile 'junit:junit:4.11', + testCompile "junit:junit:$junitVersion", 'org.mockito:mockito-core:1.9.5', "org.springframework:spring-test:$springVersion", 'org.easytesting:fest-assert:1.4' diff --git a/gradle/tomcat.gradle b/gradle/tomcat.gradle index 3814c2a641..6eafb21ce9 100644 --- a/gradle/tomcat.gradle +++ b/gradle/tomcat.gradle @@ -3,14 +3,14 @@ buildscript { maven { url "https://repo.spring.io/plugins-release" } } dependencies { - classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3") + classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.5") } } apply plugin: 'tomcat' dependencies { - def tomcatVersion = '7.0.54' + def tomcatVersion = '7.0.57' tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}", "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}" tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") { diff --git a/itest/context/pom.xml b/itest/context/pom.xml index b7cc80bda2..f3fe241847 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -58,38 +58,38 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -107,7 +107,7 @@ org.aspectj aspectjweaver - 1.6.10 + 1.8.4 test @@ -125,7 +125,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test @@ -143,13 +143,13 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/itest/web/pom.xml b/itest/web/pom.xml index 39691d8b67..5abea00e57 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -40,19 +40,19 @@ org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -65,7 +65,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -141,7 +141,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test @@ -177,19 +177,19 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/ldap/pom.xml b/ldap/pom.xml index 579e954372..f703f097e9 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -40,29 +40,29 @@ org.springframework.ldap spring-ldap-core - 2.0.1.RELEASE + 2.0.2.RELEASE compile - spring-data-commons - org.springframework.data + spring-beans + org.springframework spring-core org.springframework - spring-tx - org.springframework - - - spring-beans - org.springframework + spring-data-commons + org.springframework.data commons-logging commons-logging + + spring-tx + org.springframework + @@ -74,19 +74,19 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -98,13 +98,13 @@ org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -160,7 +160,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -184,19 +184,19 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.slf4j slf4j-api - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/messaging/messaging.gradle b/messaging/messaging.gradle index 66a6b405d6..7c827835ae 100644 --- a/messaging/messaging.gradle +++ b/messaging/messaging.gradle @@ -10,7 +10,7 @@ dependencies { "org.springframework:spring-messaging:$springVersion" testCompile project(':spring-security-core').sourceSets.test.output, - 'commons-codec:commons-codec:1.3', + "commons-codec:commons-codec:$commonsCodecVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion", "org.codehaus.groovy:groovy-all:$groovyVersion", powerMockDependencies, diff --git a/messaging/pom.xml b/messaging/pom.xml index 8b841ebc22..62bcff153a 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -52,19 +52,19 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -76,32 +76,32 @@ org.springframework spring-expression - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-messaging - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test commons-codec commons-codec - 1.3 + 1.10 test @@ -113,7 +113,7 @@ org.codehaus.groovy groovy-all - 2.0.5 + 2.3.8 test @@ -125,7 +125,7 @@ org.hsqldb hsqldb - 2.3.1 + 2.3.2 test @@ -137,7 +137,7 @@ org.powermock powermock-api-mockito - 1.5.1 + 1.6.0 test @@ -149,37 +149,37 @@ org.powermock powermock-api-support - 1.5.1 + 1.6.0 test org.powermock powermock-core - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4 - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4-common - 1.5.1 + 1.6.0 test org.powermock powermock-reflect - 1.5.1 + 1.6.0 test org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test @@ -209,7 +209,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/openid/pom.xml b/openid/pom.xml index 7b06cc3ca3..365e343d9e 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -70,25 +70,25 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -100,13 +100,13 @@ org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -131,7 +131,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -155,13 +155,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/remoting/pom.xml b/remoting/pom.xml index 8fb01485b7..0649ff63fd 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -52,19 +52,19 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -76,20 +76,20 @@ org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -113,13 +113,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/aspectj-jc/pom.xml b/samples/aspectj-jc/pom.xml index 6616008a4d..1c29544e40 100644 --- a/samples/aspectj-jc/pom.xml +++ b/samples/aspectj-jc/pom.xml @@ -52,14 +52,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true org.aspectj aspectjrt - 1.6.10 + 1.8.4 compile true @@ -72,7 +72,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -96,13 +96,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/aspectj-xml/pom.xml b/samples/aspectj-xml/pom.xml index 1630b138e9..17444a1ae7 100644 --- a/samples/aspectj-xml/pom.xml +++ b/samples/aspectj-xml/pom.xml @@ -46,14 +46,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true org.aspectj aspectjrt - 1.6.10 + 1.8.4 compile true @@ -72,7 +72,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -96,13 +96,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/cas/sample-xml/cassample.gradle b/samples/cas/sample-xml/cassample.gradle index 4d8f36a836..441f4c9b38 100644 --- a/samples/cas/sample-xml/cassample.gradle +++ b/samples/cas/sample-xml/cassample.gradle @@ -30,7 +30,7 @@ dependencies { compile project(':spring-security-core'), project(':spring-security-cas'), - "org.jasig.cas.client:cas-client-core:3.3.3" + "org.jasig.cas.client:cas-client-core:$casClientVersion" runtime project(':spring-security-web'), project(':spring-security-config'), diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index 57e108d044..2ac9e7adc4 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -59,7 +59,7 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -72,19 +72,19 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime net.sf.ehcache ehcache - 2.6.5 + 2.9.0 runtime org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -102,7 +102,7 @@ org.springframework spring-context-support - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE runtime @@ -120,7 +120,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -144,7 +144,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -156,7 +156,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -186,7 +186,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/cas/server/casserver.gradle b/samples/cas/server/casserver.gradle index 84f62ecdf5..bdae92743e 100644 --- a/samples/cas/server/casserver.gradle +++ b/samples/cas/server/casserver.gradle @@ -9,7 +9,7 @@ configurations { casServer } dependencies { - casServer "org.jasig.cas:cas-server-webapp:3.4.3.1@war" + casServer "org.jasig.cas:cas-server-webapp:4.0.0@war" } task casServerOverlay(type: Sync) { diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index c96b89036a..25650cd637 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -41,14 +41,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -72,13 +72,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/cas/server/src/main/webapp/WEB-INF/deployerConfigContext.xml b/samples/cas/server/src/main/webapp/WEB-INF/deployerConfigContext.xml new file mode 100644 index 0000000000..2279123657 --- /dev/null +++ b/samples/cas/server/src/main/webapp/WEB-INF/deployerConfigContext.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml b/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml index 383bee26fc..707c197e29 100644 --- a/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml +++ b/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml @@ -1,96 +1,149 @@ + - - This is the main Spring configuration file with some of the main "core" classes defined. You shouldn't really - modify this unless you - know what you're doing! - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:p="http://www.springframework.org/schema/p" + xmlns:c="http://www.springframework.org/schema/c" + xmlns:util="http://www.springframework.org/schema/util" + xmlns:aop="http://www.springframework.org/schema/aop" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> + + This is the main Spring configuration file with some of the main "core" classes defined. You shouldn't really + modify this unless you + know what you're doing! + - - + + - - + + - - + - + Also, explicitly set the default encoding to be UTF-8 when parsing message bundles. + The default, if not set, is none which forces ISO-8859-1 of java.util.ResourceBundle. + --> + - + + classpath:custom_messages + classpath:messages + - + - - + + - - - - - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/concurrency-jc/build.gradle b/samples/concurrency-jc/build.gradle index 685bbbe62a..70e3f866d1 100644 --- a/samples/concurrency-jc/build.gradle +++ b/samples/concurrency-jc/build.gradle @@ -20,6 +20,6 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' } \ No newline at end of file diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index e76ee547ba..18a529189d 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -180,7 +180,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index 4ba7463462..f65c29ae26 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -53,49 +53,49 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -108,7 +108,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -120,7 +120,7 @@ net.sf.ehcache ehcache - 2.6.5 + 2.9.0 runtime @@ -132,13 +132,13 @@ org.hsqldb hsqldb - 2.3.1 + 2.3.2 runtime org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -162,7 +162,7 @@ org.springframework spring-context-support - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE runtime @@ -180,7 +180,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -192,7 +192,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -204,7 +204,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -234,7 +234,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/data-jc/build.gradle b/samples/data-jc/build.gradle index 398cc3ae9a..5cc491faab 100644 --- a/samples/data-jc/build.gradle +++ b/samples/data-jc/build.gradle @@ -4,7 +4,7 @@ dependencies { "org.springframework.data:spring-data-jpa:$springDataJpaVersion", "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final", 'org.hibernate:hibernate-entitymanager:3.6.10.Final', - "org.hsqldb:hsqldb:2.2.8", + "org.hsqldb:hsqldb:$hsqlVersion", "javax.validation:validation-api:1.0.0.GA", "org.hibernate:hibernate-validator:4.2.0.Final" } \ No newline at end of file diff --git a/samples/data-jc/pom.xml b/samples/data-jc/pom.xml index c5760ecac7..f86d157397 100644 --- a/samples/data-jc/pom.xml +++ b/samples/data-jc/pom.xml @@ -64,13 +64,13 @@ org.hsqldb hsqldb - 2.2.8 + 2.3.2 compile org.springframework.data spring-data-jpa - 1.7.0.RC1 + 1.7.1.RELEASE compile @@ -88,14 +88,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -119,13 +119,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml index 5d26b09001..9e76c99f88 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/dms-xml/pom.xml @@ -52,39 +52,39 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true net.sf.ehcache ehcache - 2.6.5 + 2.9.0 compile true org.hsqldb hsqldb - 2.3.1 + 2.3.2 runtime @@ -96,13 +96,13 @@ org.springframework spring-context-support - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE runtime ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -126,19 +126,19 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/form-jc/build.gradle b/samples/form-jc/build.gradle index 79830964f4..61f4dc3573 100644 --- a/samples/form-jc/build.gradle +++ b/samples/form-jc/build.gradle @@ -20,7 +20,7 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' integrationTestCompile gebDependencies diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index 23229ecf41..fdf0032a45 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -174,7 +174,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -186,7 +186,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -198,7 +198,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -228,7 +228,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml index e5b09f8b14..91e6ecc864 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/gae-xml/pom.xml @@ -59,7 +59,7 @@ org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -77,37 +77,37 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context-support - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -120,13 +120,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime org.slf4j slf4j-jdk14 - 1.7.5 + 1.7.7 runtime @@ -144,7 +144,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -186,7 +186,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/hellojs-jc/build.gradle b/samples/hellojs-jc/build.gradle index b201175c10..29b08fd927 100644 --- a/samples/hellojs-jc/build.gradle +++ b/samples/hellojs-jc/build.gradle @@ -21,6 +21,6 @@ dependencies { "com.fasterxml.jackson.core:jackson-databind:2.2.1" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' } \ No newline at end of file diff --git a/samples/hellojs-jc/pom.xml b/samples/hellojs-jc/pom.xml index 26ded27259..5da4e8d364 100644 --- a/samples/hellojs-jc/pom.xml +++ b/samples/hellojs-jc/pom.xml @@ -65,25 +65,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -113,19 +113,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -144,7 +144,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -162,7 +162,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -186,7 +186,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/hellomvc-jc/build.gradle b/samples/hellomvc-jc/build.gradle index 5040ae48f5..dc56895165 100644 --- a/samples/hellomvc-jc/build.gradle +++ b/samples/hellomvc-jc/build.gradle @@ -20,7 +20,7 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' testCompile project(":spring-security-test") diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index cefb6b624a..f5f70fa1e7 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -186,7 +186,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index 9e266fd46e..d28037711e 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -53,7 +53,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile @@ -71,7 +71,7 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -90,7 +90,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -108,7 +108,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -120,7 +120,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -132,7 +132,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -162,7 +162,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/helloworld-xml/pom.xml b/samples/helloworld-xml/pom.xml index 66e8ae7b77..9d4bab98d5 100644 --- a/samples/helloworld-xml/pom.xml +++ b/samples/helloworld-xml/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 org.springframework.security - spring-security-samples-helloworld-jc + spring-security-samples-helloworld-xml 4.0.0.CI-SNAPSHOT war - spring-security-samples-helloworld-jc - spring-security-samples-helloworld-jc + spring-security-samples-helloworld-xml + spring-security-samples-helloworld-xml http://spring.io/spring-security spring.io @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -72,7 +53,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile @@ -87,22 +68,10 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -121,7 +90,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -139,7 +108,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -151,7 +120,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -163,7 +132,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -193,11 +162,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.3.RELEASE test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/inmemory-jc/build.gradle b/samples/inmemory-jc/build.gradle index 5040ae48f5..dc56895165 100644 --- a/samples/inmemory-jc/build.gradle +++ b/samples/inmemory-jc/build.gradle @@ -20,7 +20,7 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' testCompile project(":spring-security-test") diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index 19dfe23010..7de2f2a8a2 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -186,7 +186,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index 0a3e046c3d..e1649835d3 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -53,13 +53,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -78,7 +78,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -96,7 +96,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -108,7 +108,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -120,7 +120,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -150,7 +150,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/insecuremvc/build.gradle b/samples/insecuremvc/build.gradle index efb3596b0b..61ce64787c 100644 --- a/samples/insecuremvc/build.gradle +++ b/samples/insecuremvc/build.gradle @@ -17,6 +17,6 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' } \ No newline at end of file diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index 0b6da7cb22..0f3a6b7da4 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -89,19 +89,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -120,7 +120,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -138,7 +138,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -162,7 +162,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index 63b55f2855..d4be66f509 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -47,25 +47,25 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -78,7 +78,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -96,7 +96,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -120,7 +120,7 @@ org.springframework spring-context-support - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE runtime @@ -138,7 +138,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -150,7 +150,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -162,7 +162,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -192,7 +192,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/jdbc-jc/build.gradle b/samples/jdbc-jc/build.gradle index 79830964f4..61f4dc3573 100644 --- a/samples/jdbc-jc/build.gradle +++ b/samples/jdbc-jc/build.gradle @@ -20,7 +20,7 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' integrationTestCompile gebDependencies diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index 294b40a9a0..ff1ca1b049 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -174,7 +174,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -186,7 +186,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -198,7 +198,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -228,7 +228,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/ldap-jc/build.gradle b/samples/ldap-jc/build.gradle index 5fbf43a3dc..2e2880a9b8 100644 --- a/samples/ldap-jc/build.gradle +++ b/samples/ldap-jc/build.gradle @@ -22,7 +22,7 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' integrationTestCompile gebDependencies diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index 2431024154..f89b2b5bf6 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -95,25 +95,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -149,19 +149,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -180,7 +180,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -198,7 +198,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -216,7 +216,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -228,7 +228,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -240,7 +240,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -270,7 +270,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml index 2a4a33e7d6..2ac5d099ab 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/ldap-xml/pom.xml @@ -59,14 +59,14 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -108,7 +108,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -144,7 +144,7 @@ org.codehaus.groovy groovy - 2.0.5 + 2.3.8 test @@ -156,7 +156,7 @@ org.gebish geb-spock - 0.9.0 + 0.10.0 test @@ -168,7 +168,7 @@ org.seleniumhq.selenium selenium-htmlunit-driver - 2.33.0 + 2.44.0 test @@ -198,7 +198,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/messages-jc/build.gradle b/samples/messages-jc/build.gradle index 2f65ec2984..d8bdd49736 100644 --- a/samples/messages-jc/build.gradle +++ b/samples/messages-jc/build.gradle @@ -7,7 +7,7 @@ dependencies { compile project(":spring-security-web"), project(":spring-security-config"), "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final", - "org.hsqldb:hsqldb:2.2.8", + "org.hsqldb:hsqldb:$hsqlVersion", "javax.validation:validation-api:1.0.0.GA", "org.hibernate:hibernate-validator:4.2.0.Final", "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml index ff31c1f73d..ab35f04195 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/messages-jc/pom.xml @@ -70,13 +70,13 @@ org.hsqldb hsqldb - 2.2.8 + 2.3.2 compile org.springframework.data spring-data-jpa - 1.7.0.RC1 + 1.7.1.RELEASE compile @@ -100,55 +100,55 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-aspects - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-instrument - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-orm - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -166,7 +166,7 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -179,7 +179,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -203,13 +203,13 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/openid-jc/build.gradle b/samples/openid-jc/build.gradle index 6fea8996f6..ca297eb37f 100644 --- a/samples/openid-jc/build.gradle +++ b/samples/openid-jc/build.gradle @@ -21,7 +21,7 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30', "net.sourceforge.nekohtml:nekohtml:1.9.10" } \ No newline at end of file diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index e7c2d368b4..caf48169b3 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -113,19 +113,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -144,7 +144,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -168,7 +168,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -192,7 +192,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index 981fce8464..e7183435df 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -53,7 +53,7 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -66,7 +66,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -84,7 +84,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -120,7 +120,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/preauth-jc/build.gradle b/samples/preauth-jc/build.gradle index 685bbbe62a..70e3f866d1 100644 --- a/samples/preauth-jc/build.gradle +++ b/samples/preauth-jc/build.gradle @@ -20,6 +20,6 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' } \ No newline at end of file diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index b2cef05d57..d55fdb5b59 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -180,7 +180,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml index b56e7762b4..2db5daae21 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/preauth-xml/pom.xml @@ -41,20 +41,20 @@ commons-logging commons-logging - 1.1.1 + 1.2 compile true ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -90,7 +90,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/rememberme-jc/build.gradle b/samples/rememberme-jc/build.gradle index 685bbbe62a..70e3f866d1 100644 --- a/samples/rememberme-jc/build.gradle +++ b/samples/rememberme-jc/build.gradle @@ -20,6 +20,6 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' } \ No newline at end of file diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index 8441891108..6361b30d3e 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -180,7 +180,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index 3a42897351..7554170650 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -59,31 +59,31 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -96,7 +96,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime @@ -108,7 +108,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -126,7 +126,7 @@ org.springframework spring-context-support - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE runtime @@ -150,7 +150,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index 407b9637b9..b195d9169d 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -41,7 +41,7 @@ org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -53,25 +53,25 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -84,13 +84,13 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 runtime ch.qos.logback logback-core - 0.9.29 + 1.1.2 runtime @@ -108,7 +108,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 runtime @@ -150,7 +150,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/samples/x509-jc/build.gradle b/samples/x509-jc/build.gradle index 48f2443049..685ac71f0d 100644 --- a/samples/x509-jc/build.gradle +++ b/samples/x509-jc/build.gradle @@ -21,6 +21,6 @@ dependencies { "org.hibernate:hibernate-validator:4.2.0.Final" runtime "opensymphony:sitemesh:2.4.2", - 'cglib:cglib-nodep:2.2.2', + "cglib:cglib-nodep:$cglibVersion", 'ch.qos.logback:logback-classic:0.9.30' } \ No newline at end of file diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index 8195f2db07..3d2209cea2 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -59,25 +59,25 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j jul-to-slf4j - 1.7.5 + 1.7.7 compile org.slf4j log4j-over-slf4j - 1.7.5 + 1.7.7 compile org.slf4j slf4j-api - 1.7.5 + 1.7.7 compile @@ -107,19 +107,19 @@ org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -138,7 +138,7 @@ cglib cglib-nodep - 2.2.2 + 3.1 runtime @@ -156,7 +156,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -180,7 +180,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/sandbox/heavyduty/build.gradle b/sandbox/heavyduty/build.gradle index f20488c814..da92fbfa51 100644 --- a/sandbox/heavyduty/build.gradle +++ b/sandbox/heavyduty/build.gradle @@ -37,7 +37,7 @@ dependencies { 'org.apache.directory.server:apacheds-core:1.5.5', 'org.apache.directory.server:apacheds-server-jndi:1.5.5', 'org.freemarker:freemarker:2.3.16', - "org.hsqldb:hsqldb:1.8.0.10", + "org.hsqldb:hsqldb:$hsqlVersion", 'org.slf4j:slf4j-log4j12:1.5.11', 'log4j:log4j:1.2.14' } diff --git a/taglibs/pom.xml b/taglibs/pom.xml index a97974f59e..05cb6b3a1a 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -58,25 +58,25 @@ org.springframework spring-aop - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -88,19 +88,19 @@ org.springframework spring-expression - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -119,7 +119,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -137,7 +137,7 @@ org.codehaus.groovy groovy-all - 2.0.5 + 2.3.8 test @@ -155,7 +155,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test @@ -185,7 +185,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/test/pom.xml b/test/pom.xml index e38555e9ce..1b4e00128f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -52,7 +52,7 @@ org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -64,13 +64,13 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true @@ -90,7 +90,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -114,7 +114,7 @@ org.powermock powermock-api-mockito - 1.5.1 + 1.6.0 test @@ -126,43 +126,43 @@ org.powermock powermock-api-support - 1.5.1 + 1.6.0 test org.powermock powermock-core - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4 - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4-common - 1.5.1 + 1.6.0 test org.powermock powermock-reflect - 1.5.1 + 1.6.0 test org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test diff --git a/web/pom.xml b/web/pom.xml index 744bc5df73..a242de7be1 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -52,19 +52,19 @@ org.springframework spring-beans - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-context - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-core - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile @@ -76,40 +76,40 @@ org.springframework spring-expression - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile org.springframework spring-web - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile commons-logging commons-logging - 1.1.1 + 1.2 compile true org.springframework spring-jdbc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true org.springframework spring-tx - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true org.springframework spring-webmvc - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE compile true @@ -122,7 +122,7 @@ ch.qos.logback logback-classic - 0.9.29 + 1.1.2 test @@ -140,7 +140,7 @@ org.codehaus.groovy groovy-all - 2.0.5 + 2.3.8 test @@ -152,7 +152,7 @@ org.hsqldb hsqldb - 2.3.1 + 2.3.2 test @@ -164,7 +164,7 @@ org.powermock powermock-api-mockito - 1.5.1 + 1.6.0 test @@ -176,37 +176,37 @@ org.powermock powermock-api-support - 1.5.1 + 1.6.0 test org.powermock powermock-core - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4 - 1.5.1 + 1.6.0 test org.powermock powermock-module-junit4-common - 1.5.1 + 1.6.0 test org.powermock powermock-reflect - 1.5.1 + 1.6.0 test org.slf4j jcl-over-slf4j - 1.7.5 + 1.7.7 test @@ -236,7 +236,7 @@ org.springframework spring-test - 4.1.1.BUILD-SNAPSHOT + 4.1.3.RELEASE test