Browse Source

update to spring snapshot dependencies

pull/16/head
Rob Winch 13 years ago
parent
commit
ea6b444770
  1. 1
      acl/acl.gradle
  2. 2
      build.gradle
  3. 2
      core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
  4. 2
      gradle/javaprojects.gradle
  5. 6
      gradle/maven-deployment.gradle
  6. 3
      web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java

1
acl/acl.gradle

@ -5,6 +5,7 @@ dependencies { @@ -5,6 +5,7 @@ dependencies {
'aopalliance:aopalliance:1.0',
"net.sf.ehcache:ehcache:$ehcacheVersion",
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-tx:$springVersion",
"org.springframework:spring-jdbc:$springVersion"

2
build.gradle

@ -9,7 +9,7 @@ allprojects { @@ -9,7 +9,7 @@ allprojects {
group = 'org.springframework.security'
repositories {
mavenCentral()
maven { url "http://repo.springsource.org/libs-snapshot" }
}
}

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

@ -22,7 +22,7 @@ public class SpringSecurityCoreVersion { @@ -22,7 +22,7 @@ public class SpringSecurityCoreVersion {
static final String SPRING_MAJOR_VERSION = "3";
static final String MIN_SPRING_VERSION = "3.0.7.RELEASE";
static final String MIN_SPRING_VERSION = "3.2.0.BUILD-SNAPSHOT";
static {
// Check Spring Compatibility

2
gradle/javaprojects.gradle

@ -4,7 +4,7 @@ apply plugin: 'eclipse' @@ -4,7 +4,7 @@ apply plugin: 'eclipse'
sourceCompatibility = 1.5
targetCompatibility = 1.5
ext.springVersion = '3.0.7.RELEASE'
ext.springVersion = '3.2.0.BUILD-SNAPSHOT'
ext.springLdapVersion = '1.3.1.RELEASE'
ext.ehcacheVersion = '1.6.2'
ext.aspectjVersion = '1.6.10'

6
gradle/maven-deployment.gradle

@ -85,6 +85,12 @@ def customizePom(pom, gradleProject) { @@ -85,6 +85,12 @@ def customizePom(pom, gradleProject) {
email = 'rwinch@vmware.com'
}
}
repositories {
repository {
id 'spring-snapshot'
url 'http://repo.springsource.org/libs-snapshot'
}
}
dependencies {
dependency {
artifactId = groupId = 'commons-logging'

3
web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java

@ -35,6 +35,7 @@ import javax.security.auth.login.AppConfigurationEntry; @@ -35,6 +35,7 @@ import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@ -191,7 +192,7 @@ public class JaasApiIntegrationFilterTests { @@ -191,7 +192,7 @@ public class JaasApiIntegrationFilterTests {
private void assertJaasSubjectEquals(final Subject expectedValue) throws Exception {
MockFilterChain chain = new MockFilterChain() {
public void doFilter(ServletRequest request, ServletResponse response) {
public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
// See if the subject was updated
Subject currentSubject = Subject.getSubject(AccessController.getContext());
assertEquals(expectedValue, currentSubject);

Loading…
Cancel
Save