From 0dc8b52c72696ade87c59c1f79c6c107fae9fb53 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Thu, 16 Jun 2016 16:25:12 -0400
Subject: [PATCH] Update minor versions of dependencies

Spring Framework 4.2.x -> 4.3.0
Spring Security  4.0.x -> 4.1.0
Hibernate        4.2.x -> 4.3.11
---
 build.gradle                                          | 11 ++++++-----
 .../org/springframework/webflow/persistence/orm.xml   | 11 +++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 45c244f7..4123b102 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,13 +75,13 @@ configure(subprojects.findAll {
 	}
 
 	subproject.ext {
-		springVersion = "4.2.6.RELEASE"
-		springSecurityVersion = "4.0.4.RELEASE"
+		springVersion = "4.3.0.RELEASE"
+		springSecurityVersion = "4.1.0.RELEASE"
 		slf4jVersion = "1.7.21"
 		log4jVersion = "1.2.17"
 		tiles2Version = "2.2.2"
 		tiles3Version = "3.0.5"
-		hibernate4Version = "4.2.21.Final"
+		hibernate4Version = "4.3.11.Final"
 
 	}
 
@@ -251,7 +251,6 @@ project("spring-webflow") {
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		provided("javax.portlet:portlet-api:2.0")
 		provided("junit:junit:3.8.2")
-		provided("org.eclipse.persistence:javax.persistence:2.0.5")
 		optional("org.hibernate:hibernate-core:$hibernate4Version") {
 			exclude group: "org.slf4j", module: "slf4j-api"
 		}
@@ -261,7 +260,9 @@ project("spring-webflow") {
 		optional("org.springframework:spring-tx:$springVersion")
 		optional("org.springframework:spring-webmvc-portlet:$springVersion")
 		testCompile("javax.validation:validation-api:1.0.0.GA")
-		testCompile("org.hibernate:hibernate-entitymanager:$hibernate4Version")
+		testCompile("org.hibernate:hibernate-entitymanager:$hibernate4Version") {
+			exclude group: "org.slf4j", module: "slf4j-api"
+		}
 		testCompile("org.hibernate:hibernate-validator:4.3.2.Final")
 		testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.69")
 		testCompile("org.hsqldb:hsqldb:2.3.1")
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml
index d563bd10..342b800b 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/orm.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-	version="1.0">
-	
+<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
+		version="2.1">
+
 	<package>org.springframework.webflow.persistence</package>
-	
 
 	<entity class="TestBean">
 		<table name="T_BEAN" />