Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add springio-platform plugin

This commit is contained in:
Rob Winch 2014-04-11 09:57:18 -05:00
parent 2b3becf666
commit 00e1094178
56 changed files with 157 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acl/acl.gradle
View File

@ -8,7 +8,7 @@ dependencies {
"org.springframework:spring-tx:$springVersion", "org.springframework:spring-tx:$springVersion",
"org.springframework:spring-jdbc:$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", testCompile "org.springframework:spring-beans:$springVersion",
"org.springframework:spring-context-support:$springVersion", "org.springframework:spring-context-support:$springVersion",

2
acl/pom.xml
View File

@ -106,7 +106,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.6.5</version> <version>2.6.5</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>

4
build.gradle
View File

@ -2,10 +2,11 @@ import groovy.text.SimpleTemplateEngine
buildscript { buildscript {
repositories { repositories {
maven { url "http://repo.springsource.org/plugins-release" } maven { url "https://repo.spring.io/plugins-snapshot" }
} }
dependencies { dependencies {
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5") 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("org.gradle.api.plugins:gradle-tomcat-plugin:0.9.8")
classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1') classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
classpath('org.asciidoctor:asciidoctor-gradle-plugin:0.7.0') classpath('org.asciidoctor:asciidoctor-gradle-plugin:0.7.0')
@ -96,6 +97,7 @@ configure(javaProjects) {
configure(coreModuleProjects) { configure(coreModuleProjects) {
apply plugin: 'emma' apply plugin: 'emma'
apply plugin: 'springio-platform'
configurations { configurations {
jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo

2
cas/cas.gradle
View File

@ -7,7 +7,7 @@ dependencies {
"org.springframework:spring-web:$springVersion", "org.springframework:spring-web:$springVersion",
"org.jasig.cas.client:cas-client-core:3.2.1" "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" provided "javax.servlet:javax.servlet-api:$servletApiVersion"
} }

2
cas/pom.xml
View File

@ -106,7 +106,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.6.5</version> <version>2.6.5</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>

3
config/config.gradle
View File

@ -35,7 +35,7 @@ dependencies {
"org.springframework:spring-orm:$springVersion", "org.springframework:spring-orm:$springVersion",
"org.springframework:spring-tx:$springVersion", "org.springframework:spring-tx:$springVersion",
"org.slf4j:jcl-over-slf4j:$slf4jVersion", "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.hibernate:hibernate-entitymanager:4.1.0.Final",
"org.codehaus.groovy:groovy-all:$groovyVersion", "org.codehaus.groovy:groovy-all:$groovyVersion",
"org.apache.directory.server:apacheds-core:$apacheDsVersion", "org.apache.directory.server:apacheds-core:$apacheDsVersion",
@ -46,7 +46,6 @@ dependencies {
'org.apache.directory.shared:shared-ldap:0.9.15', 'org.apache.directory.shared:shared-ldap:0.9.15',
'ldapsdk:ldapsdk:4.1', 'ldapsdk:ldapsdk:4.1',
powerMockDependencies, powerMockDependencies,
"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
"org.hibernate:hibernate-entitymanager:3.6.10.Final", "org.hibernate:hibernate-entitymanager:3.6.10.Final",
"org.hsqldb:hsqldb:2.2.8", "org.hsqldb:hsqldb:2.2.8",
spockDependencies spockDependencies

12
config/pom.xml
View File

@ -239,15 +239,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate.javax.persistence</groupId> <groupId>org.eclipse.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId> <artifactId>javax.persistence</artifactId>
<version>1.0.0.Final</version> <version>2.0.5</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>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

7
core/core.gradle
View File

@ -19,7 +19,7 @@ dependencies {
"org.springframework:spring-context:$springVersion", "org.springframework:spring-context:$springVersion",
"org.springframework:spring-expression:$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', 'javax.annotation:jsr250-api:1.0',
"org.aspectj:aspectjrt:$aspectjVersion", "org.aspectj:aspectjrt:$aspectjVersion",
"org.springframework:spring-jdbc:$springVersion", "org.springframework:spring-jdbc:$springVersion",
@ -32,8 +32,7 @@ dependencies {
"org.slf4j:jcl-over-slf4j:$slf4jVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion",
powerMockDependencies powerMockDependencies
testRuntime "org.hsqldb:hsqldb:$hsqlVersion", testRuntime "org.hsqldb:hsqldb:$hsqlVersion"
"cglib:cglib-nodep:$cglibVersion"
} }
classes.doLast { classes.doLast {
@ -45,7 +44,7 @@ classes.doLast {
sourceJar.from cryptoProject.sourceSets.main.java sourceJar.from cryptoProject.sourceSets.main.java
configure([test]) { configure(project.tasks.withType(Test)) {
systemProperties['springSecurityVersion'] = version systemProperties['springSecurityVersion'] = version
systemProperties['springVersion'] = springVersion systemProperties['springVersion'] = springVersion
} }

8
core/pom.xml
View File

@ -107,7 +107,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.6.5</version> <version>2.6.5</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
@ -133,12 +133,6 @@
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>

2
crypto/crypto.gradle
View File

@ -4,7 +4,7 @@
// isJdk6 = jdkVersion >= '1.6' // isJdk6 = jdkVersion >= '1.6'
int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES') int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')
configure(test) { configure(project.tasks.withType(Test)) {
if (maxAESKeySize < 256) { if (maxAESKeySize < 256) {
println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests" println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests"
exclude '**/EncryptorsTests.class' exclude '**/EncryptorsTests.class'

6
gradle/javaprojects.gradle
View File

@ -14,7 +14,7 @@ targetCompatibility = 1.5
ext.ehcacheVersion = '2.6.5' ext.ehcacheVersion = '2.6.5'
ext.aspectjVersion = '1.6.10' ext.aspectjVersion = '1.6.10'
ext.apacheDsVersion = '1.5.5' ext.apacheDsVersion = '1.5.5'
ext.jstlVersion = '1.2' ext.jstlVersion = '1.2.1'
ext.jettyVersion = '6.1.26' ext.jettyVersion = '6.1.26'
ext.hsqlVersion = '2.3.1' ext.hsqlVersion = '2.3.1'
ext.slf4jVersion = '1.7.5' ext.slf4jVersion = '1.7.5'
@ -115,8 +115,8 @@ configurations.all {
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
test { project.tasks.matching { it instanceof Test && it.name != 'integrationTest' }.all {
jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M'] jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=256M']
maxParallelForks = guessMaxForks() maxParallelForks = guessMaxForks()
logging.captureStandardOutput(LogLevel.INFO) logging.captureStandardOutput(LogLevel.INFO)
} }

2
samples/cas/sample-xml/cassample.gradle
View File

@ -37,7 +37,7 @@ dependencies {
"org.springframework:spring-context-support:$springVersion", "org.springframework:spring-context-support:$springVersion",
"org.slf4j:jcl-over-slf4j:$slf4jVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion", "ch.qos.logback:logback-classic:$logbackVersion",
"net.sf.ehcache:ehcache:$ehcacheVersion" "net.sf.ehcache:ehcache-core:$ehcacheVersion"
integrationTestCompile project(':spring-security-cas'), integrationTestCompile project(':spring-security-cas'),
"org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion", "org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",

2
samples/cas/sample-xml/pom.xml
View File

@ -108,7 +108,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.6.5</version> <version>2.6.5</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

2
samples/concurrency-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/concurrency-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
samples/contacts-xml/contacts.gradle
View File

@ -19,10 +19,10 @@ dependencies {
project(':spring-security-config'), project(':spring-security-config'),
project(':spring-security-taglibs'), project(':spring-security-taglibs'),
"org.springframework:spring-context-support:$springVersion", "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.hsqldb:hsqldb:$hsqlVersion",
"org.slf4j:jcl-over-slf4j:$slf4jVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion", "ch.qos.logback:logback-classic:$logbackVersion",
"net.sf.ehcache:ehcache:$ehcacheVersion" "net.sf.ehcache:ehcache-core:$ehcacheVersion"
} }

8
samples/contacts-xml/pom.xml
View File

@ -143,14 +143,14 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.6.5</version> <version>2.6.5</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

2
samples/dms-xml/dms.gradle
View File

@ -12,5 +12,5 @@ dependencies {
"org.hsqldb:hsqldb:$hsqlVersion", "org.hsqldb:hsqldb:$hsqlVersion",
"org.springframework:spring-context-support:$springVersion" "org.springframework:spring-context-support:$springVersion"
optional "net.sf.ehcache:ehcache:$ehcacheVersion" optional "net.sf.ehcache:ehcache-core:$ehcacheVersion"
} }

2
samples/dms-xml/pom.xml
View File

@ -100,7 +100,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.6.5</version> <version>2.6.5</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>

2
samples/form-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/form-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/hellojs-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final", "org.hibernate:hibernate-validator:4.2.0.Final",
"com.fasterxml.jackson.core:jackson-databind:2.2.1" "com.fasterxml.jackson.core:jackson-databind:2.2.1"

6
samples/hellojs-jc/pom.xml
View File

@ -64,9 +64,9 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/hellomvc-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/hellomvc-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/helloworld-jc/build.gradle
View File

@ -7,7 +7,7 @@ dependencies {
compile project(":spring-security-config"), compile project(":spring-security-config"),
project(":spring-security-web"), 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" "org.slf4j:jcl-over-slf4j:$slf4jVersion"
runtime "ch.qos.logback:logback-classic:$logbackVersion" runtime "ch.qos.logback:logback-classic:$logbackVersion"

6
samples/helloworld-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/inmemory-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/inmemory-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/insecure/build.gradle
View File

@ -5,7 +5,7 @@ dependencies {
providedCompile "javax.servlet:javax.servlet-api:3.0.1", providedCompile "javax.servlet:javax.servlet-api:3.0.1",
'javax.servlet.jsp:jsp-api:2.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" "org.slf4j:jcl-over-slf4j:$slf4jVersion"
runtime "ch.qos.logback:logback-classic:$logbackVersion" runtime "ch.qos.logback:logback-classic:$logbackVersion"

6
samples/insecure/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/insecuremvc/build.gradle
View File

@ -12,7 +12,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/insecuremvc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/jaas-xml/jaas.gradle
View File

@ -23,7 +23,7 @@ dependencies {
project(':spring-security-config'), project(':spring-security-config'),
project(':spring-security-taglibs'), project(':spring-security-taglibs'),
"org.springframework:spring-context-support:$springVersion", "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", "org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion" "ch.qos.logback:logback-classic:$logbackVersion"
} }

6
samples/jaas-xml/pom.xml
View File

@ -113,9 +113,9 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/jdbc-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/jdbc-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/ldap-jc/build.gradle
View File

@ -17,7 +17,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/ldap-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/openid-jc/build.gradle
View File

@ -16,7 +16,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/openid-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/openid-xml/openid.gradle
View File

@ -13,7 +13,7 @@ dependencies {
project(':spring-security-taglibs'), project(':spring-security-taglibs'),
// 'xerces:xercesImpl:2.9.1', // 'xerces:xercesImpl:2.9.1',
// 'net.sourceforge.nekohtml:nekohtml:1.9.7', // '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", "org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion" "ch.qos.logback:logback-classic:$logbackVersion"
} }

6
samples/openid-xml/pom.xml
View File

@ -101,9 +101,9 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/preauth-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/preauth-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/rememberme-jc/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/rememberme-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

6
samples/servletapi-xml/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

4
samples/servletapi-xml/servletapi.gradle
View File

@ -17,7 +17,7 @@ dependencies {
compile project(':spring-security-core'), compile project(':spring-security-core'),
project(':spring-security-web'), 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-beans:$springVersion",
"org.springframework:spring-context:$springVersion", "org.springframework:spring-context:$springVersion",
"org.springframework:spring-web:$springVersion", "org.springframework:spring-web:$springVersion",
@ -26,7 +26,7 @@ dependencies {
runtime project(':spring-security-config'), runtime project(':spring-security-config'),
project(':spring-security-taglibs'), project(':spring-security-taglibs'),
"org.springframework:spring-context-support:$springVersion", "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", "org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion" "ch.qos.logback:logback-classic:$logbackVersion"
} }

6
samples/tutorial-xml/pom.xml
View File

@ -125,9 +125,9 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

2
samples/tutorial-xml/tutorial.gradle
View File

@ -27,7 +27,7 @@ dependencies {
runtime project(':spring-security-web'), runtime project(':spring-security-web'),
project(':spring-security-config'), project(':spring-security-config'),
project(':spring-security-taglibs'), project(':spring-security-taglibs'),
"javax.servlet:jstl:$jstlVersion", "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
"org.slf4j:jcl-over-slf4j:$slf4jVersion", "org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-core:$logbackVersion", "ch.qos.logback:logback-core:$logbackVersion",
"ch.qos.logback:logback-classic:$logbackVersion" "ch.qos.logback:logback-classic:$logbackVersion"

2
samples/x509-jc/build.gradle
View File

@ -16,7 +16,7 @@ dependencies {
"org.slf4j:log4j-over-slf4j:$slf4jVersion", "org.slf4j:log4j-over-slf4j:$slf4jVersion",
"org.slf4j:jul-to-slf4j:$slf4jVersion", "org.slf4j:jul-to-slf4j:$slf4jVersion",
"org.slf4j:jcl-over-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", "javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final" "org.hibernate:hibernate-validator:4.2.0.Final"

6
samples/x509-jc/pom.xml
View File

@ -58,9 +58,9 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

6
taglibs/pom.xml
View File

@ -135,9 +135,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2</version> <version>1.2.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

4
taglibs/taglibs.gradle
View File

@ -17,9 +17,9 @@ dependencies {
testCompile "org.codehaus.groovy:groovy-all:$groovyVersion", testCompile "org.codehaus.groovy:groovy-all:$groovyVersion",
spockDependencies 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 systemProperties['springSecurityVersion'] = version
} }

52
test/pom.xml
View File

@ -87,8 +87,8 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat</groupId> <groupId>javax.servlet</groupId>
<artifactId>tomcat-servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>3.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -116,6 +116,48 @@
<version>1.9.5</version> <version>1.9.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </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> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>
@ -128,5 +170,11 @@
<version>4.0.0.CI-SNAPSHOT</version> <version>4.0.0.CI-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.0.2.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>