From 27e614d569094c55938ddcc169fbb4484ae61222 Mon Sep 17 00:00:00 2001
From: Michiel Meeuwissen <michiel.meeuwissen@gmail.com>
Date: Wed, 13 May 2026 11:10:18 +0200
Subject: [PATCH] Upgrading to spring 7, hiberante 7

---
 pom.xml                                       | 45 +++++--------------
 .../main/java/nl/vpro/hibernate/URIType.java  | 15 +++++--
 .../nl/vpro/hibernate/URITypeDescriptor.java  | 11 +++--
 3 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e5ca76c0..55e3dcce2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,8 @@
     <skipITs>true</skipITs>
     <java.version>17</java.version>
 
-    <spring.version>6.2.18</spring.version>
-    <spring-security.version>6.5.10</spring-security.version>
+    <spring.version>7.0.7</spring.version>
+    <spring-security.version>7.0.5</spring-security.version>
     <jackson2.version>2.21.3</jackson2.version>
     <jackson.version.annotations>2.21</jackson.version.annotations>
     <jackson3.version>3.1.3</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 -->
@@ -502,34 +502,19 @@
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-orm</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context-support</artifactId>
+        <artifactId>spring-framework-bom</artifactId>
         <version>${spring.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-core</artifactId>
+        <artifactId>spring-security-bom</artifactId>
         <version>${spring-security.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
@@ -542,16 +527,6 @@
         <version>3.0.0</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java b/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java
index 4ce519788..f61b54b26 100644
--- a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java
+++ b/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URIType.java
@@ -1,12 +1,15 @@
 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}
  *
@@ -14,6 +17,10 @@
  */
 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);
diff --git a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java b/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java
index 8e0cb936c..dd74f89e3 100644
--- a/vpro-shared-hibernate/src/main/java/nl/vpro/hibernate/URITypeDescriptor.java
+++ b/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);
     }