diff --git a/acl/pom.xml b/acl/pom.xml
index d8dd7c16ee..b86959d64a 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -64,19 +64,19 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -88,13 +88,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -150,19 +150,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-context-support
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/aspects/pom.xml b/aspects/pom.xml
index 28c1bb61df..88b1db0c66 100644
--- a/aspects/pom.xml
+++ b/aspects/pom.xml
@@ -58,19 +58,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -132,13 +132,13 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/build.gradle b/build.gradle
index efc6541e4f..65d5d625b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
ext.releaseBuild = version.endsWith('RELEASE')
ext.snapshotBuild = version.endsWith('SNAPSHOT')
- ext.springVersion = '4.1.0.BUILD-SNAPSHOT'
+ ext.springVersion = '4.1.0.RC2'
ext.springLdapVersion = '2.0.1.RELEASE'
group = 'org.springframework.security'
diff --git a/cas/pom.xml b/cas/pom.xml
index 3c41a92c90..3fdd0fc287 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -70,19 +70,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -94,7 +94,7 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -150,7 +150,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/config/pom.xml b/config/pom.xml
index 96ac8f0e22..7e4d6b586d 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -64,25 +64,25 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -112,6 +112,13 @@
compile
true
+
+ org.springframework.security
+ spring-security-messaging
+ 4.0.0.CI-SNAPSHOT
+ compile
+ true
+
org.springframework.security
spring-security-openid
@@ -129,28 +136,35 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
+ compile
+ true
+
+
+ org.springframework
+ spring-websocket
+ 4.1.0.RC2
compile
true
@@ -385,19 +399,19 @@
org.springframework
spring-expression
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-orm
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/core/pom.xml b/core/pom.xml
index 32ec307b22..acfe5f0389 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -58,25 +58,25 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -88,7 +88,7 @@
org.springframework
spring-expression
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -122,14 +122,14 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
@@ -280,7 +280,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
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 390f61b0ca..720e07c96a 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.0.BUILD-SNAPSHOT";
+ static final String MIN_SPRING_VERSION = "4.1.0.RC2";
static {
performVersionChecks();
diff --git a/crypto/pom.xml b/crypto/pom.xml
index 5f9a92e80a..845b349b22 100644
--- a/crypto/pom.xml
+++ b/crypto/pom.xml
@@ -52,7 +52,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -101,7 +101,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/data/pom.xml b/data/pom.xml
index da28d2bdc2..c34e820410 100644
--- a/data/pom.xml
+++ b/data/pom.xml
@@ -64,7 +64,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -113,7 +113,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/itest/context/pom.xml b/itest/context/pom.xml
index 717c360e6a..4904e60528 100644
--- a/itest/context/pom.xml
+++ b/itest/context/pom.xml
@@ -70,25 +70,25 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -100,7 +100,7 @@
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -167,13 +167,13 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/itest/web/pom.xml b/itest/web/pom.xml
index 30f2f8ab82..a1cea3ff30 100644
--- a/itest/web/pom.xml
+++ b/itest/web/pom.xml
@@ -52,13 +52,13 @@
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -70,7 +70,7 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -201,19 +201,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/ldap/pom.xml b/ldap/pom.xml
index d3d4966a29..776261d33e 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -86,19 +86,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -110,7 +110,7 @@
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -208,7 +208,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/openid/pom.xml b/openid/pom.xml
index fc653eed64..af912fad58 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -82,25 +82,25 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -112,7 +112,7 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -173,7 +173,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/remoting/pom.xml b/remoting/pom.xml
index a8c5f05594..d8588e4695 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -64,19 +64,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -88,7 +88,7 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -131,7 +131,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/aspectj-jc/pom.xml b/samples/aspectj-jc/pom.xml
index ac9430d1d0..885f2634c7 100644
--- a/samples/aspectj-jc/pom.xml
+++ b/samples/aspectj-jc/pom.xml
@@ -64,7 +64,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -126,7 +126,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/aspectj-xml/pom.xml b/samples/aspectj-xml/pom.xml
index 702ea66162..43e677358f 100644
--- a/samples/aspectj-xml/pom.xml
+++ b/samples/aspectj-xml/pom.xml
@@ -58,7 +58,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -126,7 +126,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml
index 2ea29d17d3..cdfb0d39ef 100644
--- a/samples/cas/sample-xml/pom.xml
+++ b/samples/cas/sample-xml/pom.xml
@@ -78,7 +78,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -133,7 +133,7 @@
org.springframework
spring-context-support
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
runtime
@@ -217,7 +217,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml
index 07dd7a722a..e54f7c5be0 100644
--- a/samples/cas/server/pom.xml
+++ b/samples/cas/server/pom.xml
@@ -60,7 +60,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -109,7 +109,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml
index ba2a3ef022..4494982331 100644
--- a/samples/concurrency-jc/pom.xml
+++ b/samples/concurrency-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -211,7 +211,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml
index 34d820988b..6a9a48eff4 100644
--- a/samples/contacts-xml/pom.xml
+++ b/samples/contacts-xml/pom.xml
@@ -72,25 +72,25 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -102,25 +102,25 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -193,7 +193,7 @@
org.springframework
spring-context-support
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
runtime
@@ -265,7 +265,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/data-jc/pom.xml b/samples/data-jc/pom.xml
index d0c1e48ff5..a2444a6558 100644
--- a/samples/data-jc/pom.xml
+++ b/samples/data-jc/pom.xml
@@ -100,7 +100,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -149,7 +149,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml
index 14e1b0a790..afe5670ba6 100644
--- a/samples/dms-xml/pom.xml
+++ b/samples/dms-xml/pom.xml
@@ -64,13 +64,13 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -82,13 +82,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -120,7 +120,7 @@
org.springframework
spring-context-support
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
runtime
@@ -156,13 +156,13 @@
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml
index 07c45dc4f0..1ab7acc67e 100644
--- a/samples/form-jc/pom.xml
+++ b/samples/form-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -259,7 +259,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml
index aab8223f64..4c089783f0 100644
--- a/samples/gae-xml/pom.xml
+++ b/samples/gae-xml/pom.xml
@@ -96,25 +96,25 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context-support
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -126,13 +126,13 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -217,7 +217,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/hellojs-jc/pom.xml b/samples/hellojs-jc/pom.xml
index c5da699b9b..f774741235 100644
--- a/samples/hellojs-jc/pom.xml
+++ b/samples/hellojs-jc/pom.xml
@@ -132,7 +132,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -144,13 +144,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -217,7 +217,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml
index 3b7f46be13..9c56495b52 100644
--- a/samples/hellomvc-jc/pom.xml
+++ b/samples/hellomvc-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -217,7 +217,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml
index 25c72ec23b..66e8ae7b77 100644
--- a/samples/helloworld-jc/pom.xml
+++ b/samples/helloworld-jc/pom.xml
@@ -90,7 +90,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -193,7 +193,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml
index 3ce0aa2162..b01ac9b466 100644
--- a/samples/inmemory-jc/pom.xml
+++ b/samples/inmemory-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -217,7 +217,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 0f6d6ae11b..59804fd74e 100644
--- a/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -28,7 +28,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.samples.mvc.config.WebMvcConfiguration;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,7 +43,6 @@ import org.springframework.web.context.WebApplicationContext;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes={RootConfiguration.class, WebMvcConfiguration.class})
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class SecurityConfigTests {
private MockMvc mvc;
diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml
index 63bb2e8c42..b2e4a07d53 100644
--- a/samples/insecure/pom.xml
+++ b/samples/insecure/pom.xml
@@ -78,7 +78,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -181,7 +181,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml
index c53f022b6b..cf1ae392e7 100644
--- a/samples/insecuremvc/pom.xml
+++ b/samples/insecuremvc/pom.xml
@@ -108,7 +108,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -120,13 +120,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -193,7 +193,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml
index 8cdea62636..5c660aa5f2 100644
--- a/samples/jaas-xml/pom.xml
+++ b/samples/jaas-xml/pom.xml
@@ -66,19 +66,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -90,7 +90,7 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -151,7 +151,7 @@
org.springframework
spring-context-support
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
runtime
@@ -223,7 +223,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml
index 52fbd4c2bc..5ae1384b23 100644
--- a/samples/jdbc-jc/pom.xml
+++ b/samples/jdbc-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -259,7 +259,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml
index 641e0ce050..afa88bc65d 100644
--- a/samples/ldap-jc/pom.xml
+++ b/samples/ldap-jc/pom.xml
@@ -168,7 +168,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -180,13 +180,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -301,7 +301,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml
index 363eb4f529..5e3416991c 100644
--- a/samples/ldap-xml/pom.xml
+++ b/samples/ldap-xml/pom.xml
@@ -78,7 +78,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -229,7 +229,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml
index 8eedcb60f0..f309eb4246 100644
--- a/samples/messages-jc/pom.xml
+++ b/samples/messages-jc/pom.xml
@@ -112,31 +112,31 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-aspects
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -148,31 +148,31 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-instrument
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-orm
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -233,7 +233,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml
index 233db1e65a..fd89b680b2 100644
--- a/samples/openid-jc/pom.xml
+++ b/samples/openid-jc/pom.xml
@@ -132,7 +132,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -144,13 +144,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -223,7 +223,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml
index 697d03e40d..7e689adf51 100644
--- a/samples/openid-xml/pom.xml
+++ b/samples/openid-xml/pom.xml
@@ -72,7 +72,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -151,7 +151,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml
index 96cb48a0df..3e0ebbc942 100644
--- a/samples/preauth-jc/pom.xml
+++ b/samples/preauth-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -211,7 +211,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml
index 43131847b1..1a4b57df47 100644
--- a/samples/preauth-xml/pom.xml
+++ b/samples/preauth-xml/pom.xml
@@ -60,7 +60,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -121,7 +121,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml
index 28da672973..a505b03caf 100644
--- a/samples/rememberme-jc/pom.xml
+++ b/samples/rememberme-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -211,7 +211,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml
index 3e98275188..97912e8c5d 100644
--- a/samples/servletapi-xml/pom.xml
+++ b/samples/servletapi-xml/pom.xml
@@ -78,19 +78,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -102,13 +102,13 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -157,7 +157,7 @@
org.springframework
spring-context-support
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
runtime
@@ -181,7 +181,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml
index 0f313ff1fc..3f695b7039 100644
--- a/samples/tutorial-xml/pom.xml
+++ b/samples/tutorial-xml/pom.xml
@@ -72,13 +72,13 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -90,13 +90,13 @@
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -181,7 +181,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml
index b13069fd69..0e3b42d126 100644
--- a/samples/x509-jc/pom.xml
+++ b/samples/x509-jc/pom.xml
@@ -126,7 +126,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -138,13 +138,13 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -211,7 +211,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index d83acc7f12..cf7b0a7a1c 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -70,25 +70,25 @@
org.springframework
spring-aop
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -100,13 +100,13 @@
org.springframework
spring-expression
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -197,7 +197,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/test/pom.xml b/test/pom.xml
index 50a6ad6941..9feb64a6e0 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -64,7 +64,7 @@
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -76,7 +76,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -174,7 +174,7 @@
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test
diff --git a/test/src/main/java/org/springframework/security/test/context/DefaultSecurityTestExecutionListeners.java b/test/src/main/java/org/springframework/security/test/context/DefaultSecurityTestExecutionListeners.java
deleted file mode 100644
index 1337d665dc..0000000000
--- a/test/src/main/java/org/springframework/security/test/context/DefaultSecurityTestExecutionListeners.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2002-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.security.test.context;
-
-import org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
-import org.springframework.test.context.web.ServletTestExecutionListener;
-
-import java.lang.annotation.*;
-
-/**
- * A meta annotation that adds WithSecurityContextTestExcecutionListener to the default Spring TestExecutionListeners.
- *
- * @author Rob Winch
- * @since 4.0
- */
-@Documented
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@TestExecutionListeners(listeners={ServletTestExecutionListener.class,
- DependencyInjectionTestExecutionListener.class,
- DirtiesContextTestExecutionListener.class,
- TransactionalTestExecutionListener.class,
- WithSecurityContextTestExecutionListener.class})
-public @interface DefaultSecurityTestExecutionListeners {}
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
index e32c065522..08b1120047 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
@@ -19,6 +19,7 @@ import java.lang.annotation.Annotation;
import org.springframework.context.ApplicationContext;
import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.Order;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.test.context.TestSecurityContextHolder;
@@ -26,6 +27,7 @@ import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequ
import org.springframework.test.context.TestContext;
import org.springframework.test.context.TestExecutionListener;
import org.springframework.test.context.support.AbstractTestExecutionListener;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
import org.springframework.test.web.servlet.MockMvc;
/**
@@ -39,9 +41,12 @@ import org.springframework.test.web.servlet.MockMvc;
* @author Rob Winch
* @since 4.0
*/
+@Order(WithSecurityContextTestExecutionListener.ORDER)
public class WithSecurityContextTestExecutionListener extends
AbstractTestExecutionListener {
+ public static final int ORDER = 1000;
+
/**
* Sets up the {@link SecurityContext} for each test method. First the
* specific method is inspected for a {@link WithSecurityContext} or {@link Annotation}
diff --git a/test/src/main/resources/META-INF/spring.factories b/test/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000..4298016895
--- /dev/null
+++ b/test/src/main/resources/META-INF/spring.factories
@@ -0,0 +1 @@
+org.springframework.test.context.TestExecutionListener = org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java
index 9ebb590a45..b3bf37465a 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.showcase.service.HelloMessageService;
import org.springframework.security.test.context.showcase.service.MessageService;
import org.springframework.security.test.context.support.WithMockUser;
@@ -38,7 +37,6 @@ import static org.fest.assertions.Assertions.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = WithMockUserTests.Config.class)
-@DefaultSecurityTestExecutionListeners
public class WithMockUserTests {
@Autowired
private MessageService messageService;
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java
index 1cea82ea2c..2a6b4a502b 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java
@@ -28,7 +28,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.showcase.service.HelloMessageService;
import org.springframework.security.test.context.showcase.service.MessageService;
import org.springframework.security.test.context.support.WithUserDetails;
@@ -43,7 +42,6 @@ import static org.fest.assertions.Assertions.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = WithUserDetailsTests.Config.class)
-@DefaultSecurityTestExecutionListeners
public class WithUserDetailsTests {
@Autowired
private MessageService messageService;
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
index 5d2ed8d364..37bc710e73 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
@@ -25,7 +25,6 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -47,7 +46,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
index 9f48c5aa8a..ec7e43bbd9 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
@@ -24,7 +24,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@@ -42,7 +41,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=CsrfShowcaseTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class CsrfShowcaseTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java
index 4c2fb8f3b4..2ee109e467 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java
@@ -29,7 +29,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.web.csrf.CsrfTokenRepository;
import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
import org.springframework.test.context.ContextConfiguration;
@@ -43,7 +42,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=CustomCsrfShowcaseTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class CustomCsrfShowcaseTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
index ca5f5c7277..1042a3a5fc 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
@@ -28,7 +28,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@@ -40,7 +39,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=DefaultCsrfShowcaseTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class DefaultCsrfShowcaseTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
index de4cddea90..abeafa4ee8 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
@@ -30,7 +30,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@@ -42,7 +41,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=AuthenticationTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class AuthenticationTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
index 9040cc8158..e7de35d286 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
@@ -32,7 +32,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
import org.springframework.security.web.context.SecurityContextRepository;
import org.springframework.test.context.ContextConfiguration;
@@ -46,7 +45,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=CustomConfigAuthenticationTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class CustomConfigAuthenticationTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
index be075c1dee..d3a01eedb3 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
@@ -28,7 +28,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders;
import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.FormLoginRequestBuilder;
import org.springframework.test.context.ContextConfiguration;
@@ -42,7 +41,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=CustomLoginRequestBuilderAuthenticationTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class CustomLoginRequestBuilderAuthenticationTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java
index 6352b5d60f..227bf52f26 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java
@@ -32,7 +32,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@@ -44,7 +43,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=DefaultfSecurityRequestsTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class DefaultfSecurityRequestsTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java
index 2e0be683dd..79d3330019 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java
@@ -35,7 +35,6 @@ import org.springframework.security.config.annotation.web.servlet.configuration.
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@@ -47,7 +46,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=SecurityRequestsTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class SecurityRequestsTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java
index 7a0574b14f..896f94175b 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java
@@ -24,7 +24,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers;
import org.springframework.test.context.ContextConfiguration;
@@ -42,7 +41,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=WithUserAuthenticationTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class WithUserAuthenticationTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java
index fa02fd8130..7cc308d657 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java
@@ -24,7 +24,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -42,7 +41,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=WithUserClassLevelAuthenticationTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
@WithMockUser(roles="ADMIN")
public class WithUserClassLevelAuthenticationTests {
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java
index 4a2b49c3c2..9004c4a415 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java
@@ -26,7 +26,6 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,7 +43,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=WithUserDetailsAuthenticationTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
public class WithUserDetailsAuthenticationTests {
@Autowired
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java
index c49bc320c8..aea74a2f1d 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java
@@ -26,7 +26,6 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.test.context.DefaultSecurityTestExecutionListeners;
import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,7 +43,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes=WithUserDetailsClassLevelAuthenticationTests.Config.class)
@WebAppConfiguration
-@DefaultSecurityTestExecutionListeners
@WithUserDetails("admin")
public class WithUserDetailsClassLevelAuthenticationTests {
diff --git a/web/pom.xml b/web/pom.xml
index 55590c0e6b..65b314fbf8 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -64,19 +64,19 @@
org.springframework
spring-beans
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-context
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-core
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -88,13 +88,13 @@
org.springframework
spring-expression
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
org.springframework
spring-web
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
@@ -107,21 +107,21 @@
org.springframework
spring-jdbc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
org.springframework
spring-tx
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
org.springframework
spring-webmvc
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
compile
true
@@ -248,7 +248,7 @@
org.springframework
spring-test
- 4.1.0.BUILD-SNAPSHOT
+ 4.1.0.RC2
test