Adopt Spring Framework 6 and Jakarta EE 9

To avoid any complications with functional changes between Hibernate 5
and Hibernate 6, this uses the hibernate-core-jakarta v5 module rather
than hibernate-core v6. This requires a specific dependency exclusion
in spring-webflow.gradle to make sure that hibernate-entitymanager
never causes both versions to be loaded. This can be simplified after
eventual adoption of Hibernate 6.

The Spring snapshot repository needs to be referenced in build.gradle
for this early stage work on SWF 3.

spring-binding/src/main/java/org/springframework/binding/expression/el/BindingValueExpression.java

@@ -1,9 +1,9 @@
 package org.springframework.binding.expression.el;
 
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
 
 import org.springframework.binding.convert.ConversionException;
 import org.springframework.binding.convert.ConversionService;

spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContext.java

@@ -15,10 +15,10 @@
  */
 package org.springframework.binding.expression.el;
 
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.FunctionMapper;
+import jakarta.el.VariableMapper;
 
 /**
  * A generic ELContext implementation.

spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java

@@ -17,14 +17,14 @@ package org.springframework.binding.expression.el;
 
 import java.util.List;
 
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.ResourceBundleELResolver;
+import jakarta.el.ArrayELResolver;
+import jakarta.el.BeanELResolver;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.ListELResolver;
+import jakarta.el.MapELResolver;
+import jakarta.el.ResourceBundleELResolver;
 
 /**
  * A generic ELResolver to be used as a default when no other ELResolvers have been configured by the client

spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultElContextFactory.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.binding.expression.el;
 
-import javax.el.ELContext;
+import jakarta.el.ELContext;
 
 /**
  * A factory for a DefaultELContext.

spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.binding.expression.el;
 
-import javax.el.ELContext;
-import javax.el.ELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
 
 /**
  * A factory for creating a EL context object that will be used to evaluate a target object of an EL expression.

spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.binding.expression.el;
 
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ValueExpression;
 
 import org.springframework.binding.expression.EvaluationException;
 import org.springframework.binding.expression.Expression;
@@ -63,7 +63,7 @@ public class ELExpression implements Expression {
 				}
 			}
 			return result;
-		} catch (javax.el.PropertyNotFoundException e) {
+		} catch (jakarta.el.PropertyNotFoundException e) {
 			throw new PropertyNotFoundException(context.getClass(), getExpressionString(), e);
 		} catch (ELException e) {
 			throw new EvaluationException(context.getClass(), getExpressionString(),
@@ -81,7 +81,7 @@ public class ELExpression implements Expression {
 						+ getExpressionString() + "' did not resolve... is the base variable ''" + getBaseVariable()
 						+ "' spelled correctly?");
 			}
-		} catch (javax.el.PropertyNotFoundException e) {
+		} catch (jakarta.el.PropertyNotFoundException e) {
 			throw new PropertyNotFoundException(context.getClass(), getExpressionString(), e);
 		} catch (ELException e) {
 			throw new EvaluationException(context.getClass(), getExpressionString(),
@@ -94,7 +94,7 @@ public class ELExpression implements Expression {
 		ELContext ctx = elContextFactory.getELContext(context);
 		try {
 			return valueExpression.getType(ctx);
-		} catch (javax.el.PropertyNotFoundException e) {
+		} catch (jakarta.el.PropertyNotFoundException e) {
 			throw new PropertyNotFoundException(context.getClass(), getExpressionString(), e);
 		} catch (ELException e) {
 			throw new EvaluationException(context.getClass(), getExpressionString(),

spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java

@@ -18,13 +18,13 @@ package org.springframework.binding.expression.el;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.FunctionMapper;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.FunctionMapper;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
 
 import org.springframework.binding.convert.ConversionService;
 import org.springframework.binding.convert.service.DefaultConversionService;

spring-binding/src/main/java/org/springframework/binding/expression/el/MapAdaptableELResolver.java

@@ -18,10 +18,10 @@ package org.springframework.binding.expression.el;
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
 import java.util.Map;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotWritableException;
+import jakarta.el.ELContext;
+import jakarta.el.ELException;
+import jakarta.el.ELResolver;
+import jakarta.el.PropertyNotWritableException;
 
 import org.springframework.binding.collection.MapAdaptable;
 

spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java

@@ -6,10 +6,10 @@ import static org.junit.jupiter.api.Assertions.fail;
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
 
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
-import javax.el.VariableMapper;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.FunctionMapper;
+import jakarta.el.VariableMapper;
 
 import org.apache.el.ExpressionFactoryImpl;
 import org.junit.jupiter.api.BeforeEach;

spring-binding/src/test/java/org/springframework/binding/expression/el/MapAdaptableELResolverTests.java

@@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.el.ELContext;
+import jakarta.el.ELContext;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;