From 7fa1e033aab3c4f14a250ad018eeba966d7b1676 Mon Sep 17 00:00:00 2001
From: jhunzik <17188993+jhunzik@users.noreply.github.com>
Date: Tue, 14 Jul 2026 15:10:02 -0700
Subject: [PATCH 1/2] Upgrade apache shiro

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4b74ed65ef7..856a18038ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
         <abdera.osgi.version>1.1.3_2</abdera.osgi.version>
         <abdera.version>1.1.3</abdera.version>
         <antlr.version>4.3</antlr.version>
-        <apache.shiro.version>1.13.0</apache.shiro.version>
+        <apache.shiro.version>2.2.1</apache.shiro.version>
         <asm.version>9.9.1</asm.version>
         <awaitility.version>3.1.6</awaitility.version>
         <bouncy.version>1.84</bouncy.version>

From 03b3a855f00dcb0d384ba78b1fd09117f1e8da68 Mon Sep 17 00:00:00 2001
From: jhunzik <17188993+jhunzik@users.noreply.github.com>
Date: Tue, 14 Jul 2026 16:42:33 -0700
Subject: [PATCH 2/2] Fix Shiro 2.x OSGi compatibility by using official
 shiro-core feature

Upgrade from shiro-core bundle to shiro-core feature from Apache Shiro's
official Karaf feature repository. This fixes OSGi resolution errors where
shiro-core 2.2.1 requires the osgi.serviceloader.registrar extender and
shiro-lang bundle that were not previously included.

The official shiro-core feature properly handles all dependencies including:
- shiro-lang (base package)
- spifly (provides osgi.serviceloader.registrar extender)
- All other shiro-* modules in correct dependency order

Also adds shiro-features descriptor to karaf-maven-plugin configurations in
ddf-catalog and ddf distributions so the feature can be resolved at build time.
---
 distribution/ddf-catalog/pom.xml               | 1 +
 distribution/ddf/pom.xml                       | 1 +
 features/security/src/main/feature/feature.xml | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/distribution/ddf-catalog/pom.xml b/distribution/ddf-catalog/pom.xml
index a6ab50fccb7..2776143a26b 100644
--- a/distribution/ddf-catalog/pom.xml
+++ b/distribution/ddf-catalog/pom.xml
@@ -90,6 +90,7 @@
                                 <descriptor>mvn:ddf.features/apps/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/branding/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/security/${project.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.shiro/shiro-features/${apache.shiro.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/solr/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/utilities/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.catalog/catalog-app/${project.version}/xml/features</descriptor>
diff --git a/distribution/ddf/pom.xml b/distribution/ddf/pom.xml
index 6ddf3b6668b..5dfcc684ac8 100644
--- a/distribution/ddf/pom.xml
+++ b/distribution/ddf/pom.xml
@@ -78,6 +78,7 @@
                                 <descriptor>mvn:ddf.features/admin/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/branding/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/security/${project.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.shiro/shiro-features/${apache.shiro.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/solr/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.features/utilities/${project.version}/xml/features</descriptor>
                                 <descriptor>mvn:ddf.catalog/catalog-app/${project.version}/xml/features</descriptor>
diff --git a/features/security/src/main/feature/feature.xml b/features/security/src/main/feature/feature.xml
index 034dd10dbbe..7b6b983e295 100644
--- a/features/security/src/main/feature/feature.xml
+++ b/features/security/src/main/feature/feature.xml
@@ -22,6 +22,7 @@
     <repository>mvn:ddf.features/utilities/${project.version}/xml/features</repository>
     <repository>mvn:ddf.features/branding/${project.version}/xml/features</repository>
     <repository>mvn:ddf.features/camel-karaf/${project.version}/xml/features</repository>
+    <repository>mvn:org.apache.shiro/shiro-features/${apache.shiro.version}/xml/features</repository>
 
     <feature name="security-core-api-dependencies" version="${project.version}"
              description="Dependencies for the core security APIs.">
@@ -52,7 +53,7 @@
         <bundle>mvn:net.minidev/json-smart/${json-smart.version}</bundle>
 
         <!-- Miscellaneous -->
-        <bundle dependency="true">mvn:org.apache.shiro/shiro-core/${apache.shiro.version}</bundle>
+        <feature version="${apache.shiro.version}" dependency="true">shiro-core</feature>
         <bundle>mvn:com.sun.mail/jakarta.mail/${jakarta.mail.version}</bundle>
         <bundle>mvn:org.apache.commons/commons-text/${commons-text.version}</bundle>