From ae6efce58de59732137ca00f517c09189fc744bd Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Thu, 14 Jul 2022 16:12:23 +0100
Subject: [PATCH] Update to Spring Framework 6.0.0-M5, Hibernate 5.6.10,
 Jakarta JSTL 2.0

---
 build.gradle                         | 14 ++++++++++----
 settings.gradle                      |  3 ++-
 spring-webflow/spring-webflow.gradle | 12 +++++-------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 216be407..945212fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,28 +30,30 @@ allprojects {
 
 	dependencyManagement {
 		imports {
-			mavenBom "org.springframework:spring-framework-bom:6.0.0-M4"
+			mavenBom "org.springframework:spring-framework-bom:6.0.0-M5"
 			mavenBom "org.springframework.security:spring-security-bom:5.5.6"
 			mavenBom "org.junit:junit-bom:5.7.1"
 		}
 		dependencies {
 			dependency "jakarta.servlet:jakarta.servlet-api:5.0.0"
-			dependency "javax.servlet:jstl:1.2"
+			dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0"
 			dependency "jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0"
 			dependency "jakarta.el:jakarta.el-api:4.0.0"
 			dependency "jakarta.validation:jakarta.validation-api:3.0.0"
-			dependencySet(group: 'org.hibernate', version: '5.6.6.Final') {
+			dependencySet(group: 'org.hibernate', version: '5.6.10.Final') {
 				entry 'hibernate-core-jakarta'
 				entry 'hibernate-entitymanager'
 			}
 			dependency "org.hibernate:hibernate-validator:7.0.4.Final"
+
+			/*
 			dependencySet(group: 'com.sun.faces', version: '2.2.20') {
 				entry 'jsf-api'
 				entry 'jsf-impl'
 			}
 			dependency "org.apache.myfaces.core:myfaces-impl:3.0.1"
 			dependency "com.sun.facelets:jsf-facelets:1.1.14"
-			dependency "org.hsqldb:hsqldb:2.5.0"
+			*/
 
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.0') {
 				entry 'log4j-api'
@@ -65,7 +67,11 @@ allprojects {
 			dependency "org.easymock:easymock:4.2"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.apache.tomcat:tomcat-jasper-el:10.0.20"
+			dependency "org.hsqldb:hsqldb:2.5.0"
+
+			/*
 			dependency "org.apache.myfaces.test:myfaces-test22:1.0.8"
+			*/
 		}
 		generatedPomCustomization {
 			enabled = false
diff --git a/settings.gradle b/settings.gradle
index e53a469a..444820eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,9 +9,10 @@ rootProject.name = 'webflow'
 
 include 'spring-binding'
 include 'spring-webflow'
-//include 'spring-faces'
 include 'spring-js-resources'
 
+// include 'spring-faces'
+
 rootProject.children.each {project ->
 	project.buildFileName = "${project.name}.gradle"
 }
diff --git a/spring-webflow/spring-webflow.gradle b/spring-webflow/spring-webflow.gradle
index 1b2054d9..b80baeda 100644
--- a/spring-webflow/spring-webflow.gradle
+++ b/spring-webflow/spring-webflow.gradle
@@ -25,7 +25,7 @@ dependencies {
 	testImplementation("org.hibernate:hibernate-validator")
 	testImplementation("org.hsqldb:hsqldb")
 	testImplementation("jakarta.servlet.jsp:jakarta.servlet.jsp-api")
-	testImplementation("javax.servlet:jstl")
+	testImplementation("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api")
 	testImplementation("jakarta.servlet:jakarta.servlet-api")
 	testImplementation("jakarta.validation:jakarta.validation-api")
 	testRuntimeOnly("org.apache.logging.log4j:log4j-core")
@@ -33,12 +33,10 @@ dependencies {
 	testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
 
 	//
-	// To use Hibernate 5 in the context of the Jakarta EE 9 namespace,
-	// we need to use hibernate-core-jakarta instead of hibernate-core.
-	// Unfortunately the hibernate-entitymanager module directly
-	// references hibernate-core and we don't want both versions
-	// in the classpath. To avoid this, explicitly exclude the
-	// plain hibernate-core module in all configurations.
+	// We need hibernate-core-jakarta instead of hibernate-core for Jakarta EE,
+	// but hibernate-entitymanager module depends on hibernate-core and we
+	// don't want both on the classpath, so we explicitly exclude hibernate-core
+	// in all configurations.
 	//
 	// This wrinkle will probably go away again in Hibernate 6.
 	//