diff --git a/acl/pom.xml b/acl/pom.xml index ec435c38d7..6441a9257e 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-acl - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-acl spring-security-acl http://spring.io/spring-security @@ -46,25 +46,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -76,13 +73,11 @@ org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-tx - 4.1.6.RELEASE compile @@ -138,22 +133,30 @@ org.springframework spring-beans - 4.1.6.RELEASE test org.springframework spring-context-support - 4.1.6.RELEASE test org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/aspects/pom.xml b/aspects/pom.xml index d3acc16427..a1d07a9bb2 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-aspects - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-aspects spring-security-aspects http://spring.io/spring-security @@ -40,25 +40,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -120,16 +117,25 @@ org.springframework spring-aop - 4.1.6.RELEASE test org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/cas/pom.xml b/cas/pom.xml index 199d4265e5..405399a521 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-cas - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-cas spring-security-cas http://spring.io/spring-security @@ -46,31 +46,28 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -82,7 +79,6 @@ org.springframework spring-web - 4.1.6.RELEASE compile @@ -138,10 +134,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/config/pom.xml b/config/pom.xml index f2180b0deb..402ddf0051 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-config spring-security-config http://spring.io/spring-security @@ -46,31 +46,27 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -96,63 +92,58 @@ org.springframework.security spring-security-ldap - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile true org.springframework.security spring-security-messaging - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile true org.springframework.security spring-security-openid - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile true org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile true org.springframework spring-jdbc - 4.1.6.RELEASE compile true org.springframework spring-tx - 4.1.6.RELEASE compile true org.springframework spring-web - 4.1.6.RELEASE compile true org.springframework spring-webmvc - 4.1.6.RELEASE compile true org.springframework spring-websocket - 4.1.6.RELEASE compile true @@ -375,34 +366,42 @@ org.springframework.security spring-security-aspects - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework.security spring-security-cas - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework spring-expression - 4.1.6.RELEASE test org.springframework spring-orm - 4.1.6.RELEASE test org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/core/pom.xml b/core/pom.xml index 4fbb3adb19..7e1b267747 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-core spring-security-core http://spring.io/spring-security @@ -46,25 +46,21 @@ org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -76,7 +72,6 @@ org.springframework spring-expression - 4.1.6.RELEASE compile @@ -110,14 +105,12 @@ org.springframework spring-jdbc - 4.1.6.RELEASE compile true org.springframework spring-tx - 4.1.6.RELEASE compile true @@ -268,7 +261,6 @@ org.springframework spring-test - 4.1.6.RELEASE test @@ -278,6 +270,17 @@ + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/crypto/pom.xml b/crypto/pom.xml index 4e6ac18625..1df7080906 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-crypto - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-crypto spring-security-crypto http://spring.io/spring-security @@ -77,10 +77,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/data/pom.xml b/data/pom.xml index 9f42fc1dea..bc952dc318 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-data - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-data spring-security-data http://spring.io/spring-security @@ -46,13 +46,12 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -101,10 +100,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index c7b272ba42..70b5ee5363 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -37,8 +37,7 @@ ext.springDataCommonsVersion = '1.9.1.RELEASE' ext.springDataJpaVersion = '1.7.1.RELEASE' ext.springDataRedisVersion = '1.4.1.RELEASE' ext.springSessionVersion = '1.0.0.RELEASE' -ext.thymeleafVersion = '2.1.3.RELEASE' -ext.thymeleafVersion = '1.2.7.RELEASE' +ext.thymeleafVersion = '2.1.4.RELEASE' ext.spockDependencies = [ dependencies.create("org.spockframework:spock-spring:$spockVersion") { diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index e4018e58ce..91421d0fa0 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -31,6 +31,9 @@ def customizePom(pom, gradleProject) { it.scope = "compile" it.optional = true } + p.dependencies.findAll{ it.groupId == "org.springframework" }.each { + it.version = null + } // sort to make pom dependencies order consistent to ease comparison of older poms p.dependencies = p.dependencies.sort { dep -> "$dep.scope:$dep.optional:$dep.groupId:$dep.artifactId" @@ -67,6 +70,17 @@ def customizePom(pom, gradleProject) { email = 'rwinch@gopivotal.com' } } + dependencyManagement { + dependencies { + dependency { + groupId 'org.springframework' + artifactId 'spring-framework-bom' + version project.springVersion + type 'pom' + scope 'import' + } + } + } if(isWar) { properties { 'm2eclipse.wtp.contextRoot' '/' + project.war.baseName diff --git a/itest/context/pom.xml b/itest/context/pom.xml index 4092b37701..08a4912adf 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security itest-context - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT itest-context itest-context http://spring.io/spring-security @@ -52,31 +52,27 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-tx - 4.1.6.RELEASE compile @@ -131,28 +127,37 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework spring-test - 4.1.6.RELEASE test org.springframework spring-web - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/itest/web/pom.xml b/itest/web/pom.xml index 6378886704..88ecc62e24 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security itest-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT itest-web itest-web http://spring.io/spring-security @@ -40,13 +40,11 @@ org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile @@ -147,49 +145,46 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework.security spring-security-ldap - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework spring-beans - 4.1.6.RELEASE test org.springframework spring-test - 4.1.6.RELEASE test org.springframework spring-webmvc - 4.1.6.RELEASE test @@ -200,6 +195,17 @@ test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/ldap/pom.xml b/ldap/pom.xml index a8d64b9cd1..59c8652bc6 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-ldap - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-ldap spring-security-ldap http://spring.io/spring-security @@ -68,25 +68,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -98,7 +95,6 @@ org.springframework spring-tx - 4.1.6.RELEASE compile @@ -196,10 +192,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/messaging/pom.xml b/messaging/pom.xml index daf0045855..ef820c6825 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-messaging - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-messaging spring-security-messaging http://spring.io/spring-security @@ -46,25 +46,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -76,13 +73,11 @@ org.springframework spring-expression - 4.1.6.RELEASE compile org.springframework spring-messaging - 4.1.6.RELEASE compile @@ -102,14 +97,13 @@ org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile true org.springframework spring-websocket - 4.1.6.RELEASE compile true @@ -230,10 +224,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/openid/pom.xml b/openid/pom.xml index 417cea1f07..c2f9a41379 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-openid - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-openid spring-security-openid http://spring.io/spring-security @@ -58,37 +58,33 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -100,7 +96,6 @@ org.springframework spring-web - 4.1.6.RELEASE compile @@ -161,10 +156,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/remoting/pom.xml b/remoting/pom.xml index b7d3441e1a..da8a14056d 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-remoting - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-remoting spring-security-remoting http://spring.io/spring-security @@ -46,25 +46,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -76,7 +73,6 @@ org.springframework spring-web - 4.1.6.RELEASE compile @@ -119,10 +115,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/samples/aspectj-jc/pom.xml b/samples/aspectj-jc/pom.xml index 0e7465713f..a3bb8c6195 100644 --- a/samples/aspectj-jc/pom.xml +++ b/samples/aspectj-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-aspectj-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-samples-aspectj-jc spring-security-samples-aspectj-jc http://spring.io/spring-security @@ -40,13 +40,13 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -66,7 +66,7 @@ org.springframework.security spring-security-aspects - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime @@ -102,10 +102,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/samples/aspectj-xml/pom.xml b/samples/aspectj-xml/pom.xml index 8a30b0d2b4..46eddcd486 100644 --- a/samples/aspectj-xml/pom.xml +++ b/samples/aspectj-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-aspectj-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-samples-aspectj-xml spring-security-samples-aspectj-xml http://spring.io/spring-security @@ -40,7 +40,7 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -60,13 +60,13 @@ org.springframework.security spring-security-aspects - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime @@ -102,10 +102,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index f2e0fa9bf3..815a036683 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-cassample-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-cassample-xml spring-security-samples-cassample-xml @@ -47,13 +47,13 @@ org.springframework.security spring-security-cas - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -90,19 +90,18 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework spring-context-support - 4.1.6.RELEASE runtime @@ -186,10 +185,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /spring-security-samples-cassample-xml diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index cbbf720cdd..7e48964cd6 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-casserver - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-casserver spring-security-samples-casserver @@ -78,10 +78,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /spring-security-samples-casserver diff --git a/samples/chat-jc/build.gradle b/samples/chat-jc/build.gradle index e125d8295a..a1983f3bde 100644 --- a/samples/chat-jc/build.gradle +++ b/samples/chat-jc/build.gradle @@ -1,10 +1,5 @@ apply from: WAR_SAMPLE_GRADLE -repositories { - maven { url 'http://clojars.org/repo' } -} - - dependencies { providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" @@ -22,7 +17,7 @@ dependencies { "javax.validation:validation-api:1.0.0.GA", "org.hibernate:hibernate-validator:4.2.0.Final", "redis.clients:jedis:2.4.2", - "redis.embedded:embedded-redis:0.2", + "com.github.kstyrc:embedded-redis:0.6", "org.apache.commons:commons-pool2:2.2", "org.thymeleaf:thymeleaf-spring4:$thymeleafVersion", "org.thymeleaf.extras:thymeleaf-extras-tiles2-spring4:2.1.1.RELEASE", diff --git a/samples/chat-jc/pom.xml b/samples/chat-jc/pom.xml index c749cf2442..c992fec208 100644 --- a/samples/chat-jc/pom.xml +++ b/samples/chat-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-chat-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-chat-jc spring-security-samples-chat-jc @@ -44,6 +44,12 @@ 2.4.4 compile + + com.github.kstyrc + embedded-redis + 0.6 + compile + javax.servlet.jsp.jstl javax.servlet.jsp.jstl-api @@ -119,25 +125,25 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-data - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-messaging - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -149,19 +155,16 @@ org.springframework spring-messaging - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile org.springframework spring-websocket - 4.1.6.RELEASE compile @@ -173,7 +176,7 @@ org.thymeleaf thymeleaf-spring4 - 1.2.7.RELEASE + 2.1.4.RELEASE compile @@ -182,12 +185,6 @@ 2.4.2 compile - - redis.embedded - embedded-redis - 0.2 - compile - commons-logging commons-logging @@ -234,10 +231,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index b2986b32f4..0d99073d0b 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-concurrency-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-concurrency-jc spring-security-samples-concurrency-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -180,10 +178,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index 3a2a0dfd70..a28ef7cf15 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-contacts-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-contacts-xml spring-security-samples-contacts-xml @@ -41,55 +41,48 @@ org.springframework.security spring-security-acl - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-tx - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -144,25 +137,24 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework spring-context-support - 4.1.6.RELEASE runtime @@ -234,10 +226,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/data-jc/pom.xml b/samples/data-jc/pom.xml index 0787da8268..0b5f482972 100644 --- a/samples/data-jc/pom.xml +++ b/samples/data-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-data-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-samples-data-jc spring-security-samples-data-jc http://spring.io/spring-security @@ -76,13 +76,13 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-data - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -125,10 +125,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml index bc2bace943..119ad5ed61 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/dms-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-dms-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-samples-dms-xml spring-security-samples-dms-xml http://spring.io/spring-security @@ -40,31 +40,28 @@ org.springframework.security spring-security-acl - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-tx - 4.1.6.RELEASE compile @@ -90,13 +87,12 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework spring-context-support - 4.1.6.RELEASE runtime @@ -132,16 +128,25 @@ org.springframework spring-context - 4.1.6.RELEASE test org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index 1e36550a6a..213ca6a08c 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-form-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-form-jc spring-security-samples-form-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -228,10 +226,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml index 46754e00cc..8c6ebdfca3 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/gae-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-gae-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-gae-xml spring-security-samples-gae-xml @@ -65,43 +65,38 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-context-support - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -132,13 +127,13 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime @@ -186,10 +181,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /spring-security-samples-gae-xml diff --git a/samples/hellojs-jc/pom.xml b/samples/hellojs-jc/pom.xml index 23d510fd9c..cdc973c085 100644 --- a/samples/hellojs-jc/pom.xml +++ b/samples/hellojs-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-hellojs-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-hellojs-jc spring-security-samples-hellojs-jc @@ -89,37 +89,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -186,10 +184,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index e715200907..50b6f9fa06 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-hellomvc-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-hellomvc-jc spring-security-samples-hellomvc-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -180,16 +178,26 @@ org.springframework.security spring-security-test - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index ee13bb096a..7095b974fb 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-helloworld-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-helloworld-jc spring-security-samples-helloworld-jc @@ -59,13 +59,13 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -162,10 +162,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/helloworld-xml/pom.xml b/samples/helloworld-xml/pom.xml index 7ac53dc36e..dfacf9d64b 100644 --- a/samples/helloworld-xml/pom.xml +++ b/samples/helloworld-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-helloworld-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-helloworld-xml spring-security-samples-helloworld-xml @@ -59,13 +59,13 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -162,10 +162,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index d9ed9c106f..d331c715e8 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-inmemory-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-inmemory-jc spring-security-samples-inmemory-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -180,16 +178,26 @@ org.springframework.security spring-security-test - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT test org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index eaf825278d..942cbc854c 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-insecure - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-insecure spring-security-samples-insecure @@ -150,10 +150,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index 15d5a1c30b..d5d9073acb 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-insecuremvc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-insecuremvc spring-security-samples-insecuremvc @@ -83,19 +83,17 @@ org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -162,10 +160,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index 2514eb8577..2347d38f68 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-jaas-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-jaas-xml spring-security-samples-jaas-xml @@ -41,25 +41,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile @@ -102,25 +99,24 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework spring-context-support - 4.1.6.RELEASE runtime @@ -192,10 +188,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index cb2f68e75e..79337055f4 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-jdbc-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-jdbc-jc spring-security-samples-jdbc-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -228,10 +226,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index 07eba38143..9c183e7403 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-ldap-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-ldap-jc spring-security-samples-ldap-jc @@ -119,43 +119,41 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-ldap - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -270,10 +268,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml index 2d4689251a..48c6b7370b 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/ldap-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-ldap-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-ldap-xml spring-security-samples-ldap-xml @@ -53,7 +53,7 @@ org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -114,19 +114,19 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-ldap - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime @@ -198,10 +198,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml index 844d5b3d1b..a29b298e22 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/messages-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-samples-messages-jc spring-security-samples-messages-jc http://spring.io/spring-security @@ -88,67 +88,58 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-aspects - 4.1.6.RELEASE compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile org.springframework spring-instrument - 4.1.6.RELEASE compile org.springframework spring-orm - 4.1.6.RELEASE compile org.springframework spring-tx - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -160,7 +151,7 @@ org.thymeleaf thymeleaf-spring4 - 1.2.7.RELEASE + 2.1.4.RELEASE compile @@ -209,10 +200,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index 4d13d471d6..15a9607801 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-openid-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-openid-jc spring-security-samples-openid-jc @@ -83,43 +83,41 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-openid - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -192,10 +190,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index 04093791da..a52444efdd 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-openid-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-openid-xml spring-security-samples-openid-xml @@ -41,13 +41,13 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-openid - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile @@ -90,13 +90,13 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime @@ -120,10 +120,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /spring-security-samples-openid-xml diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index ebbf2edd37..e93a92d4e6 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-preauth-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-preauth-jc spring-security-samples-preauth-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -180,10 +178,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml index 8e4e48c3cf..8a84422b2a 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/preauth-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-preauth-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-preauth-xml spring-security-samples-preauth-xml @@ -60,13 +60,13 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime @@ -90,10 +90,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index 6496758c46..98eb2923df 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-rememberme-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-rememberme-jc spring-security-samples-rememberme-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -180,10 +178,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index 52f0d14eb4..1122b434bf 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-servletapi-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-servletapi-xml spring-security-samples-servletapi-xml @@ -47,37 +47,33 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -114,19 +110,18 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework spring-context-support - 4.1.6.RELEASE runtime @@ -150,10 +145,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /spring-security-samples-servletapi-xml diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index e9bc00eb4c..ac37152c21 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-tutorial-xml - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-tutorial-xml spring-security-samples-tutorial-xml @@ -47,25 +47,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -114,19 +111,19 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT runtime @@ -150,10 +147,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index 6f8f4847e1..dbf9b0b8c6 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-samples-x509-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT war spring-security-samples-x509-jc spring-security-samples-x509-jc @@ -83,37 +83,35 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-samples-messages-jc - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-jdbc - 4.1.6.RELEASE compile org.springframework spring-webmvc - 4.1.6.RELEASE compile @@ -180,10 +178,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + /sample diff --git a/taglibs/pom.xml b/taglibs/pom.xml index a641a22d50..d310a86e3b 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-taglibs - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-taglibs spring-security-taglibs http://spring.io/spring-security @@ -40,43 +40,39 @@ org.springframework.security spring-security-acl - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-aop - 4.1.6.RELEASE compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -88,13 +84,11 @@ org.springframework spring-expression - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile @@ -185,10 +179,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/test/pom.xml b/test/pom.xml index 7633270721..e85fdc62bf 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-test - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-test spring-security-test http://spring.io/spring-security @@ -40,19 +40,18 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -64,7 +63,6 @@ org.springframework spring-test - 4.1.6.RELEASE compile @@ -77,7 +75,7 @@ org.springframework.security spring-security-config - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile true @@ -162,10 +160,20 @@ org.springframework spring-webmvc - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + + diff --git a/web/pom.xml b/web/pom.xml index 23e704e8db..6503bed944 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-web - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT spring-security-web spring-security-web http://spring.io/spring-security @@ -46,25 +46,22 @@ org.springframework.security spring-security-core - 4.0.0.CI-SNAPSHOT + 4.0.1.CI-SNAPSHOT compile org.springframework spring-beans - 4.1.6.RELEASE compile org.springframework spring-context - 4.1.6.RELEASE compile org.springframework spring-core - 4.1.6.RELEASE compile @@ -76,13 +73,11 @@ org.springframework spring-expression - 4.1.6.RELEASE compile org.springframework spring-web - 4.1.6.RELEASE compile @@ -95,21 +90,18 @@ org.springframework spring-jdbc - 4.1.6.RELEASE compile true org.springframework spring-tx - 4.1.6.RELEASE compile true org.springframework spring-webmvc - 4.1.6.RELEASE compile true @@ -236,10 +228,20 @@ org.springframework spring-test - 4.1.6.RELEASE test + + + + org.springframework + spring-framework-bom + 4.1.6.RELEASE + pom + import + + +