Upgrading to spring 7, hibernate 7

pom.xml

@@ -17,9 +17,9 @@
     <skipITs>true</skipITs>
     <java.version>17</java.version>
 
-    <spring.version>6.2.18</spring.version>
-    <spring-security.version>6.5.10</spring-security.version>
-    <jackson2.version>2.21.4</jackson2.version> <!-- 2.21 is LTS -->
+    <spring.version>7.0.7</spring.version>
+    <spring-security.version>7.0.5</spring-security.version>
+    <jackson2.version>2.21.4</jackson2.version>
     <jackson.version.annotations>2.21</jackson.version.annotations>
     <jackson3.version>3.1.4</jackson3.version>
 
@@ -50,7 +50,7 @@
     <httpcomponents.version>4.5.14</httpcomponents.version>
     <httpcomponentscore.version>4.4.16</httpcomponentscore.version>
 
-    <hibernate.version>6.6.44.Final</hibernate.version>
+    <hibernate.version>7.3.4.Final</hibernate.version>
     <hibernate.search.version>7.2.1.Final</hibernate.search.version>
 
     <!-- jakarta versions -->
@@ -516,6 +516,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>

vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java

@@ -1,19 +1,26 @@
 package nl.vpro.hibernate;
 
-import org.hibernate.metamodel.mapping.*;
+import java.io.Serial;
+import java.net.URI;
+
+import org.hibernate.metamodel.mapping.DiscriminatorConverter;
+import org.hibernate.metamodel.mapping.DiscriminatorType;
+import org.hibernate.metamodel.mapping.internal.UnifiedAnyDiscriminatorConverter;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.jdbc.VarcharJdbcType;
 
-import java.net.URI;
-
 /**
  * A type that maps between {@link java.sql.Types#VARCHAR VARCHAR} and {@link java.net.URI}
  *
  * @author Michiel Meeuwissen
  */
 public class URIType extends AbstractSingleColumnStandardBasicType<URI> implements DiscriminatorType<URI> {
 
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
     public URIType() {
         super(VarcharJdbcType.INSTANCE, URITypeDescriptor.INSTANCE);
     }
@@ -25,7 +32,7 @@ public String getName() {
 
     @Override
     public DiscriminatorConverter<URI, CharSequence> getValueConverter() {
-        return new MappedDiscriminatorConverter<URI, CharSequence>(null, null, null, null) {
+        return new UnifiedAnyDiscriminatorConverter<URI, CharSequence>(null, null, null, null, null, null) {
             @Override
             public URI toDomainValue(CharSequence relationalValue) {
                 return URI.create((String) relationalValue);

vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java

@@ -1,12 +1,13 @@
 package nl.vpro.hibernate;
 
+import java.io.Serial;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import org.hibernate.HibernateException;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.AbstractClassJavaType;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
 
 /**
  * Descriptor for {@link java.net.URI} handling.
@@ -15,8 +16,10 @@
  */
 class URITypeDescriptor extends AbstractClassJavaType<URI> {
     public static final URITypeDescriptor INSTANCE = new URITypeDescriptor(URI.class);
+    @Serial
+    private static final long serialVersionUID = -8084874037847068699L;
 
-    protected URITypeDescriptor(Class<? extends URI> type) {
+    protected URITypeDescriptor(Class<URI> type) {
         super(type);
     }