Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 13:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-2700: Register WithSecurityContextTestExecutionListener by default

Browse Source
This commit is contained in:
Rob Winch
2014-08-14 15:55:37 -05:00
parent 1eaa621619
commit 3187ee8bf3
65 changed files with 233 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
acl/pom.xml
+8 -8
View File
@@ -64,19 +64,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,13 +88,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -150,19 +150,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
aspects/pom.xml
+5 -5
View File
@@ -58,19 +58,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -132,13 +132,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
build.gradle
+1 -1
View File
@@ -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'
cas/pom.xml
+5 -5
View File
@@ -70,19 +70,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
config/pom.xml
+25 -11
View File
@@ -64,25 +64,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -112,6 +112,13 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-messaging</artifactId>
<version>4.0.0.CI-SNAPSHOT</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-openid</artifactId>
@@ -129,28 +136,35 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-websocket</artifactId>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@@ -385,19 +399,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
core/pom.xml
+8 -8
View File
@@ -58,25 +58,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -122,14 +122,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@@ -280,7 +280,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
<exclusions>
<exclusion>
core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
+1 -1
View File
@@ -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();
crypto/pom.xml
+2 -2
View File
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
data/pom.xml
+2 -2
View File
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
itest/context/pom.xml
+7 -7
View File
@@ -70,25 +70,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -167,13 +167,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
itest/web/pom.xml
+6 -6
View File
@@ -52,13 +52,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -201,19 +201,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
ldap/pom.xml
+5 -5
View File
@@ -86,19 +86,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -208,7 +208,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
openid/pom.xml
+6 -6
View File
@@ -82,25 +82,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
remoting/pom.xml
+5 -5
View File
@@ -64,19 +64,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/aspectj-jc/pom.xml
+2 -2
View File
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/aspectj-xml/pom.xml
+2 -2
View File
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/cas/sample-xml/pom.xml
+3 -3
View File
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/cas/server/pom.xml
+2 -2
View File
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/concurrency-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -211,7 +211,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/contacts-xml/pom.xml
+10 -10
View File
@@ -72,25 +72,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -102,25 +102,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -265,7 +265,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/data-jc/pom.xml
+2 -2
View File
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -149,7 +149,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/dms-xml/pom.xml
+7 -7
View File
@@ -64,13 +64,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -82,13 +82,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -156,13 +156,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/form-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -259,7 +259,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/gae-xml/pom.xml
+7 -7
View File
@@ -96,25 +96,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -126,13 +126,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/hellojs-jc/pom.xml
+4 -4
View File
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -144,13 +144,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/hellomvc-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/helloworld-jc/pom.xml
+2 -2
View File
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/inmemory-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
-2
View File
@@ -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;
samples/insecure/pom.xml
+2 -2
View File
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/insecuremvc/pom.xml
+4 -4
View File
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -120,13 +120,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/jaas-xml/pom.xml
+6 -6
View File
@@ -66,19 +66,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/jdbc-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -259,7 +259,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/ldap-jc/pom.xml
+4 -4
View File
@@ -168,7 +168,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -180,13 +180,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/ldap-xml/pom.xml
+2 -2
View File
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -229,7 +229,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/messages-jc/pom.xml
+11 -11
View File
@@ -112,31 +112,31 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -148,31 +148,31 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -233,7 +233,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/openid-jc/pom.xml
+4 -4
View File
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -144,13 +144,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/openid-xml/pom.xml
+2 -2
View File
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/preauth-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -211,7 +211,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/preauth-xml/pom.xml
+2 -2
View File
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/rememberme-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -211,7 +211,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/servletapi-xml/pom.xml
+7 -7
View File
@@ -78,19 +78,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -102,13 +102,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/tutorial-xml/pom.xml
+5 -5
View File
@@ -72,13 +72,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -90,13 +90,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
samples/x509-jc/pom.xml
+4 -4
View File
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,13 +138,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -211,7 +211,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
taglibs/pom.xml
+7 -7
View File
@@ -70,25 +70,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -100,13 +100,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
test/pom.xml
+3 -3
View File
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -174,7 +174,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>
test/src/main/java/org/springframework/security/test/context/DefaultSecurityTestExecutionListeners.java
-42
View File
@@ -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 {}
test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
+5
View File
@@ -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}
test/src/main/resources/META-INF/spring.factories
+1
View File
@@ -0,0 +1 @@
org.springframework.test.context.TestExecutionListener = org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener
test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java
-2
View File
@@ -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;
test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java
-2
View File
@@ -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;
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java
-2
View File
@@ -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 {
test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java
-2
View File
@@ -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
test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java
-2
View File
@@ -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 {
web/pom.xml
+9 -9
View File
@@ -64,19 +64,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -88,13 +88,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -107,21 +107,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@@ -248,7 +248,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.BUILD-SNAPSHOT</version>
<version>4.1.0.RC2</version>
<scope>test</scope>
</dependency>
</dependencies>