SEC-2917: Update to Spring 4.1.6

acl/pom.xml

@@ -8,161 +8,161 @@
   <description>spring-security-acl</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>net.sf.ehcache</groupId>
-	  <artifactId>ehcache</artifactId>
-	  <version>2.9.0</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context-support</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>2.9.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

aspects/pom.xml

@@ -8,137 +8,137 @@
   <description>spring-security-aspects</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.aspectj</groupId>
-	  <artifactId>aspectjrt</artifactId>
-	  <version>1.8.4</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.8.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

build.gradle

@@ -25,16 +25,16 @@ allprojects {
 
 	ext.releaseBuild = version.endsWith('RELEASE')
 	ext.snapshotBuild = version.endsWith('SNAPSHOT')
-	ext.springVersion = '4.1.5.RELEASE'
+	ext.springVersion = '4.1.6.RELEASE'
 	ext.springLdapVersion = '2.0.2.RELEASE'
 
 	group = 'org.springframework.security'
 
 	repositories {
-	   mavenCentral()
-	   maven { url "https://repo.spring.io/libs-snapshot" }
-	   maven { url "https://repo.spring.io/plugins-release" }
-	   maven { url "http://repo.terracotta.org/maven2/" }
+	mavenCentral()
+	maven { url "https://repo.spring.io/libs-snapshot" }
+	maven { url "https://repo.spring.io/plugins-release" }
+	maven { url "http://repo.terracotta.org/maven2/" }
 	}
 
 	eclipse.project.name = "${project.name}-4.0.x"

cas/pom.xml

@@ -8,149 +8,149 @@
   <description>spring-security-cas</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.jasig.cas.client</groupId>
-	  <artifactId>cas-client-core</artifactId>
-	  <version>3.3.3</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>net.sf.ehcache</groupId>
-	  <artifactId>ehcache</artifactId>
-	  <version>2.9.0</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.jasig.cas.client</groupId>
+      <artifactId>cas-client-core</artifactId>
+      <version>3.3.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>2.9.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

config/pom.xml

@@ -8,410 +8,410 @@
   <description>spring-security-config</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.aspectj</groupId>
-	  <artifactId>aspectjweaver</artifactId>
-	  <version>1.8.4</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-ldap</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <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>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-websocket</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.annotation</groupId>
-	  <artifactId>jsr250-api</artifactId>
-	  <version>1.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ldapsdk</groupId>
-	  <artifactId>ldapsdk</artifactId>
-	  <version>4.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core</artifactId>
-	  <version>1.5.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core-entry</artifactId>
-	  <version>1.5.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-ldap</artifactId>
-	  <version>1.5.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-shared</artifactId>
-	  <version>1.5.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-server-jndi</artifactId>
-	  <version>1.5.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.shared</groupId>
-	  <artifactId>shared-ldap</artifactId>
-	  <version>0.9.15</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy-all</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.eclipse.persistence</groupId>
-	  <artifactId>javax.persistence</artifactId>
-	  <version>2.0.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-entitymanager</artifactId>
-	  <version>4.1.0.Final</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-entitymanager</artifactId>
-	  <version>3.6.10.Final</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.openid4java</groupId>
-	  <artifactId>openid4java-nodeps</artifactId>
-	  <version>0.9.6</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>guice</artifactId>
-		  <groupId>com.google.code.guice</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-mockito</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-support</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-core</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4-common</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-reflect</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.data</groupId>
-	  <artifactId>spring-data-jpa</artifactId>
-	  <version>1.7.1.RELEASE</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>aspectjrt</artifactId>
-		  <groupId>org.aspectj</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.ldap</groupId>
-	  <artifactId>spring-ldap-core</artifactId>
-	  <version>2.0.2.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-aspects</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-cas</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-expression</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-orm</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjweaver</artifactId>
+      <version>1.8.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-ldap</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <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>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-websocket</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ldapsdk</groupId>
+      <artifactId>ldapsdk</artifactId>
+      <version>4.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>1.5.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-entry</artifactId>
+      <version>1.5.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>1.5.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
+      <version>1.5.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>1.5.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.15</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>javax.persistence</artifactId>
+      <version>2.0.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>4.1.0.Final</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>3.6.10.Final</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openid4java</groupId>
+      <artifactId>openid4java-nodeps</artifactId>
+      <version>0.9.6</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>guice</artifactId>
+          <groupId>com.google.code.guice</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-support</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4-common</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-reflect</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-jpa</artifactId>
+      <version>1.7.1.RELEASE</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>aspectjrt</artifactId>
+          <groupId>org.aspectj</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.ldap</groupId>
+      <artifactId>spring-ldap-core</artifactId>
+      <version>2.0.2.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-aspects</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-cas</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java

@@ -29,70 +29,70 @@ import org.springframework.security.ldap.userdetails.PersonContextMapper;
 public class NamespaceLdapAuthenticationProviderTestsConfigs {
 	@EnableWebSecurity
 	static class LdapAuthenticationProviderConfig extends WebSecurityConfigurerAdapter {
-		filter-security-metadata-source
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .ldapAuthentication()
-                    .groupSearchBase("ou=groups")
-                    .userDnPatterns("uid={0},ou=people"); // ldap-server@user-dn-pattern
-        }
-        // @formatter:on
+		// @formatter:off
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.ldapAuthentication()
+					.groupSearchBase("ou=groups")
+					.userDnPatterns("uid={0},ou=people"); // ldap-server@user-dn-pattern
+		}
+		// @formatter:on
 	}
 
 	@EnableWebSecurity
 	static class CustomLdapAuthenticationProviderConfig extends
 			WebSecurityConfigurerAdapter {
-		filter-security-metadata-source
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .ldapAuthentication()
-                    .groupRoleAttribute("cn") // ldap-authentication-provider@group-role-attribute
-                    .groupSearchBase("ou=groups") // ldap-authentication-provider@group-search-base
-                    .groupSearchFilter("(member={0})") // ldap-authentication-provider@group-search-filter
-                    .rolePrefix("PREFIX_") // ldap-authentication-provider@group-search-filter
-                    .userDetailsContextMapper(new PersonContextMapper()) // ldap-authentication-provider@user-context-mapper-ref / ldap-authentication-provider@user-details-class
-                    .userDnPatterns("uid={0},ou=people") // ldap-authentication-provider@user-dn-pattern
-                    .userSearchBase("ou=users") // ldap-authentication-provider@user-dn-pattern
-                    .userSearchFilter("(uid={0})") // ldap-authentication-provider@user-search-filter
-                    // .contextSource(contextSource) // ldap-authentication-provider@server-ref
-                    .contextSource()
-                        .ldif("classpath:users.xldif") // ldap-server@ldif
-                        .managerDn("uid=admin,ou=system") // ldap-server@manager-dn
-                        .managerPassword("secret") // ldap-server@manager-password
-                        .port(33399) // ldap-server@port
-                        .root("dc=springframework,dc=org") // ldap-server@root
-                        // .url("ldap://localhost:33389/dc-springframework,dc=org") this overrides root and port and is used for external
-                        ;
-        }
-        // @formatter:on
+		// @formatter:off
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.ldapAuthentication()
+					.groupRoleAttribute("cn") // ldap-authentication-provider@group-role-attribute
+					.groupSearchBase("ou=groups") // ldap-authentication-provider@group-search-base
+					.groupSearchFilter("(member={0})") // ldap-authentication-provider@group-search-filter
+					.rolePrefix("PREFIX_") // ldap-authentication-provider@group-search-filter
+					.userDetailsContextMapper(new PersonContextMapper()) // ldap-authentication-provider@user-context-mapper-ref / ldap-authentication-provider@user-details-class
+					.userDnPatterns("uid={0},ou=people") // ldap-authentication-provider@user-dn-pattern
+					.userSearchBase("ou=users") // ldap-authentication-provider@user-dn-pattern
+					.userSearchFilter("(uid={0})") // ldap-authentication-provider@user-search-filter
+					// .contextSource(contextSource) // ldap-authentication-provider@server-ref
+					.contextSource()
+						.ldif("classpath:users.xldif") // ldap-server@ldif
+						.managerDn("uid=admin,ou=system") // ldap-server@manager-dn
+						.managerPassword("secret") // ldap-server@manager-password
+						.port(33399) // ldap-server@port
+						.root("dc=springframework,dc=org") // ldap-server@root
+						// .url("ldap://localhost:33389/dc-springframework,dc=org") this overrides root and port and is used for external
+						;
+		}
+		// @formatter:on
 	}
 
 	@EnableWebSecurity
 	static class CustomAuthoritiesPopulatorConfig extends WebSecurityConfigurerAdapter {
 		static LdapAuthoritiesPopulator LAP;
 
-		filter-security-metadata-source
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .ldapAuthentication()
-                    .userSearchFilter("(uid={0})")
-                    .ldapAuthoritiesPopulator(LAP);
-        }
-        // @formatter:on
+		// @formatter:off
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.ldapAuthentication()
+					.userSearchFilter("(uid={0})")
+					.ldapAuthoritiesPopulator(LAP);
+		}
+		// @formatter:on
 	}
 
 	@EnableWebSecurity
 	static class PasswordCompareLdapConfig extends WebSecurityConfigurerAdapter {
-		filter-security-metadata-source
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .ldapAuthentication()
-                    .groupSearchBase("ou=groups")
-                    .userSearchFilter("(uid={0})")
-                    .passwordCompare()
-                        .passwordEncoder(new PlaintextPasswordEncoder()) // ldap-authentication-provider/password-compare/password-encoder@ref
-                        .passwordAttribute("userPassword"); // ldap-authentication-provider/password-compare@password-attribute
-        }
-        // @formatter:on
+		// @formatter:off
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.ldapAuthentication()
+					.groupSearchBase("ou=groups")
+					.userSearchFilter("(uid={0})")
+					.passwordCompare()
+						.passwordEncoder(new PlaintextPasswordEncoder()) // ldap-authentication-provider/password-compare/password-encoder@ref
+						.passwordAttribute("userPassword"); // ldap-authentication-provider/password-compare@password-attribute
+		}
+		// @formatter:on
 	}
 }

core/pom.xml

@@ -8,285 +8,285 @@
   <description>spring-security-core</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-expression</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.annotation</groupId>
-	  <artifactId>jsr250-api</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>net.sf.ehcache</groupId>
-	  <artifactId>ehcache</artifactId>
-	  <version>2.9.0</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.aspectj</groupId>
-	  <artifactId>aspectjrt</artifactId>
-	  <version>1.8.4</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-collections</groupId>
-	  <artifactId>commons-collections</artifactId>
-	  <version>3.2.1</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-mockito</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-support</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-core</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4-common</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-reflect</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>2.9.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.8.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-support</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4-common</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-reflect</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java

@@ -24,7 +24,7 @@ public class SpringSecurityCoreVersion {
 	 */
 	public static final long SERIAL_VERSION_UID = 400L;
 
-	static final String MIN_SPRING_VERSION = "4.1.5.RELEASE";
+	static final String MIN_SPRING_VERSION = "4.1.6.RELEASE";
 
 	static {
 		performVersionChecks();

crypto/pom.xml

@@ -8,88 +8,88 @@
   <description>spring-security-crypto</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

data/pom.xml

@@ -8,112 +8,112 @@
   <description>spring-security-data</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.data</groupId>
-	  <artifactId>spring-data-commons</artifactId>
-	  <version>1.9.1.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-commons</artifactId>
+      <version>1.9.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

itest/context/pom.xml

@@ -8,160 +8,160 @@
   <description>itest-context</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.python</groupId>
-	  <artifactId>jython</artifactId>
-	  <version>2.5.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.aspectj</groupId>
-	  <artifactId>aspectjweaver</artifactId>
-	  <version>1.8.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.python</groupId>
+      <artifactId>jython</artifactId>
+      <version>2.5.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjweaver</artifactId>
+      <version>1.8.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

itest/web/pom.xml

@@ -8,207 +8,207 @@
   <description>itest-web</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>net.sourceforge.jwebunit</groupId>
-	  <artifactId>jwebunit-core</artifactId>
-	  <version>2.2</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>regexp</artifactId>
-		  <groupId>regexp</groupId>
-		</exclusion>
-		<exclusion>
-		  <artifactId>servlet-api</artifactId>
-		  <groupId>javax.servlet</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>net.sourceforge.jwebunit</groupId>
-	  <artifactId>jwebunit-htmlunit-plugin</artifactId>
-	  <version>2.2</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>servlet-api</artifactId>
-		  <groupId>javax.servlet</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mortbay.jetty</groupId>
-	  <artifactId>jetty</artifactId>
-	  <version>6.1.26</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>servlet-api</artifactId>
-		  <groupId>org.mortbay.jetty</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.mortbay.jetty</groupId>
-	  <artifactId>jetty-util</artifactId>
-	  <version>6.1.26</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mortbay.jetty</groupId>
-	  <artifactId>jsp-2.1-jetty</artifactId>
-	  <version>6.1.26</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-ldap</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.testng</groupId>
-	  <artifactId>testng</artifactId>
-	  <version>5.11</version>
-	  <classifier>jdk15</classifier>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.jwebunit</groupId>
+      <artifactId>jwebunit-core</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>regexp</artifactId>
+          <groupId>regexp</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>servlet-api</artifactId>
+          <groupId>javax.servlet</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.jwebunit</groupId>
+      <artifactId>jwebunit-htmlunit-plugin</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>servlet-api</artifactId>
+          <groupId>javax.servlet</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.26</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>servlet-api</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.26</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1-jetty</artifactId>
+      <version>6.1.26</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-ldap</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>5.11</version>
+      <classifier>jdk15</classifier>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

ldap/pom.xml

@@ -8,207 +8,207 @@
   <description>spring-security-ldap</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.ldap</groupId>
-	  <artifactId>spring-ldap-core</artifactId>
-	  <version>2.0.2.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>spring-beans</artifactId>
-		  <groupId>org.springframework</groupId>
-		</exclusion>
-		<exclusion>
-		  <artifactId>spring-core</artifactId>
-		  <groupId>org.springframework</groupId>
-		</exclusion>
-		<exclusion>
-		  <artifactId>spring-data-commons</artifactId>
-		  <groupId>org.springframework.data</groupId>
-		</exclusion>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-		<exclusion>
-		  <artifactId>spring-tx</artifactId>
-		  <groupId>org.springframework</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ldapsdk</groupId>
-	  <artifactId>ldapsdk</artifactId>
-	  <version>4.1</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core-entry</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-ldap</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-shared</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-server-jndi</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.shared</groupId>
-	  <artifactId>shared-ldap</artifactId>
-	  <version>0.9.15</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.ldap</groupId>
+      <artifactId>spring-ldap-core</artifactId>
+      <version>2.0.2.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>spring-beans</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-core</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-data-commons</artifactId>
+          <groupId>org.springframework.data</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-tx</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ldapsdk</groupId>
+      <artifactId>ldapsdk</artifactId>
+      <version>4.1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-entry</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.15</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

messaging/pom.xml

@@ -8,241 +8,241 @@
   <description>spring-security-messaging</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-expression</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-messaging</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-websocket</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-codec</groupId>
-	  <artifactId>commons-codec</artifactId>
-	  <version>1.10</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy-all</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-mockito</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-support</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-core</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4-common</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-reflect</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-messaging</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-websocket</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-support</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4-common</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-reflect</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

openid/pom.xml

@@ -8,172 +8,172 @@
   <description>spring-security-openid</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>com.google.inject</groupId>
-	  <artifactId>guice</artifactId>
-	  <version>2.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.openid4java</groupId>
-	  <artifactId>openid4java-nodeps</artifactId>
-	  <version>0.9.6</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>guice</artifactId>
-		  <groupId>com.google.code.guice</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>net.sourceforge.nekohtml</groupId>
-	  <artifactId>nekohtml</artifactId>
-	  <version>1.9.20</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.httpcomponents</groupId>
-	  <artifactId>httpclient</artifactId>
-	  <version>4.2.3</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openid4java</groupId>
+      <artifactId>openid4java-nodeps</artifactId>
+      <version>0.9.6</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>guice</artifactId>
+          <groupId>com.google.code.guice</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+      <version>1.9.20</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.2.3</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

remoting/pom.xml

@@ -8,130 +8,130 @@
   <description>spring-security-remoting</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/aspectj-jc/pom.xml

@@ -8,113 +8,113 @@
   <description>spring-security-samples-aspectj-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.aspectj</groupId>
-	  <artifactId>aspectjrt</artifactId>
-	  <version>1.8.4</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-aspects</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.8.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-aspects</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/aspectj-xml/pom.xml

@@ -8,113 +8,113 @@
   <description>spring-security-samples-aspectj-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.aspectj</groupId>
-	  <artifactId>aspectjrt</artifactId>
-	  <version>1.8.4</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-aspects</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.8.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-aspects</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/cas/sample-xml/pom.xml

@@ -9,206 +9,206 @@
   <description>spring-security-samples-cassample-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.jasig.cas.client</groupId>
-	  <artifactId>cas-client-core</artifactId>
-	  <version>3.3.3</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-cas</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>net.sf.ehcache</groupId>
-	  <artifactId>ehcache</artifactId>
-	  <version>2.9.0</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context-support</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.eclipse.jetty</groupId>
-	  <artifactId>jetty-server</artifactId>
-	  <version>8.1.9.v20130131</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.eclipse.jetty</groupId>
-	  <artifactId>jetty-servlet</artifactId>
-	  <version>8.1.9.v20130131</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.jasig.cas.client</groupId>
+      <artifactId>cas-client-core</artifactId>
+      <version>3.3.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-cas</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>2.9.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>8.1.9.v20130131</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>8.1.9.v20130131</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/spring-security-samples-cassample-xml</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/spring-security-samples-cassample-xml</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/cas/server/pom.xml

@@ -9,98 +9,98 @@
   <description>spring-security-samples-casserver</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/spring-security-samples-casserver</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/spring-security-samples-casserver</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/chat-jc/pom.xml

@@ -9,254 +9,254 @@
   <description>spring-security-samples-chat-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>com.fasterxml.jackson.core</groupId>
-	  <artifactId>jackson-databind</artifactId>
-	  <version>2.4.4</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.commons</groupId>
-	  <artifactId>commons-pool2</artifactId>
-	  <version>2.2</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate.javax.persistence</groupId>
-	  <artifactId>hibernate-jpa-2.0-api</artifactId>
-	  <version>1.0.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-entitymanager</artifactId>
-	  <version>3.6.10.Final</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>javassist</artifactId>
-		  <groupId>javassist</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.data</groupId>
-	  <artifactId>spring-data-jpa</artifactId>
-	  <version>1.7.1.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>aspectjrt</artifactId>
-		  <groupId>org.aspectj</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.data</groupId>
-	  <artifactId>spring-data-redis</artifactId>
-	  <version>1.4.1.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-data</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-messaging</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.session</groupId>
-	  <artifactId>spring-session</artifactId>
-	  <version>1.0.0.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-messaging</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-websocket</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.thymeleaf.extras</groupId>
-	  <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
-	  <version>2.1.1.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.thymeleaf</groupId>
-	  <artifactId>thymeleaf-spring4</artifactId>
-	  <version>1.2.7.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>redis.clients</groupId>
-	  <artifactId>jedis</artifactId>
-	  <version>2.4.2</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>redis.embedded</groupId>
-	  <artifactId>embedded-redis</artifactId>
-	  <version>0.2</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.4.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
+      <version>1.0.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>3.6.10.Final</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>javassist</artifactId>
+          <groupId>javassist</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-jpa</artifactId>
+      <version>1.7.1.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>aspectjrt</artifactId>
+          <groupId>org.aspectj</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-redis</artifactId>
+      <version>1.4.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-data</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-messaging</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.session</groupId>
+      <artifactId>spring-session</artifactId>
+      <version>1.0.0.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-messaging</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-websocket</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
+      <version>2.1.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf-spring4</artifactId>
+      <version>1.2.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>redis.clients</groupId>
+      <artifactId>jedis</artifactId>
+      <version>2.4.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>redis.embedded</groupId>
+      <artifactId>embedded-redis</artifactId>
+      <version>0.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/concurrency-jc/pom.xml

@@ -9,200 +9,200 @@
   <description>spring-security-samples-concurrency-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/contacts-xml/pom.xml

@@ -9,254 +9,254 @@
   <description>spring-security-samples-contacts-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-acl</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>net.sf.ehcache</groupId>
-	  <artifactId>ehcache</artifactId>
-	  <version>2.9.0</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context-support</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-acl</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>2.9.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/data-jc/pom.xml

@@ -8,136 +8,136 @@
   <description>spring-security-samples-data-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate.javax.persistence</groupId>
-	  <artifactId>hibernate-jpa-2.0-api</artifactId>
-	  <version>1.0.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-entitymanager</artifactId>
-	  <version>3.6.10.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.data</groupId>
-	  <artifactId>spring-data-jpa</artifactId>
-	  <version>1.7.1.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-data</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
+      <version>1.0.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>3.6.10.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-jpa</artifactId>
+      <version>1.7.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-data</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/dms-xml/pom.xml

@@ -8,149 +8,149 @@
   <description>spring-security-samples-dms-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-acl</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>net.sf.ehcache</groupId>
-	  <artifactId>ehcache</artifactId>
-	  <version>2.9.0</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context-support</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-acl</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>2.9.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/form-jc/pom.xml

@@ -9,248 +9,248 @@
   <description>spring-security-samples-form-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/gae-xml/pom.xml

@@ -9,206 +9,206 @@
   <description>spring-security-samples-gae-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>com.google.appengine</groupId>
-	  <artifactId>appengine-api-1.0-sdk</artifactId>
-	  <version>1.4.2</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context-support</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-jdk14</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>com.google.appengine</groupId>
-	  <artifactId>appengine-api-labs</artifactId>
-	  <version>1.4.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>com.google.appengine</groupId>
-	  <artifactId>appengine-api-stubs</artifactId>
-	  <version>1.4.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>com.google.appengine</groupId>
-	  <artifactId>appengine-testing</artifactId>
-	  <version>1.4.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>1.4.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-labs</artifactId>
+      <version>1.4.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-stubs</artifactId>
+      <version>1.4.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-testing</artifactId>
+      <version>1.4.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/spring-security-samples-gae-xml</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/spring-security-samples-gae-xml</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/hellojs-jc/pom.xml

@@ -9,206 +9,206 @@
   <description>spring-security-samples-hellojs-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>com.fasterxml.jackson.core</groupId>
-	  <artifactId>jackson-databind</artifactId>
-	  <version>2.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/hellomvc-jc/pom.xml

@@ -9,206 +9,206 @@
   <description>spring-security-samples-hellomvc-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-test</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-test</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/helloworld-jc/pom.xml

@@ -9,182 +9,182 @@
   <description>spring-security-samples-helloworld-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/helloworld-xml/pom.xml

@@ -9,182 +9,182 @@
   <description>spring-security-samples-helloworld-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/inmemory-jc/pom.xml

@@ -9,206 +9,206 @@
   <description>spring-security-samples-inmemory-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-test</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-test</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/insecure/pom.xml

@@ -9,170 +9,170 @@
   <description>spring-security-samples-insecure</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/insecuremvc/pom.xml

@@ -9,182 +9,182 @@
   <description>spring-security-samples-insecuremvc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/jaas-xml/pom.xml

@@ -9,212 +9,212 @@
   <description>spring-security-samples-jaas-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context-support</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/jdbc-jc/pom.xml

@@ -9,248 +9,248 @@
   <description>spring-security-samples-jdbc-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/ldap-jc/pom.xml

@@ -9,290 +9,290 @@
   <description>spring-security-samples-ldap-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core-entry</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-ldap</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-shared</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-server-jndi</artifactId>
-	  <version>1.5.5</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.shared</groupId>
-	  <artifactId>shared-ldap</artifactId>
-	  <version>0.9.15</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-ldap</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-entry</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.15</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-ldap</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/ldap-xml/pom.xml

@@ -9,218 +9,218 @@
   <description>spring-security-samples-ldap-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core</artifactId>
-	  <version>1.5.5</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-core-entry</artifactId>
-	  <version>1.5.5</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-ldap</artifactId>
-	  <version>1.5.5</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-protocol-shared</artifactId>
-	  <version>1.5.5</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.server</groupId>
-	  <artifactId>apacheds-server-jndi</artifactId>
-	  <version>1.5.5</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.directory.shared</groupId>
-	  <artifactId>shared-ldap</artifactId>
-	  <version>0.9.15</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-ldap</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-	  <version>3.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.gebish</groupId>
-	  <artifactId>geb-spock</artifactId>
-	  <version>0.10.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.seleniumhq.selenium</groupId>
-	  <artifactId>selenium-htmlunit-driver</artifactId>
-	  <version>2.44.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-entry</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>1.5.5</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.15</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-ldap</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.gebish</groupId>
+      <artifactId>geb-spock</artifactId>
+      <version>0.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-htmlunit-driver</artifactId>
+      <version>2.44.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/messages-jc/pom.xml

@@ -8,220 +8,220 @@
   <description>spring-security-samples-messages-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate.javax.persistence</groupId>
-	  <artifactId>hibernate-jpa-2.0-api</artifactId>
-	  <version>1.0.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-entitymanager</artifactId>
-	  <version>3.6.10.Final</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>javassist</artifactId>
-		  <groupId>javassist</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.data</groupId>
-	  <artifactId>spring-data-jpa</artifactId>
-	  <version>1.7.1.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>aspectjrt</artifactId>
-		  <groupId>org.aspectj</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aspects</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-instrument</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-orm</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.thymeleaf.extras</groupId>
-	  <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
-	  <version>2.1.1.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.thymeleaf</groupId>
-	  <artifactId>thymeleaf-spring4</artifactId>
-	  <version>1.2.7.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.javax.persistence</groupId>
+      <artifactId>hibernate-jpa-2.0-api</artifactId>
+      <version>1.0.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-entitymanager</artifactId>
+      <version>3.6.10.Final</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>javassist</artifactId>
+          <groupId>javassist</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-jpa</artifactId>
+      <version>1.7.1.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>aspectjrt</artifactId>
+          <groupId>org.aspectj</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aspects</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-instrument</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf.extras</groupId>
+      <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
+      <version>2.1.1.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf-spring4</artifactId>
+      <version>1.2.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/openid-jc/pom.xml

@@ -9,212 +9,212 @@
   <description>spring-security-samples-openid-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-openid</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>net.sourceforge.nekohtml</groupId>
-	  <artifactId>nekohtml</artifactId>
-	  <version>1.9.10</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-openid</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+      <version>1.9.10</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/openid-xml/pom.xml

@@ -9,140 +9,140 @@
   <description>spring-security-samples-openid-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-openid</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-openid</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/spring-security-samples-openid-xml</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/spring-security-samples-openid-xml</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/preauth-jc/pom.xml

@@ -9,200 +9,200 @@
   <description>spring-security-samples-preauth-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/preauth-xml/pom.xml

@@ -9,110 +9,110 @@
   <description>spring-security-samples-preauth-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/rememberme-jc/pom.xml

@@ -9,200 +9,200 @@
   <description>spring-security-samples-rememberme-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/servletapi-xml/pom.xml

@@ -9,170 +9,170 @@
   <description>spring-security-samples-servletapi-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context-support</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/spring-security-samples-servletapi-xml</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/spring-security-samples-servletapi-xml</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/tutorial-xml/pom.xml

@@ -9,170 +9,170 @@
   <description>spring-security-samples-tutorial-xml</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-core</artifactId>
-	  <version>1.1.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.apache.taglibs</groupId>
-	  <artifactId>taglibs-standard-jstlel</artifactId>
-	  <version>1.2.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-taglibs</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>1.1.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-jstlel</artifactId>
+      <version>1.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

samples/x509-jc/pom.xml

@@ -9,200 +9,200 @@
   <description>spring-security-samples-x509-jc</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.validation</groupId>
-	  <artifactId>validation-api</artifactId>
-	  <version>1.0.0.GA</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>4.2.0.Final</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jul-to-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>log4j-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.7.7</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-samples-messages-jc</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>jsp-api</artifactId>
-	  <version>2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>cglib</groupId>
-	  <artifactId>cglib-nodep</artifactId>
-	  <version>3.1</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>0.9.30</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>opensymphony</groupId>
-	  <artifactId>sitemesh</artifactId>
-	  <version>2.4.2</version>
-	  <scope>runtime</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <version>1.0.0.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.2.0.Final</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-samples-messages-jc</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>sitemesh</artifactId>
+      <version>2.4.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
-	<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
+    <m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
   </properties>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	  <plugin>
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.3</version>
-		<configuration>
-		  <failOnMissingWebXml>false</failOnMissingWebXml>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

taglibs/pom.xml

@@ -8,196 +8,196 @@
   <description>spring-security-taglibs</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-acl</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-aop</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-expression</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp</groupId>
-	  <artifactId>javax.servlet.jsp-api</artifactId>
-	  <version>2.2.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet.jsp.jstl</groupId>
-	  <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-	  <version>1.2.1</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy-all</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-acl</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
+      <version>2.2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

test/pom.xml

@@ -8,173 +8,173 @@
   <description>spring-security-test</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-web</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-config</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-mockito</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-support</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-core</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4-common</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-reflect</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-support</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4-common</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-reflect</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

web/pom.xml

@@ -8,247 +8,247 @@
   <description>spring-security-web</description>
   <url>http://spring.io/spring-security</url>
   <organization>
-	<name>spring.io</name>
-	<url>http://spring.io/</url>
+    <name>spring.io</name>
+    <url>http://spring.io/</url>
   </organization>
   <licenses>
-	<license>
-	  <name>The Apache Software License, Version 2.0</name>
-	  <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-	  <distribution>repo</distribution>
-	</license>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
   </licenses>
   <developers>
-	<developer>
-	  <id>rwinch</id>
-	  <name>Rob Winch</name>
-	  <email>rwinch@gopivotal.com</email>
-	</developer>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
   </developers>
   <scm>
-	<connection>scm:git:git://github.com/spring-projects/spring-security</connection>
-	<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
-	<url>https://github.com/spring-projects/spring-security</url>
+    <connection>scm:git:git://github.com/spring-projects/spring-security</connection>
+    <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
+    <url>https://github.com/spring-projects/spring-security</url>
   </scm>
   <repositories>
-	<repository>
-	  <id>spring-snasphot</id>
-	  <url>https://repo.spring.io/snapshot</url>
-	</repository>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>https://repo.spring.io/snapshot</url>
+    </repository>
   </repositories>
   <dependencies>
-	<dependency>
-	  <groupId>aopalliance</groupId>
-	  <artifactId>aopalliance</artifactId>
-	  <version>1.0</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework.security</groupId>
-	  <artifactId>spring-security-core</artifactId>
-	  <version>4.0.0.CI-SNAPSHOT</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-beans</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-context</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-core</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>commons-logging</artifactId>
-		  <groupId>commons-logging</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-expression</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-web</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <version>1.2</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-jdbc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-tx</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-webmvc</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>compile</scope>
-	  <optional>true</optional>
-	</dependency>
-	<dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
-	  <version>3.0.1</version>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>ch.qos.logback</groupId>
-	  <artifactId>logback-classic</artifactId>
-	  <version>1.1.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-codec</groupId>
-	  <artifactId>commons-codec</artifactId>
-	  <version>1.3</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <version>4.11</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.codehaus.groovy</groupId>
-	  <artifactId>groovy-all</artifactId>
-	  <version>2.3.8</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.easytesting</groupId>
-	  <artifactId>fest-assert</artifactId>
-	  <version>1.4</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.hsqldb</groupId>
-	  <artifactId>hsqldb</artifactId>
-	  <version>2.3.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.mockito</groupId>
-	  <artifactId>mockito-core</artifactId>
-	  <version>1.9.5</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-mockito</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>mockito-all</artifactId>
-		  <groupId>org.mockito</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-api-support</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-core</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-module-junit4-common</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.powermock</groupId>
-	  <artifactId>powermock-reflect</artifactId>
-	  <version>1.6.0</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>jcl-over-slf4j</artifactId>
-	  <version>1.7.7</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-core</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.spockframework</groupId>
-	  <artifactId>spock-spring</artifactId>
-	  <version>0.7-groovy-2.0</version>
-	  <scope>test</scope>
-	  <exclusions>
-		<exclusion>
-		  <artifactId>junit-dep</artifactId>
-		  <groupId>junit</groupId>
-		</exclusion>
-	  </exclusions>
-	</dependency>
-	<dependency>
-	  <groupId>org.springframework</groupId>
-	  <artifactId>spring-test</artifactId>
-	  <version>4.1.5.RELEASE</version>
-	  <scope>test</scope>
-	</dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>4.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <version>2.3.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>2.3.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>mockito-all</artifactId>
+          <groupId>org.mockito</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-support</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4-common</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-reflect</artifactId>
+      <version>1.6.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-spring</artifactId>
+      <version>0.7-groovy-2.0</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-dep</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>4.1.6.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
-	<plugins>
-	  <plugin>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		  <source>1.7</source>
-		  <target>1.7</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>