From 6c470cda995d1d836ca3ad83338652209774005a Mon Sep 17 00:00:00 2001
From: Thomas Beekman <t.beekman@kennisnet.nl>
Date: Tue, 30 Jun 2026 11:20:30 +0200
Subject: [PATCH 1/2] ENT-5461: Build release SSO Query 2.5.0

---
 pom.xml                                       |  3 +--
 release/pom.xml                               |  2 +-
 .../docs/2.5.0-SNAPSHOT/release-notes.md      | 22 -----------------
 .../site/markdown/docs/2.5.0/release-notes.md | 24 +++++++++++++++++++
 4 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 release/src/site/markdown/docs/2.5.0-SNAPSHOT/release-notes.md
 create mode 100644 release/src/site/markdown/docs/2.5.0/release-notes.md

diff --git a/pom.xml b/pom.xml
index d71a98e..8bcc5d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,11 +54,10 @@
         <guava.version>33.1.0-jre</guava.version>
         <json.version>20240303</json.version>
         <logback-ecs-encoder.version>1.7.0</logback-ecs-encoder.version>
-        <logback.encoder.version>7.4</logback.encoder.version>
+        <logback.encoder.version>9.0</logback.encoder.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-scm.version>1.11.2</maven-scm.version>
         <sonar-maven-plugin.version>5.5.0.6356</sonar-maven-plugin.version>
-<!--        <commons-lang3.version>3.18.0</commons-lang3.version> &lt;!&ndash; Temporary fix for CVE-2025-48924 &ndash;&gt;-->
     </properties>
 
     <distributionManagement>
diff --git a/release/pom.xml b/release/pom.xml
index 86cb873..b594fb7 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -31,7 +31,7 @@
     <properties>
         <!-- A list of all the previous versions in reverse order, separated by a comma separator -->
         <!-- The current version is automatically added in the release-notes-all overview. -->
-        <versions>2.5.0-SNAPSHOT</versions>
+        <versions>2.5.0</versions>
         <maven.deploy.skip>false</maven.deploy.skip>
     </properties>
 
diff --git a/release/src/site/markdown/docs/2.5.0-SNAPSHOT/release-notes.md b/release/src/site/markdown/docs/2.5.0-SNAPSHOT/release-notes.md
deleted file mode 100644
index d246294..0000000
--- a/release/src/site/markdown/docs/2.5.0-SNAPSHOT/release-notes.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# OC SSO Query Service - Release Notes
-
-| Field                      | Value                        |
-|:---------------------------|:-----------------------------|
-| Application                | OC SSO Query Service         |
-| Version                    | 2.5.0-SNAPSHOT               |
-| Changes since version      | 2.4.0                        |
-| Release date               | dd-mm-yyyy (dd-mm-yyyy)      |
-| Delivery type              | Full release                 |
-
-## Changes
-
-| #        | Description                   |
-|:---------|:------------------------------|
-| ENT-5461 | Build release SSO Query 2.5.0 |
-
-
-## Configuration changes
-
-## Known vulnerabilities
-
-At the time of build, the application contains no known vulnerabilities with a CVE score of 7 or higher.
diff --git a/release/src/site/markdown/docs/2.5.0/release-notes.md b/release/src/site/markdown/docs/2.5.0/release-notes.md
new file mode 100644
index 0000000..f51f52d
--- /dev/null
+++ b/release/src/site/markdown/docs/2.5.0/release-notes.md
@@ -0,0 +1,24 @@
+# OC SSO Query Service - Release Notes
+
+| Field                      | Value                   |
+|:---------------------------|:------------------------|
+| Application                | OC SSO Query Service    |
+| Version                    | 2.5.0                   |
+| Changes since version      | 2.4.0                   |
+| Release date               | 30-06-2026 (dd-mm-yyyy) |
+| Delivery type              | Full release            |
+
+## Changes
+
+| #        | Description                   |
+|:---------|:------------------------------|
+| ENT-5461 | Build release SSO Query 2.5.0 |
+
+
+## Configuration changes
+
+None.
+
+## Known vulnerabilities
+
+At the time of build, the application contains no known vulnerabilities with a CVE score of 7 or higher.

From 07619504fb683cf435e8b50e460eb0b1a7342095 Mon Sep 17 00:00:00 2001
From: Thomas Beekman <t.beekman@kennisnet.nl>
Date: Tue, 30 Jun 2026 11:24:30 +0200
Subject: [PATCH 2/2] ENT-5461: Build release SSO Query 2.5.0 - cleaned up old
 Jackson 2.x references

---
 .../kennisnet/services/web/service/WhitelistRestProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oc-sso-query/src/main/java/nl/kennisnet/services/web/service/WhitelistRestProvider.java b/oc-sso-query/src/main/java/nl/kennisnet/services/web/service/WhitelistRestProvider.java
index 062e092..a5413f7 100644
--- a/oc-sso-query/src/main/java/nl/kennisnet/services/web/service/WhitelistRestProvider.java
+++ b/oc-sso-query/src/main/java/nl/kennisnet/services/web/service/WhitelistRestProvider.java
@@ -15,8 +15,6 @@
  */
 package nl.kennisnet.services.web.service;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import nl.kennisnet.services.web.config.CacheConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +29,8 @@
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestClientException;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.ArrayList;