INT-2281 upgrading to Spring Security 3.1.0

This commit is contained in:
Mark Fisher
2011-12-09 09:13:21 -05:00
parent 71d64da0cb
commit ada2a08678
3 changed files with 28 additions and 28 deletions

View File

@@ -127,7 +127,7 @@ configure(javaprojects) {
springDataMongoVersion = '1.0.0.RC1'
springDataRedisVersion = '1.0.0.RC1'
springGemfireVersion = '1.1.0.M3'
springSecurityVersion = '3.0.6.RELEASE'
springSecurityVersion = '3.1.0.RELEASE'
springWsVersion = '2.0.3.RELEASE'
sourceSets {
@@ -465,7 +465,7 @@ project('spring-integration-twitter') {
compile project(":spring-integration-core")
compile "org.springframework:spring-context-support:$springVersion"
compile "org.springframework.social:spring-social-twitter:1.0.0.RELEASE"
compile "org.springframework.security:spring-security-crypto:3.1.0.RC3"
compile "org.springframework.security:spring-security-crypto:3.1.0.RELEASE"
compile("javax.activation:activation:$javaxActivationVersion") { optional = true }
testCompile project(":spring-integration-test")
}

View File

@@ -89,15 +89,15 @@
</repositories>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>3.0.6.RELEASE</version>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
<version>3.1.0.RC3</version>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>3.0.6.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -106,6 +106,12 @@
<version>3.0.6.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
<version>3.1.0.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
@@ -124,18 +130,18 @@
<version>1.0.0.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
@@ -155,12 +161,6 @@
<version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>

View File

@@ -184,9 +184,9 @@
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<artifactId>spring-integration-core</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>test</scope>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -207,18 +207,18 @@
<version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>2.1.0.BUILD-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>