From 843ed3e437d9ab121229632c46b016edc17d4f0e Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 30 Jun 2016 16:35:38 -0500 Subject: [PATCH] Update to Spring 4.3.1.BUILD-SNAPSHOT --- build.gradle | 2 +- .../security/core/SpringSecurityCoreVersion.java | 3 ++- gradle/boot-sample.gradle | 8 ++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 214a55baf0..4771868ca6 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { ext.releaseBuild = version.endsWith('RELEASE') ext.snapshotBuild = version.endsWith('SNAPSHOT') - ext.springVersion = '4.2.5.RELEASE' + ext.springVersion = '4.3.1.BUILD-SNAPSHOT' ext.springLdapVersion = '2.0.2.RELEASE' group = 'org.springframework.security' diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java index 413af7ab3e..0c14d0574f 100644 --- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java +++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java @@ -17,6 +17,7 @@ package org.springframework.security.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.core.SpringVersion; /** @@ -39,7 +40,7 @@ public class SpringSecurityCoreVersion { */ public static final long SERIAL_VERSION_UID = 410L; - static final String MIN_SPRING_VERSION = "4.2.5.RELEASE"; + static final String MIN_SPRING_VERSION = "4.3.1.BUILD-SNAPSHOT"; static { performVersionChecks(); diff --git a/gradle/boot-sample.gradle b/gradle/boot-sample.gradle index b87b8d99a0..8357b5443a 100644 --- a/gradle/boot-sample.gradle +++ b/gradle/boot-sample.gradle @@ -2,4 +2,12 @@ apply plugin: 'spring-boot' sonarqube { skipProject = true +} + +configurations.all { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'org.springframework') { + details.useVersion springVersion + } + } } \ No newline at end of file