From b4ab0483b1b22fe725e4d60728a940de94e46bc1 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Thu, 7 Jul 2016 12:56:20 -0500
Subject: [PATCH] Update version to 4.2.0.BUILD-SNAPSHOT

---
 .../security/core/SpringSecurityCoreVersion.java       | 10 +++++-----
 gradle.properties                                      |  2 +-
 taglibs/src/main/resources/META-INF/security.tld       |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

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 2b47de931c..68a502a6bc 100644
--- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
+++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
@@ -27,8 +27,8 @@ import org.springframework.core.SpringVersion;
  * @author Rob Winch
  */
 public class SpringSecurityCoreVersion {
-	private static final String DISABLE_CHECKS = SpringSecurityCoreVersion.class
-			.getName().concat(".DISABLE_CHECKS");
+	private static final String DISABLE_CHECKS = SpringSecurityCoreVersion.class.getName()
+			.concat(".DISABLE_CHECKS");
 
 	private static final Log logger = LogFactory.getLog(SpringSecurityCoreVersion.class);
 
@@ -38,7 +38,7 @@ public class SpringSecurityCoreVersion {
 	 * N.B. Classes are not intended to be serializable between different versions. See
 	 * SEC-1709 for why we still need a serial version.
 	 */
-	public static final long SERIAL_VERSION_UID = 410L;
+	public static final long SERIAL_VERSION_UID = 420L;
 
 	static final String MIN_SPRING_VERSION = "4.3.1.RELEASE";
 
@@ -73,8 +73,8 @@ public class SpringSecurityCoreVersion {
 		}
 
 		logger.info("You are running with Spring Security Core " + version);
-		if (new ComparableVersion(springVersion).compareTo(new ComparableVersion(
-				minSpringVersion)) < 0) {
+		if (new ComparableVersion(springVersion)
+				.compareTo(new ComparableVersion(minSpringVersion)) < 0) {
 			logger.warn("**** You are advised to use Spring " + minSpringVersion
 					+ " or later with this version. You are running: " + springVersion);
 		}
diff --git a/gradle.properties b/gradle.properties
index 651c3c1a63..31ed731133 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=4.1.2.BUILD-SNAPSHOT
+version=4.2.0.BUILD-SNAPSHOT
diff --git a/taglibs/src/main/resources/META-INF/security.tld b/taglibs/src/main/resources/META-INF/security.tld
index a883fb5a45..d6cc0b7339 100644
--- a/taglibs/src/main/resources/META-INF/security.tld
+++ b/taglibs/src/main/resources/META-INF/security.tld
@@ -20,7 +20,7 @@
         version="2.0">
     <description>Spring Security Authorization Tag Library</description>
 
-    <tlib-version>4.1</tlib-version>
+    <tlib-version>4.2</tlib-version>
     <short-name>security</short-name>
     <uri>http://www.springframework.org/security/tags</uri>