Add springio-platform plugin

12 years ago · 00e1094178
56 changed files with 157 additions and 121 deletions
--- a/acl/acl.gradle
+++ b/acl/acl.gradle
@ -8,7 +8,7 @@ dependencies {
				@@ -8,7 +8,7 @@ dependencies {
            "org.springframework:spring-tx:$springVersion",
            "org.springframework:spring-jdbc:$springVersion"

-    optional "net.sf.ehcache:ehcache:$ehcacheVersion"
+    optional "net.sf.ehcache:ehcache-core:$ehcacheVersion"

    testCompile "org.springframework:spring-beans:$springVersion",
                "org.springframework:spring-context-support:$springVersion",
--- a/acl/pom.xml
+++ b/acl/pom.xml
@ -106,7 +106,7 @@
				@@ -106,7 +106,7 @@
    </dependency>
    <dependency>
      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
+      <artifactId>ehcache-core</artifactId>
      <version>2.6.5</version>
      <scope>compile</scope>
      <optional>true</optional>
--- a/build.gradle
+++ b/build.gradle
@ -2,10 +2,11 @@ import groovy.text.SimpleTemplateEngine
				@@ -2,10 +2,11 @@ import groovy.text.SimpleTemplateEngine

 buildscript {
    repositories {
-        maven { url "http://repo.springsource.org/plugins-release" }
+        maven { url "https://repo.spring.io/plugins-snapshot" }
    }
    dependencies {
        classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5")
+        classpath("org.springframework.build.gradle:springio-platform-plugin:0.0.1.BUILD-SNAPSHOT")
        classpath("org.gradle.api.plugins:gradle-tomcat-plugin:0.9.8")
        classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
        classpath('org.asciidoctor:asciidoctor-gradle-plugin:0.7.0')
@ -96,6 +97,7 @@ configure(javaProjects) {
				@@ -96,6 +97,7 @@ configure(javaProjects) {

 configure(coreModuleProjects) {
    apply plugin: 'emma'
+    apply plugin: 'springio-platform'

    configurations {
        jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo
--- a/cas/cas.gradle
+++ b/cas/cas.gradle
@ -7,7 +7,7 @@ dependencies {
				@@ -7,7 +7,7 @@ dependencies {
            "org.springframework:spring-web:$springVersion",
            "org.jasig.cas.client:cas-client-core:3.2.1"

-    optional "net.sf.ehcache:ehcache:$ehcacheVersion"
+    optional "net.sf.ehcache:ehcache-core:$ehcacheVersion"

    provided "javax.servlet:javax.servlet-api:$servletApiVersion"
 }
--- a/cas/pom.xml
+++ b/cas/pom.xml
@ -106,7 +106,7 @@
				@@ -106,7 +106,7 @@
    </dependency>
    <dependency>
      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
+      <artifactId>ehcache-core</artifactId>
      <version>2.6.5</version>
      <scope>compile</scope>
      <optional>true</optional>
--- a/config/config.gradle
+++ b/config/config.gradle
@ -35,7 +35,7 @@ dependencies {
				@@ -35,7 +35,7 @@ dependencies {
                "org.springframework:spring-orm:$springVersion",
                "org.springframework:spring-tx:$springVersion",
                "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-                "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final",
+                "org.eclipse.persistence:javax.persistence:2.0.5",
                "org.hibernate:hibernate-entitymanager:4.1.0.Final",
                "org.codehaus.groovy:groovy-all:$groovyVersion",
                "org.apache.directory.server:apacheds-core:$apacheDsVersion",
@ -46,7 +46,6 @@ dependencies {
				@@ -46,7 +46,6 @@ dependencies {
                'org.apache.directory.shared:shared-ldap:0.9.15',
                'ldapsdk:ldapsdk:4.1',
                powerMockDependencies,
-                "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
                 "org.hibernate:hibernate-entitymanager:3.6.10.Final",
                "org.hsqldb:hsqldb:2.2.8",
                spockDependencies
--- a/config/pom.xml
+++ b/config/pom.xml
@ -239,15 +239,9 @@
				@@ -239,15 +239,9 @@
      <scope>test</scope>
    </dependency>
    <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.0.Final</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
-      <version>1.0.1.Final</version>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>javax.persistence</artifactId>
+      <version>2.0.5</version>
      <scope>test</scope>
    </dependency>
    <dependency>
--- a/core/core.gradle
+++ b/core/core.gradle
@ -19,7 +19,7 @@ dependencies {
				@@ -19,7 +19,7 @@ dependencies {
            "org.springframework:spring-context:$springVersion",
            "org.springframework:spring-expression:$springVersion"

-    optional "net.sf.ehcache:ehcache:$ehcacheVersion",
+    optional "net.sf.ehcache:ehcache-core:$ehcacheVersion",
             'javax.annotation:jsr250-api:1.0',
             "org.aspectj:aspectjrt:$aspectjVersion",
             "org.springframework:spring-jdbc:$springVersion",
@ -32,8 +32,7 @@ dependencies {
				@@ -32,8 +32,7 @@ dependencies {
                "org.slf4j:jcl-over-slf4j:$slf4jVersion",
                powerMockDependencies

-    testRuntime "org.hsqldb:hsqldb:$hsqlVersion",
-                "cglib:cglib-nodep:$cglibVersion"
+    testRuntime "org.hsqldb:hsqldb:$hsqlVersion"
 }

 classes.doLast {
@ -45,7 +44,7 @@ classes.doLast {
				@@ -45,7 +44,7 @@ classes.doLast {

 sourceJar.from cryptoProject.sourceSets.main.java

-configure([test]) {
+configure(project.tasks.withType(Test)) {
    systemProperties['springSecurityVersion'] = version
    systemProperties['springVersion'] = springVersion
 }
--- a/core/pom.xml
+++ b/core/pom.xml
@ -107,7 +107,7 @@
				@@ -107,7 +107,7 @@
    </dependency>
    <dependency>
      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
+      <artifactId>ehcache-core</artifactId>
      <version>2.6.5</version>
      <scope>compile</scope>
      <optional>true</optional>
@ -133,12 +133,6 @@
				@@ -133,12 +133,6 @@
      <scope>compile</scope>
      <optional>true</optional>
    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
    <dependency>
      <groupId>ch.qos.logback</groupId>
      <artifactId>logback-classic</artifactId>
--- a/crypto/crypto.gradle
+++ b/crypto/crypto.gradle
@ -4,7 +4,7 @@
				@@ -4,7 +4,7 @@
 // isJdk6 = jdkVersion >= '1.6'
 int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')

-configure(test) {
+configure(project.tasks.withType(Test)) {
    if (maxAESKeySize < 256) {
        println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests"
        exclude '**/EncryptorsTests.class'
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@ -14,7 +14,7 @@ targetCompatibility = 1.5
				@@ -14,7 +14,7 @@ targetCompatibility = 1.5
 ext.ehcacheVersion = '2.6.5'
 ext.aspectjVersion = '1.6.10'
 ext.apacheDsVersion = '1.5.5'
-ext.jstlVersion = '1.2'
+ext.jstlVersion = '1.2.1'
 ext.jettyVersion = '6.1.26'
 ext.hsqlVersion = '2.3.1'
 ext.slf4jVersion = '1.7.5'
@ -115,8 +115,8 @@ configurations.all {
				@@ -115,8 +115,8 @@ configurations.all {

 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

-test {
-    jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M']
+project.tasks.matching { it instanceof Test && it.name != 'integrationTest' }.all {
+    jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=256M']
    maxParallelForks = guessMaxForks()
    logging.captureStandardOutput(LogLevel.INFO)
 }
--- a/samples/cas/sample-xml/cassample.gradle
+++ b/samples/cas/sample-xml/cassample.gradle
@ -37,7 +37,7 @@ dependencies {
				@@ -37,7 +37,7 @@ dependencies {
            "org.springframework:spring-context-support:$springVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
            "ch.qos.logback:logback-classic:$logbackVersion",
-            "net.sf.ehcache:ehcache:$ehcacheVersion"
+            "net.sf.ehcache:ehcache-core:$ehcacheVersion"

    integrationTestCompile project(':spring-security-cas'),
                   "org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
--- a/samples/cas/sample-xml/pom.xml
+++ b/samples/cas/sample-xml/pom.xml
@ -108,7 +108,7 @@
				@@ -108,7 +108,7 @@
    </dependency>
    <dependency>
      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
+      <artifactId>ehcache-core</artifactId>
      <version>2.6.5</version>
      <scope>runtime</scope>
    </dependency>
--- a/samples/concurrency-jc/build.gradle
+++ b/samples/concurrency-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/concurrency-jc/pom.xml
+++ b/samples/concurrency-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/contacts-xml/contacts.gradle
+++ b/samples/contacts-xml/contacts.gradle
@ -19,10 +19,10 @@ dependencies {
				@@ -19,10 +19,10 @@ dependencies {
            project(':spring-security-config'),
            project(':spring-security-taglibs'),
            "org.springframework:spring-context-support:$springVersion",
-            "javax.servlet:jstl:$jstlVersion",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.hsqldb:hsqldb:$hsqlVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
            "ch.qos.logback:logback-classic:$logbackVersion",
-            "net.sf.ehcache:ehcache:$ehcacheVersion"
+            "net.sf.ehcache:ehcache-core:$ehcacheVersion"

 }
--- a/samples/contacts-xml/pom.xml
+++ b/samples/contacts-xml/pom.xml
@ -143,14 +143,14 @@
				@@ -143,14 +143,14 @@
      <scope>runtime</scope>
    </dependency>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <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>
+      <artifactId>ehcache-core</artifactId>
      <version>2.6.5</version>
      <scope>runtime</scope>
    </dependency>
--- a/samples/dms-xml/dms.gradle
+++ b/samples/dms-xml/dms.gradle
@ -12,5 +12,5 @@ dependencies {
				@@ -12,5 +12,5 @@ dependencies {
            "org.hsqldb:hsqldb:$hsqlVersion",
            "org.springframework:spring-context-support:$springVersion"

-    optional "net.sf.ehcache:ehcache:$ehcacheVersion"
+    optional "net.sf.ehcache:ehcache-core:$ehcacheVersion"
 }
--- a/samples/dms-xml/pom.xml
+++ b/samples/dms-xml/pom.xml
@ -100,7 +100,7 @@
				@@ -100,7 +100,7 @@
    </dependency>
    <dependency>
      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
+      <artifactId>ehcache-core</artifactId>
      <version>2.6.5</version>
      <scope>compile</scope>
      <optional>true</optional>
--- a/samples/form-jc/build.gradle
+++ b/samples/form-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/form-jc/pom.xml
+++ b/samples/form-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/hellojs-jc/build.gradle
+++ b/samples/hellojs-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final",
            "com.fasterxml.jackson.core:jackson-databind:2.2.1"
--- a/samples/hellojs-jc/pom.xml
+++ b/samples/hellojs-jc/pom.xml
@ -64,9 +64,9 @@
				@@ -64,9 +64,9 @@
      <scope>compile</scope>
    </dependency>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/hellomvc-jc/build.gradle
+++ b/samples/hellomvc-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/hellomvc-jc/pom.xml
+++ b/samples/hellomvc-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/helloworld-jc/build.gradle
+++ b/samples/helloworld-jc/build.gradle
@ -7,7 +7,7 @@ dependencies {
				@@ -7,7 +7,7 @@ dependencies {

    compile project(":spring-security-config"),
            project(":spring-security-web"),
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion"

    runtime "ch.qos.logback:logback-classic:$logbackVersion"
--- a/samples/helloworld-jc/pom.xml
+++ b/samples/helloworld-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/inmemory-jc/build.gradle
+++ b/samples/inmemory-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/inmemory-jc/pom.xml
+++ b/samples/inmemory-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/insecure/build.gradle
+++ b/samples/insecure/build.gradle
@ -5,7 +5,7 @@ dependencies {
				@@ -5,7 +5,7 @@ dependencies {
    providedCompile "javax.servlet:javax.servlet-api:3.0.1",
                    'javax.servlet.jsp:jsp-api:2.1'

-    compile "javax.servlet:jstl:1.2",
+    compile "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion"

    runtime "ch.qos.logback:logback-classic:$logbackVersion"
--- a/samples/insecure/pom.xml
+++ b/samples/insecure/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/insecuremvc/build.gradle
+++ b/samples/insecuremvc/build.gradle
@ -12,7 +12,7 @@ dependencies {
				@@ -12,7 +12,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/insecuremvc/pom.xml
+++ b/samples/insecuremvc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/jaas-xml/jaas.gradle
+++ b/samples/jaas-xml/jaas.gradle
@ -23,7 +23,7 @@ dependencies {
				@@ -23,7 +23,7 @@ dependencies {
            project(':spring-security-config'),
            project(':spring-security-taglibs'),
            "org.springframework:spring-context-support:$springVersion",
-            "javax.servlet:jstl:$jstlVersion",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
            "ch.qos.logback:logback-classic:$logbackVersion"
 }
--- a/samples/jaas-xml/pom.xml
+++ b/samples/jaas-xml/pom.xml
@ -113,9 +113,9 @@
				@@ -113,9 +113,9 @@
      <scope>runtime</scope>
    </dependency>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>runtime</scope>
    </dependency>
    <dependency>
--- a/samples/jdbc-jc/build.gradle
+++ b/samples/jdbc-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/jdbc-jc/pom.xml
+++ b/samples/jdbc-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/ldap-jc/build.gradle
+++ b/samples/ldap-jc/build.gradle
@ -17,7 +17,7 @@ dependencies {
				@@ -17,7 +17,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/ldap-jc/pom.xml
+++ b/samples/ldap-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/openid-jc/build.gradle
+++ b/samples/openid-jc/build.gradle
@ -16,7 +16,7 @@ dependencies {
				@@ -16,7 +16,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/openid-jc/pom.xml
+++ b/samples/openid-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/openid-xml/openid.gradle
+++ b/samples/openid-xml/openid.gradle
@ -13,7 +13,7 @@ dependencies {
				@@ -13,7 +13,7 @@ dependencies {
            project(':spring-security-taglibs'),
 //            'xerces:xercesImpl:2.9.1',
 //            'net.sourceforge.nekohtml:nekohtml:1.9.7',
-            "javax.servlet:jstl:$jstlVersion",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
            "ch.qos.logback:logback-classic:$logbackVersion"
 }
--- a/samples/openid-xml/pom.xml
+++ b/samples/openid-xml/pom.xml
@ -101,9 +101,9 @@
				@@ -101,9 +101,9 @@
      <scope>runtime</scope>
    </dependency>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>runtime</scope>
    </dependency>
    <dependency>
--- a/samples/preauth-jc/build.gradle
+++ b/samples/preauth-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/preauth-jc/pom.xml
+++ b/samples/preauth-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/rememberme-jc/build.gradle
+++ b/samples/rememberme-jc/build.gradle
@ -15,7 +15,7 @@ dependencies {
				@@ -15,7 +15,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/rememberme-jc/pom.xml
+++ b/samples/rememberme-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/servletapi-xml/pom.xml
+++ b/samples/servletapi-xml/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/samples/servletapi-xml/servletapi.gradle
+++ b/samples/servletapi-xml/servletapi.gradle
@ -17,7 +17,7 @@ dependencies {
				@@ -17,7 +17,7 @@ dependencies {

    compile project(':spring-security-core'),
            project(':spring-security-web'),
-            "javax.servlet:jstl:$jstlVersion",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.springframework:spring-beans:$springVersion",
            "org.springframework:spring-context:$springVersion",
            "org.springframework:spring-web:$springVersion",
@ -26,7 +26,7 @@ dependencies {
				@@ -26,7 +26,7 @@ dependencies {
    runtime project(':spring-security-config'),
            project(':spring-security-taglibs'),
            "org.springframework:spring-context-support:$springVersion",
-            "javax.servlet:jstl:$jstlVersion",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
            "ch.qos.logback:logback-classic:$logbackVersion"
 }
--- a/samples/tutorial-xml/pom.xml
+++ b/samples/tutorial-xml/pom.xml
@ -125,9 +125,9 @@
				@@ -125,9 +125,9 @@
      <scope>runtime</scope>
    </dependency>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>runtime</scope>
    </dependency>
    <dependency>
--- a/samples/tutorial-xml/tutorial.gradle
+++ b/samples/tutorial-xml/tutorial.gradle
@ -27,7 +27,7 @@ dependencies {
				@@ -27,7 +27,7 @@ dependencies {
    runtime project(':spring-security-web'),
            project(':spring-security-config'),
            project(':spring-security-taglibs'),
-            "javax.servlet:jstl:$jstlVersion",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
            "ch.qos.logback:logback-core:$logbackVersion",
            "ch.qos.logback:logback-classic:$logbackVersion"
--- a/samples/x509-jc/build.gradle
+++ b/samples/x509-jc/build.gradle
@ -16,7 +16,7 @@ dependencies {
				@@ -16,7 +16,7 @@ dependencies {
            "org.slf4j:log4j-over-slf4j:$slf4jVersion",
            "org.slf4j:jul-to-slf4j:$slf4jVersion",
            "org.slf4j:jcl-over-slf4j:$slf4jVersion",
-            "javax.servlet:jstl:1.2",
+            "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
            "javax.validation:validation-api:1.0.0.GA",
            "org.hibernate:hibernate-validator:4.2.0.Final"

--- a/samples/x509-jc/pom.xml
+++ b/samples/x509-jc/pom.xml
@ -58,9 +58,9 @@
				@@ -58,9 +58,9 @@
  </repositories>
  <dependencies>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@ -135,9 +135,9 @@
				@@ -135,9 +135,9 @@
      <scope>test</scope>
    </dependency>
    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>1.2.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
--- a/taglibs/taglibs.gradle
+++ b/taglibs/taglibs.gradle
@ -17,9 +17,9 @@ dependencies {
				@@ -17,9 +17,9 @@ dependencies {
    testCompile "org.codehaus.groovy:groovy-all:$groovyVersion",
                spockDependencies

-    testRuntime "javax.servlet:jstl:$jstlVersion"
+    testRuntime "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion"
 }

-configure(test) {
+configure(project.tasks.withType(Test)) {
    systemProperties['springSecurityVersion'] = version
 }
--- a/test/pom.xml
+++ b/test/pom.xml
@ -87,8 +87,8 @@
				@@ -87,8 +87,8 @@
      <optional>true</optional>
    </dependency>
    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
      <version>3.0.1</version>
      <scope>provided</scope>
    </dependency>
@ -116,6 +116,48 @@
				@@ -116,6 +116,48 @@
      <version>1.9.5</version>
      <scope>test</scope>
    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.5.1</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.5.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4-common</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-reflect</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>jcl-over-slf4j</artifactId>
@ -128,5 +170,11 @@
				@@ -128,5 +170,11 @@
      <version>4.0.0.CI-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>4.0.2.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
  </dependencies>
 </project>