Version bumps for Spring 5

Issue gh-4080

build.gradle

@@ -27,8 +27,8 @@ allprojects {
 
 	ext.releaseBuild = version.endsWith('RELEASE')
 	ext.snapshotBuild = version.endsWith('SNAPSHOT')
-	ext.springVersion = '4.3.2.RELEASE'
-	ext.springLdapVersion = '2.0.2.RELEASE'
+	ext.springVersion = '4.3.3.RELEASE'
+	ext.springLdapVersion = '2.2.0.RC1'
 
 	group = 'org.springframework.security'
 

config/config.gradle

@@ -39,8 +39,8 @@ dependencies {
 				"org.springframework:spring-orm:$springVersion",
 				"org.springframework:spring-tx:$springVersion",
 				"org.slf4j:jcl-over-slf4j:$slf4jVersion",
-				"org.eclipse.persistence:javax.persistence:2.0.5",
-				"org.hibernate:hibernate-entitymanager:4.1.0.Final",
+				"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
+				"org.hibernate:hibernate-entitymanager:$hibernateVersion",
 				"org.codehaus.groovy:groovy-all:$groovyVersion",
 				"org.apache.directory.server:apacheds-core:$apacheDsVersion",
 				"org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
@@ -50,7 +50,6 @@ dependencies {
 				'org.apache.directory.shared:shared-ldap:0.9.15',
 				'ldapsdk:ldapsdk:4.1',
 				powerMockDependencies,
-				 "org.hibernate:hibernate-entitymanager:3.6.10.Final",
 				"org.hsqldb:hsqldb:$hsqlVersion",
 				spockDependencies
 

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

@@ -40,7 +40,7 @@ public class SpringSecurityCoreVersion {
 	 */
 	public static final long SERIAL_VERSION_UID = 420L;
 
-	static final String MIN_SPRING_VERSION = "4.3.2.RELEASE";
+	static final String MIN_SPRING_VERSION = "4.3.3.RELEASE";
 
 	static {
 		performVersionChecks();

gradle/javaprojects.gradle

@@ -19,14 +19,17 @@ ext.ehcacheVersion = '2.9.0'
 ext.gebVersion = '0.10.0'
 ext.groovyVersion = '2.4.4'
 ext.hsqlVersion = '2.3.2'
-ext.jacksonDatavindVersion = '2.4.4'
+ext.hibernateVersion = '5.0.11.Final'
+ext.hibernateValidatorVersion = '5.2.4.Final'
+ext.jacksonDatavindVersion = '2.8.3'
+ext.javaPersistenceVersion = '2.1.1'
 ext.jettyVersion = '6.1.26'
 ext.jstlVersion = '1.2.1'
 ext.junitVersion = '4.12'
 ext.logbackVersion = '1.1.2'
 ext.powerMockVersion = '1.6.2'
 ext.seleniumVersion = '2.44.0'
-ext.servletApiVersion = '3.0.1'
+ext.servletApiVersion = '3.1.0'
 ext.slf4jVersion = '1.7.7'
 ext.spockVersion = '0.7-groovy-2.0'
 ext.springDataCommonsVersion = '1.12.2.RELEASE'
@@ -36,6 +39,7 @@ ext.springSessionVersion = '1.2.1.RELEASE'
 ext.springBootVersion = '1.4.0.RELEASE'
 ext.thymeleafVersion = '2.1.5.RELEASE'
 ext.jsonassertVersion = '1.3.0'
+ext.validationApiVersion = '1.1.0.Final'
 
 ext.spockDependencies = [
 	dependencies.create("org.spockframework:spock-spring:$spockVersion") {

itest/web/itest-web.gradle

@@ -13,7 +13,6 @@ dependencies {
 				"org.mortbay.jetty:jetty-util:$jettyVersion",
 				"org.testng:testng:6.8.21"
 	testCompile ("org.mortbay.jetty:jetty:$jettyVersion") {
-		exclude group: 'org.mortbay.jetty', module: 'servlet-api'
 	}
 	testCompile ('net.sourceforge.jwebunit:jwebunit-core:2.2') {
 		exclude group: 'javax.servlet', module: 'servlet-api'

samples/javaconfig/chat/build.gradle

@@ -14,8 +14,8 @@ dependencies {
 			"org.springframework.data:spring-data-redis:${springDataRedisVersion}",
 			"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
 			"org.hsqldb:hsqldb:$hsqlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final",
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateVersion",
 			"redis.clients:jedis:2.4.2",
 			"com.github.kstyrc:embedded-redis:0.6",
 			"org.apache.commons:commons-pool2:2.2",
@@ -24,7 +24,7 @@ dependencies {
 			"org.slf4j:slf4j-api:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
 			"com.fasterxml.jackson.core:jackson-databind:$jacksonDatavindVersion"
-	compile('org.hibernate:hibernate-entitymanager:3.6.10.Final') {
+	compile("org.hibernate:hibernate-entitymanager:$hibernateVersion") {
 		exclude group:'javassist', module: 'javassist'
 	}
 	compile("org.springframework.data:spring-data-jpa:$springDataJpaVersion") {

samples/javaconfig/concurrency/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/data/build.gradle

@@ -2,9 +2,9 @@ dependencies {
 	compile project(':spring-security-data'),
 			project(':spring-security-config'),
 			"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.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
+			"org.hibernate:hibernate-entitymanager:$hibernateVersion",
 			"org.hsqldb:hsqldb:$hsqlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 }

samples/javaconfig/form/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/hellojs/build.gradle

@@ -16,9 +16,9 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final",
-			"com.fasterxml.jackson.core:jackson-databind:2.2.1"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
+			"com.fasterxml.jackson.core:jackson-databind:$jacksonDatavindVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/hellomvc/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/inmemory/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/jdbc/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/ldap/build.gradle

@@ -18,8 +18,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/messages/build.gradle

@@ -8,8 +8,8 @@ dependencies {
 			project(":spring-security-config"),
 			"org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final",
 			"org.hsqldb:hsqldb:$hsqlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final",
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
 			"org.springframework:spring-webmvc:$springVersion",
 			"org.springframework:spring-orm:$springVersion",
 			"org.springframework:spring-context:$springVersion",

samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/Message.java

@@ -27,7 +27,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 @Entity
 public class Message {
 	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
 	@NotEmpty(message = "Message is required.")

samples/javaconfig/openid/build.gradle

@@ -17,8 +17,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/preauth/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/rememberme/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/javaconfig/x509/build.gradle

@@ -17,8 +17,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

samples/xml/insecuremvc/build.gradle

@@ -13,8 +13,8 @@ dependencies {
 			"org.slf4j:jul-to-slf4j:$slf4jVersion",
 			"org.slf4j:jcl-over-slf4j:$slf4jVersion",
 			"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-			"javax.validation:validation-api:1.0.0.GA",
-			"org.hibernate:hibernate-validator:4.2.0.Final"
+			"javax.validation:validation-api:$validationApiVersion",
+			"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
 
 	runtime "opensymphony:sitemesh:2.4.2",
 			"cglib:cglib-nodep:$cglibVersion",

sandbox/heavyduty/build.gradle

@@ -23,7 +23,7 @@ dependencies {
 			"org.springframework:spring-webmvc:$springVersion",
 			'org.aspectj:aspectjrt:1.6.8',
 			'org.hibernate:ejb3-persistence:1.0.2.GA',
-			'javax.persistence:persistence-api:1.0',
+			"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
 			'org.slf4j:jcl-over-slf4j:1.5.11'
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"

web/src/main/java/org/springframework/security/web/util/OnCommittedResponseWrapper.java

@@ -20,6 +20,7 @@ import java.io.PrintWriter;
 import java.util.Locale;
 
 import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
@@ -638,6 +639,14 @@ public abstract class OnCommittedResponseWrapper extends HttpServletResponseWrap
 			this.delegate.write(b, off, len);
 		}
 
+		public boolean isReady() {
+			return this.delegate.isReady();
+		}
+
+		public void setWriteListener(WriteListener writeListener) {
+			this.delegate.setWriteListener(writeListener);
+		}
+
 		@Override
 		public String toString() {
 			return getClass().getName() + "[delegate=" + this.delegate.toString() + "]";