diff --git a/acl/acl.gradle b/acl/acl.gradle index 016eed6fcc..22fd7ce075 100644 --- a/acl/acl.gradle +++ b/acl/acl.gradle @@ -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", diff --git a/acl/pom.xml b/acl/pom.xml index 3971e4a7b0..909a932af1 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -106,8 +106,8 @@ net.sf.ehcache - ehcache - 1.6.2 + ehcache-core + 1.7.2 compile true diff --git a/build.gradle b/build.gradle index 71fc16502c..2263170afc 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,12 @@ import groovy.text.SimpleTemplateEngine buildscript { repositories { - maven { url "http://repo.springsource.org/plugins-release" } + maven { url "https://repo.spring.io/plugins-release" } } dependencies { classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5") classpath("org.springframework.build.gradle:bundlor-plugin:0.1.2") + classpath("org.springframework.build.gradle:springio-platform-plugin:0.0.2.RELEASE") 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') @@ -100,6 +101,7 @@ configure(javaProjects) { configure(coreModuleProjects) { apply plugin: 'bundlor' apply plugin: 'emma' + apply plugin: 'springio-platform' bundlor.doFirst { def templateText = file("template.mf").text @@ -107,25 +109,7 @@ configure(coreModuleProjects) { } configurations { jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo - spring4TestRuntime.extendsFrom testRuntime } - configurations.spring4TestRuntime { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.springframework') { - details.useVersion spring4Version - } - if (details.requested.name == 'ehcache') { - details.useVersion '2.6.5' - } - if (details.requested.name == 'ehcache-terracotta') { - details.useVersion '2.1.1' - } - if (details.requested.group == 'org.springframework.ldap') { - details.useVersion springLdap2Version - } - } - } - dependencies { jacoco "org.jacoco:org.jacoco.agent:0.6.2.201302030002:runtime" } @@ -135,14 +119,6 @@ configure(coreModuleProjects) { integrationTest { jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=${project.group}.*" } - task spring4Test(type: Test) { - jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M'] - exclude "**/EhCacheBasedAclCacheTests.class", "**/Issue55Tests.class" - classpath = sourceSets.test.output + sourceSets.main.output + configurations.spring4TestRuntime - testResultsDir = file("$buildDir/spring4-test-results/") - testReportDir = file("$buildDir/reports/spring4-tests/") - } - check.dependsOn spring4Test } configure (aspectjProjects) { diff --git a/cas/cas.gradle b/cas/cas.gradle index d5996a8b4c..0e06c6df3b 100644 --- a/cas/cas.gradle +++ b/cas/cas.gradle @@ -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" } diff --git a/cas/pom.xml b/cas/pom.xml index 2bf746f14e..365abbd38e 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -106,8 +106,8 @@ net.sf.ehcache - ehcache - 1.6.2 + ehcache-core + 1.7.2 compile true diff --git a/config/config.gradle b/config/config.gradle index 7699502b29..497333c508 100644 --- a/config/config.gradle +++ b/config/config.gradle @@ -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 { '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 diff --git a/config/pom.xml b/config/pom.xml index 424cf31a51..de7969ae17 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -239,15 +239,9 @@ test - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - test - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.1.Final + org.eclipse.persistence + javax.persistence + 2.0.5 test diff --git a/core/core.gradle b/core/core.gradle index 84fd326263..ebf982caff 100644 --- a/core/core.gradle +++ b/core/core.gradle @@ -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 { "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 { sourceJar.from cryptoProject.sourceSets.main.java -configure([test,spring4Test]) { +configure(project.tasks.withType(Test)) { systemProperties['springSecurityVersion'] = version systemProperties['springVersion'] = springVersion } \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 558ec9406f..018728ee4b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -107,8 +107,8 @@ net.sf.ehcache - ehcache - 1.6.2 + ehcache-core + 1.7.2 compile true @@ -133,12 +133,6 @@ compile true - - cglib - cglib-nodep - 2.2 - test - ch.qos.logback logback-classic diff --git a/crypto/crypto.gradle b/crypto/crypto.gradle index 95299e61d7..619e9b4c02 100644 --- a/crypto/crypto.gradle +++ b/crypto/crypto.gradle @@ -4,7 +4,7 @@ // isJdk6 = jdkVersion >= '1.6' int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES') -configure([test,spring4Test]) { +configure(project.tasks.withType(Test)) { if (maxAESKeySize < 256) { println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests" exclude '**/EncryptorsTests.class' diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 0b5c031ccc..691283b656 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -11,10 +11,10 @@ apply plugin: 'propdeps-eclipse' sourceCompatibility = 1.5 targetCompatibility = 1.5 -ext.ehcacheVersion = '1.6.2' +ext.ehcacheVersion = '1.7.2' 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' @@ -131,8 +131,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) } diff --git a/samples/cas/sample-xml/cassample.gradle b/samples/cas/sample-xml/cassample.gradle index bf2bdc0f32..a96100d296 100644 --- a/samples/cas/sample-xml/cassample.gradle +++ b/samples/cas/sample-xml/cassample.gradle @@ -36,7 +36,7 @@ dependencies { project(':spring-security-config'), "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", diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index 9fe76d6f0e..4441b2a24f 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -108,8 +108,8 @@ net.sf.ehcache - ehcache - 1.6.2 + ehcache-core + 1.7.2 runtime diff --git a/samples/concurrency-jc/build.gradle b/samples/concurrency-jc/build.gradle index f2696c79ca..685bbbe62a 100644 --- a/samples/concurrency-jc/build.gradle +++ b/samples/concurrency-jc/build.gradle @@ -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" diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index 10a26787ba..41180f2ffa 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/contacts-xml/contacts.gradle b/samples/contacts-xml/contacts.gradle index 0d548a609c..717e226b43 100644 --- a/samples/contacts-xml/contacts.gradle +++ b/samples/contacts-xml/contacts.gradle @@ -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" } \ No newline at end of file diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index 3f475a176a..1210e906ba 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -143,15 +143,15 @@ runtime - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 runtime net.sf.ehcache - ehcache - 1.6.2 + ehcache-core + 1.7.2 runtime diff --git a/samples/dms-xml/dms.gradle b/samples/dms-xml/dms.gradle index fa332974f9..8cd4e104c8 100644 --- a/samples/dms-xml/dms.gradle +++ b/samples/dms-xml/dms.gradle @@ -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" } diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml index a337760477..de51b77025 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/dms-xml/pom.xml @@ -100,8 +100,8 @@ net.sf.ehcache - ehcache - 1.6.2 + ehcache-core + 1.7.2 compile true diff --git a/samples/form-jc/build.gradle b/samples/form-jc/build.gradle index f2696c79ca..685bbbe62a 100644 --- a/samples/form-jc/build.gradle +++ b/samples/form-jc/build.gradle @@ -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" diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index 6a39bcdbae..954845fdd3 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/hellojs-jc/build.gradle b/samples/hellojs-jc/build.gradle index 0d8be75294..b201175c10 100644 --- a/samples/hellojs-jc/build.gradle +++ b/samples/hellojs-jc/build.gradle @@ -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" diff --git a/samples/hellojs-jc/pom.xml b/samples/hellojs-jc/pom.xml index c1d0520152..03c64da67c 100644 --- a/samples/hellojs-jc/pom.xml +++ b/samples/hellojs-jc/pom.xml @@ -64,9 +64,9 @@ compile - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/hellomvc-jc/build.gradle b/samples/hellomvc-jc/build.gradle index f2696c79ca..685bbbe62a 100644 --- a/samples/hellomvc-jc/build.gradle +++ b/samples/hellomvc-jc/build.gradle @@ -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" diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index 2e3156a785..2281b97e21 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/helloworld-jc/build.gradle b/samples/helloworld-jc/build.gradle index dfc4d5864a..9f9078150e 100644 --- a/samples/helloworld-jc/build.gradle +++ b/samples/helloworld-jc/build.gradle @@ -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" diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index 114617e938..1ac8c3d1cb 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/inmemory-jc/build.gradle b/samples/inmemory-jc/build.gradle index f2696c79ca..685bbbe62a 100644 --- a/samples/inmemory-jc/build.gradle +++ b/samples/inmemory-jc/build.gradle @@ -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" diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index 7be6bce311..defee9bb96 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/insecure/build.gradle b/samples/insecure/build.gradle index dc2594f160..76cd069a48 100644 --- a/samples/insecure/build.gradle +++ b/samples/insecure/build.gradle @@ -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" diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index 453aa07fdb..734c839688 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/insecuremvc/build.gradle b/samples/insecuremvc/build.gradle index a0797769aa..efb3596b0b 100644 --- a/samples/insecuremvc/build.gradle +++ b/samples/insecuremvc/build.gradle @@ -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" diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index 7db0e9c763..2db5a8de91 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/jaas-xml/jaas.gradle b/samples/jaas-xml/jaas.gradle index 1c115ed0ac..943df29b91 100644 --- a/samples/jaas-xml/jaas.gradle +++ b/samples/jaas-xml/jaas.gradle @@ -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" } \ No newline at end of file diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index a6d561943f..60845f645a 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -113,9 +113,9 @@ runtime - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 runtime diff --git a/samples/jdbc-jc/build.gradle b/samples/jdbc-jc/build.gradle index f2696c79ca..685bbbe62a 100644 --- a/samples/jdbc-jc/build.gradle +++ b/samples/jdbc-jc/build.gradle @@ -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" diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index bf7290e8d7..6830a83cce 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/ldap-jc/build.gradle b/samples/ldap-jc/build.gradle index 2292ded7d1..d2a8003629 100644 --- a/samples/ldap-jc/build.gradle +++ b/samples/ldap-jc/build.gradle @@ -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" diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index 320e0a910b..16d6f0c664 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/openid-jc/build.gradle b/samples/openid-jc/build.gradle index 4e60264c6f..6fea8996f6 100644 --- a/samples/openid-jc/build.gradle +++ b/samples/openid-jc/build.gradle @@ -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" diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index 0ddfd41bc9..444e5bde33 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/openid-xml/openid.gradle b/samples/openid-xml/openid.gradle index 24e36dfecd..5a4d9f3481 100644 --- a/samples/openid-xml/openid.gradle +++ b/samples/openid-xml/openid.gradle @@ -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" } diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index dfe592cd8c..0cc73f6160 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -101,9 +101,9 @@ runtime - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 runtime diff --git a/samples/preauth-jc/build.gradle b/samples/preauth-jc/build.gradle index f2696c79ca..685bbbe62a 100644 --- a/samples/preauth-jc/build.gradle +++ b/samples/preauth-jc/build.gradle @@ -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" diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index 76957d787d..147c0b9226 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/rememberme-jc/build.gradle b/samples/rememberme-jc/build.gradle index f2696c79ca..685bbbe62a 100644 --- a/samples/rememberme-jc/build.gradle +++ b/samples/rememberme-jc/build.gradle @@ -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" diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index 9fa13e2138..a5b01560ac 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index e8cf50dbd4..84c5b4ef54 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/samples/servletapi-xml/servletapi.gradle b/samples/servletapi-xml/servletapi.gradle index 7ba353b046..bcd0669233 100644 --- a/samples/servletapi-xml/servletapi.gradle +++ b/samples/servletapi-xml/servletapi.gradle @@ -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 { 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" } diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index faf0924691..ede093e5ee 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -125,9 +125,9 @@ runtime - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 runtime diff --git a/samples/tutorial-xml/tutorial.gradle b/samples/tutorial-xml/tutorial.gradle index 61fac07389..8bed813596 100644 --- a/samples/tutorial-xml/tutorial.gradle +++ b/samples/tutorial-xml/tutorial.gradle @@ -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" diff --git a/samples/x509-jc/build.gradle b/samples/x509-jc/build.gradle index b7b6f15105..48f2443049 100644 --- a/samples/x509-jc/build.gradle +++ b/samples/x509-jc/build.gradle @@ -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" diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index daccb38184..9d81b0e7f5 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -58,9 +58,9 @@ - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 compile diff --git a/taglibs/pom.xml b/taglibs/pom.xml index 696374a036..a2e77ba7b9 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -135,9 +135,9 @@ test - javax.servlet - jstl - 1.2 + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 test diff --git a/taglibs/taglibs.gradle b/taglibs/taglibs.gradle index 683bd503c5..d407de54ed 100644 --- a/taglibs/taglibs.gradle +++ b/taglibs/taglibs.gradle @@ -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,spring4Test]) { +configure(project.tasks.withType(Test)) { systemProperties['springSecurityVersion'] = version } \ No newline at end of file