Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-30 00:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-2787: Update Versions

Browse Source
This commit is contained in:
Rob Winch 2014-12-10 10:07:32 -06:00
parent f5e8222115
commit 11116c2b80
73 changed files with 881 additions and 645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
acl/pom.xml
View File

@ -52,19 +52,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -76,33 +76,33 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.6.5</version>
<version>2.9.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -132,25 +132,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

18
aspects/pom.xml
View File

@ -46,19 +46,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -70,14 +70,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.6.10</version>
<version>1.8.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -90,7 +90,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -114,19 +114,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

6
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
dependencies {
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
classpath("org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE")
classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.5")
classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.1')
classpath("io.spring.gradle:docbook-reference-plugin:0.3.0")
@ -25,8 +25,8 @@ allprojects {
ext.releaseBuild = version.endsWith('RELEASE')
ext.snapshotBuild = version.endsWith('SNAPSHOT')
ext.springVersion = '4.1.1.BUILD-SNAPSHOT'
ext.springLdapVersion = '2.0.1.RELEASE'
ext.springVersion = '4.1.3.RELEASE'
ext.springLdapVersion = '2.0.2.RELEASE'
group = 'org.springframework.security'

2
cas/cas.gradle
View File

@ -6,7 +6,7 @@ dependencies {
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-web:$springVersion",
"org.jasig.cas.client:cas-client-core:3.3.3"
"org.jasig.cas.client:cas-client-core:$casClientVersion"
optional "net.sf.ehcache:ehcache:$ehcacheVersion"

18
cas/pom.xml
View File

@ -58,19 +58,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -82,20 +82,20 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.6.5</version>
<version>2.9.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -108,7 +108,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -132,13 +132,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

4
config/config.gradle
View File

@ -51,7 +51,7 @@ dependencies {
'ldapsdk:ldapsdk:4.1',
powerMockDependencies,
"org.hibernate:hibernate-entitymanager:3.6.10.Final",
"org.hsqldb:hsqldb:2.2.8",
"org.hsqldb:hsqldb:$hsqlVersion",
spockDependencies
testCompile('org.openid4java:openid4java-nodeps:0.9.6') {
@ -62,7 +62,7 @@ dependencies {
}
testRuntime "org.hsqldb:hsqldb:$hsqlVersion",
"cglib:cglib-nodep:2.2"
"cglib:cglib-nodep:$cglibVersion"
}
test {

60
config/pom.xml
View File

@ -52,25 +52,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -82,14 +82,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.10</version>
<version>1.8.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -124,35 +124,35 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-websocket</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -165,13 +165,13 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2</version>
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -231,7 +231,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -261,13 +261,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.2.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -291,7 +285,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -303,37 +297,37 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-support</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-common</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
@ -363,7 +357,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>1.7.0.RC1</version>
<version>1.7.1.RELEASE</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -375,7 +369,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
@ -393,19 +387,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

2
core/core.gradle
View File

@ -28,7 +28,7 @@ dependencies {
included cryptoProject
testCompile 'commons-collections:commons-collections:3.2',
testCompile "commons-collections:commons-collections:$commonsCollectionsVersion",
"org.springframework:spring-test:$springVersion",
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
powerMockDependencies

42
core/pom.xml
View File

@ -46,25 +46,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -76,13 +76,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -96,41 +96,41 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.6.5</version>
<version>2.9.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.6.10</version>
<version>1.8.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
<version>3.2.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -166,7 +166,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -184,7 +184,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -196,7 +196,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-support</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -208,7 +208,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -220,7 +220,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -232,7 +232,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-common</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -244,7 +244,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -256,7 +256,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -268,7 +268,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
<exclusions>
<exclusion>

2
core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
View File

@ -23,7 +23,7 @@ public class SpringSecurityCoreVersion {
*/
public static final long SERIAL_VERSION_UID = 400L;
static final String MIN_SPRING_VERSION = "4.1.1.BUILD-SNAPSHOT";
static final String MIN_SPRING_VERSION = "4.1.3.RELEASE";
static {
performVersionChecks();

8
crypto/pom.xml
View File

@ -40,14 +40,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -71,13 +71,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

12
data/pom.xml
View File

@ -40,7 +40,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>1.9.0.RC1</version>
<version>1.9.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -52,7 +52,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -64,14 +64,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -95,13 +95,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

36
gradle/javaprojects.gradle
View File

@ -12,24 +12,30 @@ apply plugin: 'propdeps-eclipse'
sourceCompatibility = 1.5
targetCompatibility = 1.5
ext.ehcacheVersion = '2.6.5'
ext.aspectjVersion = '1.8.4'
ext.apacheDsVersion = '1.5.5'
ext.jstlVersion = '1.2.1'
ext.aspectjVersion = '1.8.4'
ext.casClientVersion = '3.3.3'
ext.cglibVersion = '3.1'
ext.commonsCodecVersion = '1.10'
ext.commonsCollectionsVersion = '3.2.1'
ext.commonsLoggingVersion = '1.2'
ext.ehcacheVersion = '2.9.0'
ext.gebVersion = '0.10.0'
ext.groovyVersion = '2.3.8'
ext.hsqlVersion = '2.3.2'
ext.jacksonDatavindVersion = '2.4.4'
ext.jettyVersion = '6.1.26'
ext.hsqlVersion = '2.3.1'
ext.slf4jVersion = '1.7.5'
ext.logbackVersion = '0.9.29'
ext.cglibVersion = '2.2'
ext.powerMockVersion = '1.5.1'
ext.jstlVersion = '1.2.1'
ext.junitVersion = '4.11'
ext.logbackVersion = '1.1.2'
ext.powerMockVersion = '1.6.0'
ext.seleniumVersion = '2.44.0'
ext.servletApiVersion = '3.0.1'
ext.seleniumVersion = '2.33.0'
ext.groovyVersion = '2.0.5'
ext.slf4jVersion = '1.7.7'
ext.spockVersion = '0.7-groovy-2.0'
ext.gebVersion = '0.9.0'
ext.springDataCommonsVersion = '1.9.1.RELEASE'
ext.springDataJpaVersion = '1.7.1.RELEASE'
ext.thymeleafVersion = '2.1.3.RELEASE'
ext.springDataJpaVersion = '1.7.0.RC1'
ext.springDataCommonsVersion = '1.9.0.RC1'
ext.spockDependencies = [
dependencies.create("org.spockframework:spock-spring:$spockVersion") {
@ -119,9 +125,9 @@ project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 2, pro
check.dependsOn integrationTest
dependencies {
optional 'commons-logging:commons-logging:1.1.1'
optional "commons-logging:commons-logging:$commonsLoggingVersion"
testCompile 'junit:junit:4.11',
testCompile "junit:junit:$junitVersion",
'org.mockito:mockito-core:1.9.5',
"org.springframework:spring-test:$springVersion",
'org.easytesting:fest-assert:1.4'

4
gradle/tomcat.gradle
View File

@ -3,14 +3,14 @@ buildscript {
maven { url "https://repo.spring.io/plugins-release" }
}
dependencies {
classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.5")
}
}
apply plugin: 'tomcat'
dependencies {
def tomcatVersion = '7.0.54'
def tomcatVersion = '7.0.57'
tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}"
tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") {

20
itest/context/pom.xml
View File

@ -58,38 +58,38 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -107,7 +107,7 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.10</version>
<version>1.8.4</version>
<scope>test</scope>
</dependency>
<dependency>
@ -125,7 +125,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
@ -143,13 +143,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

16
itest/web/pom.xml
View File

@ -40,19 +40,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -65,7 +65,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -141,7 +141,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
@ -177,19 +177,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>

36
ldap/pom.xml
View File

@ -40,29 +40,29 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.2.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>spring-data-commons</artifactId>
<groupId>org.springframework.data</groupId>
<artifactId>spring-beans</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
<exclusion>
<artifactId>spring-core</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
<exclusion>
<artifactId>spring-tx</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
<exclusion>
<artifactId>spring-beans</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-data-commons</artifactId>
<groupId>org.springframework.data</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>spring-tx</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -74,19 +74,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -98,13 +98,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -160,7 +160,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -184,19 +184,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

2
messaging/messaging.gradle
View File

@ -10,7 +10,7 @@ dependencies {
"org.springframework:spring-messaging:$springVersion"
testCompile project(':spring-security-core').sourceSets.test.output,
'commons-codec:commons-codec:1.3',
"commons-codec:commons-codec:$commonsCodecVersion",
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"org.codehaus.groovy:groovy-all:$groovyVersion",
powerMockDependencies,

36
messaging/pom.xml
View File

@ -52,19 +52,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -76,32 +76,32 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
<version>1.10</version>
<scope>test</scope>
</dependency>
<dependency>
@ -113,7 +113,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -125,7 +125,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -137,7 +137,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -149,37 +149,37 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-support</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-common</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
@ -209,7 +209,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

18
openid/pom.xml
View File

@ -70,25 +70,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -100,13 +100,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -131,7 +131,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -155,13 +155,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

16
remoting/pom.xml
View File

@ -52,19 +52,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -76,20 +76,20 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -113,13 +113,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

10
samples/aspectj-jc/pom.xml
View File

@ -52,14 +52,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.6.10</version>
<version>1.8.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -72,7 +72,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -96,13 +96,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

10
samples/aspectj-xml/pom.xml
View File

@ -46,14 +46,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.6.10</version>
<version>1.8.4</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -72,7 +72,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -96,13 +96,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -30,7 +30,7 @@ dependencies {
compile project(':spring-security-core'),
project(':spring-security-cas'),
"org.jasig.cas.client:cas-client-core:3.3.3"
"org.jasig.cas.client:cas-client-core:$casClientVersion"
runtime project(':spring-security-web'),
project(':spring-security-config'),

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

@ -59,7 +59,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -72,19 +72,19 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.6.5</version>
<version>2.9.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -102,7 +102,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -144,7 +144,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -186,7 +186,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

2
samples/cas/server/casserver.gradle
View File

@ -9,7 +9,7 @@ configurations {
casServer
}
dependencies {
casServer "org.jasig.cas:cas-server-webapp:3.4.3.1@war"
casServer "org.jasig.cas:cas-server-webapp:4.0.0@war"
}
task casServerOverlay(type: Sync) {

8
samples/cas/server/pom.xml
View File

@ -41,14 +41,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -72,13 +72,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

196
samples/cas/server/src/main/webapp/WEB-INF/deployerConfigContext.xml Normal file
View File

@ -0,0 +1,196 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to Jasig under one or more contributor license
agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership.
Jasig licenses this file to you under the Apache License,
Version 2.0 (the "License"); you may not use this file
except in compliance with the License. You may obtain a
copy of the License at the following location:
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
| deployerConfigContext.xml centralizes into one file some of the declarative configuration that
| all CAS deployers will need to modify.
|
| This file declares some of the Spring-managed JavaBeans that make up a CAS deployment.
| The beans declared in this file are instantiated at context initialization time by the Spring
| ContextLoaderListener declared in web.xml. It finds this file because this
| file is among those declared in the context parameter "contextConfigLocation".
|
| By far the most common change you will need to make in this file is to change the last bean
| declaration to replace the default authentication handler with
| one implementing your approach for authenticating usernames and passwords.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:sec="http://www.springframework.org/schema/security"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
<!--
| The authentication manager defines security policy for authentication by specifying at a minimum
| the authentication handlers that will be used to authenticate credential. While the AuthenticationManager
| interface supports plugging in another implementation, the default PolicyBasedAuthenticationManager should
| be sufficient in most cases.
+-->
<bean id="authenticationManager" class="org.jasig.cas.authentication.PolicyBasedAuthenticationManager">
<constructor-arg>
<map>
<!--
| IMPORTANT
| Every handler requires a unique name.
| If more than one instance of the same handler class is configured, you must explicitly
| set its name to something other than its default name (typically the simple class name).
-->
<entry key-ref="proxyAuthenticationHandler" value-ref="proxyPrincipalResolver" />
<entry key-ref="primaryAuthenticationHandler" value-ref="primaryPrincipalResolver" />
</map>
</constructor-arg>
<!-- Uncomment the metadata populator to allow clearpass to capture and cache the password
This switch effectively will turn on clearpass.
<property name="authenticationMetaDataPopulators">
<util:list>
<bean class="org.jasig.cas.extension.clearpass.CacheCredentialsMetaDataPopulator"
c:credentialCache-ref="encryptedMap" />
</util:list>
</property>
-->
<!--
| Defines the security policy around authentication. Some alternative policies that ship with CAS:
|
| * NotPreventedAuthenticationPolicy - all credential must either pass or fail authentication
| * AllAuthenticationPolicy - all presented credential must be authenticated successfully
| * RequiredHandlerAuthenticationPolicy - specifies a handler that must authenticate its credential to pass
-->
<property name="authenticationPolicy">
<bean class="org.jasig.cas.authentication.AnyAuthenticationPolicy" />
</property>
</bean>
<!-- Required for proxy ticket mechanism. -->
<bean id="proxyAuthenticationHandler"
class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler"
p:httpClient-ref="httpClient" />
<!--
| TODO: Replace this component with one suitable for your enviroment.
|
| This component provides authentication for the kind of credential used in your environment. In most cases
| credential is a username/password pair that lives in a system of record like an LDAP directory.
| The most common authentication handler beans:
|
| * org.jasig.cas.authentication.LdapAuthenticationHandler
| * org.jasig.cas.adaptors.jdbc.QueryDatabaseAuthenticationHandler
| * org.jasig.cas.adaptors.x509.authentication.handler.support.X509CredentialsAuthenticationHandler
| * org.jasig.cas.support.spnego.authentication.handler.support.JCIFSSpnegoAuthenticationHandler
-->
<bean id="primaryAuthenticationHandler"
class="org.jasig.cas.authentication.AcceptUsersAuthenticationHandler">
<property name="users">
<map>
<entry key="scott" value="scott"/>
<entry key="rod" value="rod"/>
<entry key="dianne" value="dianne"/>
</map>
</property>
</bean>
<!-- Required for proxy ticket mechanism -->
<bean id="proxyPrincipalResolver"
class="org.jasig.cas.authentication.principal.BasicPrincipalResolver" />
<!--
| Resolves a principal from a credential using an attribute repository that is configured to resolve
| against a deployer-specific store (e.g. LDAP).
-->
<bean id="primaryPrincipalResolver"
class="org.jasig.cas.authentication.principal.PersonDirectoryPrincipalResolver" >
<property name="attributeRepository" ref="attributeRepository" />
</bean>
<!--
Bean that defines the attributes that a service may return. This example uses the Stub/Mock version. A real implementation
may go against a database or LDAP server. The id should remain "attributeRepository" though.
+-->
<bean id="attributeRepository" class="org.jasig.services.persondir.support.StubPersonAttributeDao"
p:backingMap-ref="attrRepoBackingMap" />
<util:map id="attrRepoBackingMap">
<entry key="uid" value="uid" />
<entry key="eduPersonAffiliation" value="eduPersonAffiliation" />
<entry key="groupMembership" value="groupMembership" />
</util:map>
<!--
Sample, in-memory data store for the ServiceRegistry. A real implementation
would probably want to replace this with the JPA-backed ServiceRegistry DAO
The name of this bean should remain "serviceRegistryDao".
+-->
<bean id="serviceRegistryDao" class="org.jasig.cas.services.InMemoryServiceRegistryDaoImpl"
p:registeredServices-ref="registeredServicesList" />
<util:list id="registeredServicesList">
<bean class="org.jasig.cas.services.RegexRegisteredService"
p:id="0" p:name="HTTP and IMAP" p:description="Allows HTTP(S) and IMAP(S) protocols"
p:serviceId="^(https?|imaps?)://.*" p:evaluationOrder="10000001"
p:allowedToProxy="true"/>
<!--
Use the following definition instead of the above to further restrict access
to services within your domain (including sub domains).
Note that example.com must be replaced with the domain you wish to permit.
This example also demonstrates the configuration of an attribute filter
that only allows for attributes whose length is 3.
-->
<!--
<bean class="org.jasig.cas.services.RegexRegisteredService">
<property name="id" value="1" />
<property name="name" value="HTTP and IMAP on example.com" />
<property name="description" value="Allows HTTP(S) and IMAP(S) protocols on example.com" />
<property name="serviceId" value="^(https?|imaps?)://([A-Za-z0-9_-]+\.)*example\.com/.*" />
<property name="evaluationOrder" value="0" />
<property name="attributeFilter">
<bean class="org.jasig.cas.services.support.RegisteredServiceRegexAttributeFilter" c:regex="^\w{3}$" />
</property>
</bean>
-->
</util:list>
<bean id="auditTrailManager" class="com.github.inspektr.audit.support.Slf4jLoggingAuditTrailManager" />
<bean id="healthCheckMonitor" class="org.jasig.cas.monitor.HealthCheckMonitor" p:monitors-ref="monitorsList" />
<util:list id="monitorsList">
<bean class="org.jasig.cas.monitor.MemoryMonitor" p:freeMemoryWarnThreshold="10" />
<!--
NOTE
The following ticket registries support SessionMonitor:
* DefaultTicketRegistry
* JpaTicketRegistry
Remove this monitor if you use an unsupported registry.
-->
<bean class="org.jasig.cas.monitor.SessionMonitor"
p:ticketRegistry-ref="ticketRegistry"
p:serviceTicketCountWarnThreshold="5000"
p:sessionCountWarnThreshold="100000" />
</util:list>
</beans>

215
samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml
View File

@ -1,96 +1,149 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to Jasig under one or more contributor license
agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership.
Jasig licenses this file to you under the Apache License,
Version 2.0 (the "License"); you may not use this file
except in compliance with the License. You may obtain a
copy of the License at the following location:
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
<description>
This is the main Spring configuration file with some of the main "core" classes defined. You shouldn't really
modify this unless you
know what you're doing!
</description>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
<description>
This is the main Spring configuration file with some of the main "core" classes defined. You shouldn't really
modify this unless you
know what you're doing!
</description>
<!--
Including this aspectj-autoproxy element will cause spring to automatically
create proxies around any beans defined in this file that match the pointcuts
of any aspects defined in this file.
-->
<aop:aspectj-autoproxy/>
<!--
Including this aspectj-autoproxy element will cause spring to automatically
create proxies around any beans defined in this file that match the pointcuts
of any aspects defined in this file.
-->
<aop:aspectj-autoproxy/>
<!--
Declare the TimingAspect that we want to weave into the other beans
defined in this config file.
-->
<bean id="timingAspect" class="org.perf4j.log4j.aop.TimingAspect"/>
<!--
Declare the TimingAspect that we want to weave into the other beans
defined in this config file.
-->
<bean id="timingAspect" class="org.perf4j.log4j.aop.TimingAspect"/>
<!-- Message source for this context, loaded from localized "messages_xx" files -->
<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource"
p:basename="messages"/>
<!--
Message source for this context, loaded from localized "messages_xx" files.]
<bean
id="servicesManager"
class="org.jasig.cas.services.DefaultServicesManagerImpl">
<constructor-arg index="0" ref="serviceRegistryDao"/>
</bean>
Disable the fallback mechanism to the system/JVM locale. By turning off this behavior, CAS
will be able to revert back to the default language bundle that is "messages.properties"
and will not rely on the JVM default locale which introduces the side effect of rendering
the UI in the JVM locale by default.
<!--
Job to periodically reload services from service registry.
This job is needed for a clustered CAS environment since service changes
in one CAS node are not known to the other until a reload.
-->
<bean id="serviceRegistryReloaderJobDetail"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"
p:targetObject-ref="servicesManager"
p:targetMethod="reload"/>
Also, explicitly set the default encoding to be UTF-8 when parsing message bundles.
The default, if not set, is none which forces ISO-8859-1 of java.util.ResourceBundle.
-->
<bean id="messageSource" class="org.jasig.cas.web.view.CasReloadableMessageBundle"
p:basenames-ref="basenames" p:fallbackToSystemLocale="false" p:defaultEncoding="UTF-8"
p:cacheSeconds="180" p:useCodeAsDefaultMessage="true" />
<bean id="periodicServiceRegistryReloaderTrigger" class="org.springframework.scheduling.quartz.SimpleTriggerBean"
p:jobDetail-ref="serviceRegistryReloaderJobDetail"
p:startDelay="120000"
p:repeatInterval="120000"/>
<util:list id="basenames">
<value>classpath:custom_messages</value>
<value>classpath:messages</value>
</util:list>
<bean id="persistentIdGenerator"
class="org.jasig.cas.authentication.principal.ShibbolethCompatiblePersistentIdGenerator"
p:salt="casrocks"/>
<bean id="servicesManager" class="org.jasig.cas.services.DefaultServicesManagerImpl"
c:serviceRegistryDao-ref="serviceRegistryDao" />
<!-- CentralAuthenticationService -->
<bean id="centralAuthenticationService" class="org.jasig.cas.CentralAuthenticationServiceImpl"
p:ticketGrantingTicketExpirationPolicy-ref="grantingTicketExpirationPolicy"
p:serviceTicketExpirationPolicy-ref="serviceTicketExpirationPolicy"
p:authenticationManager-ref="authenticationManager"
p:ticketGrantingTicketUniqueTicketIdGenerator-ref="ticketGrantingTicketUniqueIdGenerator"
p:ticketRegistry-ref="ticketRegistry"
p:servicesManager-ref="servicesManager"
p:persistentIdGenerator-ref="persistentIdGenerator"
p:uniqueTicketIdGeneratorsForService-ref="uniqueIdGeneratorsMap"/>
<!--
Job to periodically reload services from service registry.
This job is needed for a clustered CAS environment since service changes
in one CAS node are not known to the other until a reload.
-->
<bean id="serviceRegistryReloaderJobDetail"
class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"
p:targetObject-ref="servicesManager"
p:targetMethod="reload"/>
<bean id="proxy10Handler" class="org.jasig.cas.ticket.proxy.support.Cas10ProxyHandler"/>
<bean id="proxy20Handler" class="org.jasig.cas.ticket.proxy.support.Cas20ProxyHandler"
p:httpClient-ref="httpClient"
p:uniqueTicketIdGenerator-ref="proxy20TicketUniqueIdGenerator"/>
<!-- ADVISORS -->
<bean id="advisorAutoProxyCreator"
class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
<bean id="validationAnnotationBeanPostProcessor" class="org.jasig.cas.util.CustomBeanValidationPostProcessor" />
<!-- The scheduler bean wires up any triggers that define scheduled tasks -->
<bean id="scheduler" class="org.jasig.cas.util.AutowiringSchedulerFactoryBean"/>
<!-- Customizations -->
<bean id="periodicServiceRegistryReloaderTrigger" class="org.springframework.scheduling.quartz.SimpleTriggerBean"
p:jobDetail-ref="serviceRegistryReloaderJobDetail"
p:startDelay="${service.registry.quartz.reloader.startDelay:120000}"
p:repeatInterval="${service.registry.quartz.reloader.repeatInterval:120000}"/>
<!-- Make requests synchronous. This ensures that Single Logout has completed before the Logout page renders. -->
<bean id="httpClient" class="org.jasig.cas.util.HttpClient"
p:readTimeout="5000"
p:connectionTimeout="5000">
<property name="executorService">
<bean class="org.springframework.core.task.support.ExecutorServiceAdapter">
<constructor-arg>
<bean class="org.springframework.core.task.SyncTaskExecutor"/>
</constructor-arg>
</bean>
</property>
</bean>
<bean id="noRedirectHttpClient" class="org.jasig.cas.util.SimpleHttpClient" parent="httpClient"
p:followRedirects="false" />
<bean id="persistentIdGenerator"
class="org.jasig.cas.authentication.principal.ShibbolethCompatiblePersistentIdGenerator"
p:salt="casrocks"/>
<bean id="logoutManager" class="org.jasig.cas.logout.LogoutManagerImpl"
c:servicesManager-ref="servicesManager"
c:httpClient-ref="noRedirectHttpClient"
c:logoutMessageBuilder-ref="logoutBuilder"
p:disableSingleSignOut="${slo.callbacks.disabled:false}" />
<bean id="logoutBuilder" class="org.jasig.cas.logout.SamlCompliantLogoutMessageCreator" />
<!-- CentralAuthenticationService -->
<bean id="centralAuthenticationService" class="org.jasig.cas.CentralAuthenticationServiceImpl">
<constructor-arg index="0" ref="ticketRegistry"/>
<constructor-arg index="1">
<null />
</constructor-arg>
<constructor-arg index="2" ref="authenticationManager"/>
<constructor-arg index="3" ref="ticketGrantingTicketUniqueIdGenerator"/>
<constructor-arg index="4" ref="uniqueIdGeneratorsMap"/>
<constructor-arg index="5" ref="grantingTicketExpirationPolicy"/>
<constructor-arg index="6" ref="serviceTicketExpirationPolicy"/>
<constructor-arg index="7" ref="servicesManager"/>
<constructor-arg index="8" ref="logoutManager"/>
<property name="persistentIdGenerator" ref="persistentIdGenerator"/>
</bean>
<bean id="proxy10Handler" class="org.jasig.cas.ticket.proxy.support.Cas10ProxyHandler"/>
<bean id="proxy20Handler" class="org.jasig.cas.ticket.proxy.support.Cas20ProxyHandler"
p:httpClient-ref="httpClient"
p:uniqueTicketIdGenerator-ref="proxy20TicketUniqueIdGenerator"/>
<!-- ADVISORS -->
<bean id="advisorAutoProxyCreator"
class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
<bean id="validationAnnotationBeanPostProcessor" class="org.jasig.cas.util.CustomBeanValidationPostProcessor"
p:afterInitialization="true" />
<!-- The scheduler bean wires up any triggers that define scheduled tasks -->
<bean id="scheduler" class="org.jasig.cas.util.AutowiringSchedulerFactoryBean"/>
<bean id="httpClient" class="org.jasig.cas.util.SimpleHttpClient"
p:readTimeout="5000"
p:connectionTimeout="5000">
<property name="executorService">
<bean class="org.springframework.core.task.support.ExecutorServiceAdapter">
<constructor-arg>
<bean class="org.springframework.core.task.SyncTaskExecutor"/>
</constructor-arg>
</bean>
</property>
</bean>
</beans>

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

@ -20,6 +20,6 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
}

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -180,7 +180,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -53,49 +53,49 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -108,7 +108,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.6.5</version>
<version>2.9.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -132,13 +132,13 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -162,7 +162,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -180,7 +180,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -192,7 +192,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -204,7 +204,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -234,7 +234,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -4,7 +4,7 @@ dependencies {
"org.springframework.data:spring-data-jpa:$springDataJpaVersion",
"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",
"org.hsqldb:hsqldb:$hsqlVersion",
"javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final"
}

12
samples/data-jc/pom.xml
View File

@ -64,13 +64,13 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.2.8</version>
<version>2.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>1.7.0.RC1</version>
<version>1.7.1.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -88,14 +88,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -119,13 +119,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -52,39 +52,39 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.6.5</version>
<version>2.9.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -96,13 +96,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -126,19 +126,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -20,7 +20,7 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
integrationTestCompile gebDependencies

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -174,7 +174,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -186,7 +186,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -198,7 +198,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -228,7 +228,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

22
samples/gae-xml/pom.xml
View File

@ -59,7 +59,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -77,37 +77,37 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -120,13 +120,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -144,7 +144,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -186,7 +186,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -21,6 +21,6 @@ dependencies {
"com.fasterxml.jackson.core:jackson-databind:2.2.1"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
}

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

@ -65,25 +65,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -113,19 +113,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -144,7 +144,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -162,7 +162,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -186,7 +186,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -20,7 +20,7 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
testCompile project(":spring-security-test")

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -186,7 +186,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -53,7 +53,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -71,7 +71,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -90,7 +90,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -108,7 +108,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -132,7 +132,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -162,7 +162,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

71
samples/helloworld-xml/pom.xml
View File

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-helloworld-jc</artifactId>
<artifactId>spring-security-samples-helloworld-xml</artifactId>
<version>4.0.0.CI-SNAPSHOT</version>
<packaging>war</packaging>
<name>spring-security-samples-helloworld-jc</name>
<description>spring-security-samples-helloworld-jc</description>
<name>spring-security-samples-helloworld-xml</name>
<description>spring-security-samples-helloworld-xml</description>
<url>http://spring.io/spring-security</url>
<organization>
<name>spring.io</name>
@ -32,24 +31,6 @@
<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
<url>https://github.com/spring-projects/spring-security</url>
</scm>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spring-snasphot</id>
@ -72,7 +53,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -87,22 +68,10 @@
<version>4.0.0.CI-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.0.RC2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -121,7 +90,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -139,7 +108,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -151,7 +120,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -163,7 +132,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -193,11 +162,29 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.0.RC2</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<m2eclipse.wtp.contextRoot>/sample</m2eclipse.wtp.contextRoot>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
</project>

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

@ -20,7 +20,7 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
testCompile project(":spring-security-test")

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -186,7 +186,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

14
samples/insecure/pom.xml
View File

@ -53,13 +53,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -78,7 +78,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -96,7 +96,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -108,7 +108,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

2
samples/insecuremvc/build.gradle
View File

@ -17,6 +17,6 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
}

20
samples/insecuremvc/pom.xml
View File

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -89,19 +89,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -162,7 +162,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -47,25 +47,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -78,7 +78,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -96,7 +96,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -150,7 +150,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -162,7 +162,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -192,7 +192,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -20,7 +20,7 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
integrationTestCompile gebDependencies

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -174,7 +174,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -186,7 +186,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -198,7 +198,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -228,7 +228,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -22,7 +22,7 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
integrationTestCompile gebDependencies

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

@ -95,25 +95,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -149,19 +149,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -180,7 +180,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -198,7 +198,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -216,7 +216,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -228,7 +228,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -240,7 +240,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -270,7 +270,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

14
samples/ldap-xml/pom.xml
View File

@ -59,14 +59,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -108,7 +108,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -144,7 +144,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>org.gebish</groupId>
<artifactId>geb-spock</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -168,7 +168,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-htmlunit-driver</artifactId>
<version>2.33.0</version>
<version>2.44.0</version>
<scope>test</scope>
</dependency>
<dependency>
@ -198,7 +198,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -7,7 +7,7 @@ dependencies {
compile project(":spring-security-web"),
project(":spring-security-config"),
"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
"org.hsqldb:hsqldb:2.2.8",
"org.hsqldb:hsqldb:$hsqlVersion",
"javax.validation:validation-api:1.0.0.GA",
"org.hibernate:hibernate-validator:4.2.0.Final",
"org.springframework:spring-webmvc:$springVersion",

30
samples/messages-jc/pom.xml
View File

@ -70,13 +70,13 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.2.8</version>
<version>2.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>1.7.0.RC1</version>
<version>1.7.1.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -100,55 +100,55 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -166,7 +166,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -179,7 +179,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -203,13 +203,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -21,7 +21,7 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30',
"net.sourceforge.nekohtml:nekohtml:1.9.10"
}

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -113,19 +113,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -144,7 +144,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -168,7 +168,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -192,7 +192,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -53,7 +53,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -66,7 +66,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -84,7 +84,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -120,7 +120,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -20,6 +20,6 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
}

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -180,7 +180,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -41,20 +41,20 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -90,7 +90,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -20,6 +20,6 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
}

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -180,7 +180,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -59,31 +59,31 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -96,7 +96,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -108,7 +108,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -126,7 +126,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -41,7 +41,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -53,25 +53,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -84,13 +84,13 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -108,7 +108,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

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

@ -21,6 +21,6 @@ dependencies {
"org.hibernate:hibernate-validator:4.2.0.Final"
runtime "opensymphony:sitemesh:2.4.2",
'cglib:cglib-nodep:2.2.2',
"cglib:cglib-nodep:$cglibVersion",
'ch.qos.logback:logback-classic:0.9.30'
}

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

@ -59,25 +59,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -107,19 +107,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -138,7 +138,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2.2</version>
<version>3.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
@ -156,7 +156,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -180,7 +180,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

2
sandbox/heavyduty/build.gradle
View File

@ -37,7 +37,7 @@ dependencies {
'org.apache.directory.server:apacheds-core:1.5.5',
'org.apache.directory.server:apacheds-server-jndi:1.5.5',
'org.freemarker:freemarker:2.3.16',
"org.hsqldb:hsqldb:1.8.0.10",
"org.hsqldb:hsqldb:$hsqlVersion",
'org.slf4j:slf4j-log4j12:1.5.11',
'log4j:log4j:1.2.14'
}

22
taglibs/pom.xml
View File

@ -58,25 +58,25 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -88,19 +88,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -119,7 +119,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -137,7 +137,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -155,7 +155,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
@ -185,7 +185,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

24
test/pom.xml
View File

@ -52,7 +52,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -64,13 +64,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -90,7 +90,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -114,7 +114,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -126,43 +126,43 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-support</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-common</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>

40
web/pom.xml
View File

@ -52,19 +52,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@ -76,40 +76,40 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<version>1.2</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@ -122,7 +122,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.29</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -140,7 +140,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.0.5</version>
<version>2.3.8</version>
<scope>test</scope>
</dependency>
<dependency>
@ -152,7 +152,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -164,7 +164,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -176,37 +176,37 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-support</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-common</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-reflect</artifactId>
<version>1.5.1</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>1.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
@ -236,7 +236,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.1.1.BUILD-SNAPSHOT</version>
<version>4.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>