From f1f1764f697776c4ffa8c3e2ad76e245b4c96afc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 17:02:41 +0000
Subject: [PATCH 1/3] Bump
 org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-security-crypto

Bumps org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-security-crypto from 5.3.3.RELEASE_2 to 5.8.16_1.

---
updated-dependencies:
- dependency-name: org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-security-crypto
  dependency-version: 5.8.16_1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34954a67281..b67a0a3102d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,7 +358,7 @@
         <spring.security31.version>3.1.4.RELEASE</spring.security31.version>
         <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
         <spring.security51.version>5.1.10.RELEASE_1</spring.security51.version>
-        <spring.security53.version>5.3.3.RELEASE_2</spring.security53.version>
+        <spring.security53.version>5.8.16_1</spring.security53.version>
         <spring.security54.version>5.4.6_1</spring.security54.version>
         <spring.security55.version>5.5.3_1</spring.security55.version>
         <spring.security56.version>5.6.3_1</spring.security56.version>

From f4caf1c25630a445fa36646e03fffa27e6b0a8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jb.onofre@dremio.com>
Date: Fri, 12 Dec 2025 07:38:11 +0100
Subject: [PATCH 2/3] Add Spring Security 5.8.x features

---
 .../spring-legacy/src/main/feature/feature.xml | 18 ++++++++++++++++++
 pom.xml                                        |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 4078085937c..25c4166c8af 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -547,4 +547,22 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security57.version}</bundle>
     </feature>
 
+    <feature name="spring-security" description="Spring Security 5.8.x support" version="${spring.security58.version}">
+        <feature>pax-web-jsp</feature>
+        <feature>pax-web-war</feature>
+        <feature version="[5.3,5.4)">spring-jdbc</feature>
+        <feature version="[5.3,5.4)">spring-tx</feature>
+        <feature version="[5.3,5.4)">spring-web</feature>
+        <bundle dependency="true">mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security58.version}</bundle>
+    </feature>
+
 </features>
diff --git a/pom.xml b/pom.xml
index b67a0a3102d..2a7a9f7be66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -358,11 +358,12 @@
         <spring.security31.version>3.1.4.RELEASE</spring.security31.version>
         <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
         <spring.security51.version>5.1.10.RELEASE_1</spring.security51.version>
-        <spring.security53.version>5.8.16_1</spring.security53.version>
+        <spring.security53.version>5.3.3.RELEASE_2</spring.security53.version>
         <spring.security54.version>5.4.6_1</spring.security54.version>
         <spring.security55.version>5.5.3_1</spring.security55.version>
         <spring.security56.version>5.6.3_1</spring.security56.version>
         <spring.security57.version>5.7.12_4</spring.security57.version>
+        <spring.security58.version>5.8.16_1</spring.security58.version>
         <spring.security62.version>6.2.7_3</spring.security62.version>
 
         <sling.commons.johnzon.version>1.2.16</sling.commons.johnzon.version>

From 0dc3b475375a757f3a5fecc2efb12b9438c811ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Fri, 12 Dec 2025 09:08:36 +0100
Subject: [PATCH 3/3] Fix jackson.annotations version

---
 assemblies/features/spring-legacy/src/main/feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 25c4166c8af..a4f9513dac8 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -555,7 +555,7 @@
         <feature version="[5.3,5.4)">spring-web</feature>
         <bundle dependency="true">mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
-        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security58.version}</bundle>