From bf14b16929d05de07de723933bb0e7fa58210df5 Mon Sep 17 00:00:00 2001
From: "scott.middleton" <scott.middleton@octo.us>
Date: Thu, 5 Dec 2024 17:14:57 -0700
Subject: [PATCH 1/6] Update Karaf Version

---
 .../catalog-core-standardframework/pom.xml    |  5 +++--
 catalog/solr/catalog-solr-commands/pom.xml    |  6 ++++++
 .../ddf/commands/solr/SolrCommandTest.java    |  2 +-
 distribution/ddf-catalog/pom.xml              |  2 +-
 .../resources-filtered/etc/startup.properties |  4 ++--
 distribution/kernel/pom.xml                   |  5 +++++
 .../branding/src/main/feature/feature.xml     |  1 +
 features/kernel/src/main/feature/feature.xml  |  1 +
 .../utilities/src/main/feature/feature.xml    |  4 ++++
 pom.xml                                       | 21 ++++++++++---------
 10 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/catalog/core/catalog-core-standardframework/pom.xml b/catalog/core/catalog-core-standardframework/pom.xml
index 4ac11a8078f0..367585a8868f 100644
--- a/catalog/core/catalog-core-standardframework/pom.xml
+++ b/catalog/core/catalog-core-standardframework/pom.xml
@@ -182,9 +182,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <scope>test</scope>
+            <version>${apache-log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>ddf.mime.core</groupId>
diff --git a/catalog/solr/catalog-solr-commands/pom.xml b/catalog/solr/catalog-solr-commands/pom.xml
index 90a264c50e1a..e9667b6f9247 100644
--- a/catalog/solr/catalog-solr-commands/pom.xml
+++ b/catalog/solr/catalog-solr-commands/pom.xml
@@ -85,6 +85,12 @@
             <version>${solr.jetty.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>${pax.logging.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-test-framework</artifactId>
diff --git a/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java b/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
index d70dda4342f0..3cc68dca11f7 100644
--- a/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
+++ b/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
@@ -164,7 +164,7 @@ protected static void createMiniSolrCloudCluster() throws Exception {
             .addConfig(
                 DEFAULT_CONFIGSET,
                 Paths.get(
-                    BackupCommandTest.class.getClassLoader().getResource("configset").getPath()))
+                    BackupCommandTest.class.getClassLoader().getResource("configset").toURI()))
             .build();
     miniSolrCloud.getSolrClient().connect();
     System.setProperty("solr.cloud.shardCount", "1");
diff --git a/distribution/ddf-catalog/pom.xml b/distribution/ddf-catalog/pom.xml
index 2ae9c8cf0dbf..67f0593645f5 100644
--- a/distribution/ddf-catalog/pom.xml
+++ b/distribution/ddf-catalog/pom.xml
@@ -182,7 +182,7 @@
                         <configuration>
                             <rules>
                                 <requireFilesSize>
-                                    <maxsize>160000000</maxsize>
+                                    <maxsize>260000000</maxsize>
                                     <minsize>120000000</minsize>
                                     <files>
                                         <file>${project.build.directory}/${distribution.file.name}.zip</file>
diff --git a/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties b/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
index 41abb939ec3d..a908867156d6 100644
--- a/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
+++ b/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
@@ -11,10 +11,10 @@ mvn\:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} = 9
 mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9
 mvn\:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} = 9
 mvn\:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}=10
-mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.6 = 11
+mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.8 = 11
 mvn\:org.apache.felix/org.apache.felix.configurator/1.0.16 = 11
 mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11
-mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.14 = 11
+mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.16 = 11
 mvn\:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}=12
 mvn\:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${servicemix.specs.jaxb.version}=13
 mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${servicemix.bundles.jaxb.version}=14
diff --git a/distribution/kernel/pom.xml b/distribution/kernel/pom.xml
index 832a585d230d..b4d87ecba2c4 100644
--- a/distribution/kernel/pom.xml
+++ b/distribution/kernel/pom.xml
@@ -339,5 +339,10 @@
             <artifactId>org.apache.servicemix.bundles.jaxb-runtime</artifactId>
             <version>${servicemix.bundles.jaxb.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.spifly</groupId>
+            <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+            <version>${spifly.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/features/branding/src/main/feature/feature.xml b/features/branding/src/main/feature/feature.xml
index 2188a9aa8f7e..d113a8c09fef 100644
--- a/features/branding/src/main/feature/feature.xml
+++ b/features/branding/src/main/feature/feature.xml
@@ -24,6 +24,7 @@
 
     <feature name="ddf-branding" version="${project.version}" description="DDF Branding">
         <feature>branding-api</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:commons-configuration/commons-configuration/${commons-configuration.version}</bundle>
         <bundle>mvn:ddf.distribution/ddf-branding-plugin/${project.version}</bundle>
diff --git a/features/kernel/src/main/feature/feature.xml b/features/kernel/src/main/feature/feature.xml
index 7ff57c1d6d60..d28436c0a2c9 100644
--- a/features/kernel/src/main/feature/feature.xml
+++ b/features/kernel/src/main/feature/feature.xml
@@ -17,6 +17,7 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository>
+    <repository>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</repository>
     <repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>
 
     <feature name="kernel" version="${project.version}"
diff --git a/features/utilities/src/main/feature/feature.xml b/features/utilities/src/main/feature/feature.xml
index 7197712c13ec..824e1dd0ae86 100644
--- a/features/utilities/src/main/feature/feature.xml
+++ b/features/utilities/src/main/feature/feature.xml
@@ -42,6 +42,7 @@
     <feature name="parser-xml" version="${project.version}"
              description="Platform JAXB support.">
         <feature>guava</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:ddf.platform/platform-parser-api/${project.version}</bundle>
         <bundle>mvn:ddf.platform/platform-parser-xml/${project.version}</bundle>
     </feature>
@@ -97,6 +98,7 @@
              description="Tika MIME Resolver">
         <feature>mime-core-api</feature>
         <feature>slf4j</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:ddf.mime.tika/mime-tika-resolver/${project.version}</bundle>
     </feature>
 
@@ -163,6 +165,7 @@
         <feature prerequisite="true">wrap</feature>
         <feature>spifly</feature>
         <feature version="${project.version}">jackson</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:org.slf4j/slf4j-api/${tika.slf4j.version}</bundle>
         <bundle>mvn:org.slf4j/slf4j-nop/${tika.slf4j.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
@@ -173,6 +176,7 @@
     </feature>
 
     <feature name="io" version="${project.version}" description="I/O Utilities">
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:ddf.platform.io/platform-io-internal-api/${project.version}</bundle>
         <bundle>mvn:ddf.platform.io/platform-io-impl/${project.version}</bundle>
     </feature>
diff --git a/pom.xml b/pom.xml
index 374aa7f4d75e..eb267ace4052 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,8 +119,8 @@
         <spock.version>2.3-groovy-3.0</spock.version>
         <mockito.version>4.9.0</mockito.version>
         <pax.exam.version>4.13.5</pax.exam.version>
-        <pax.logging.version>2.2.0</pax.logging.version>
-        <pax.url.version>2.6.12</pax.url.version>
+        <pax.logging.version>2.2.7</pax.logging.version>
+        <pax.url.version>2.6.14</pax.url.version>
         <pax.web.version>8.0.15</pax.web.version>
         <restito.version>1.1.0</restito.version>
         <restassured.version>3.3.0</restassured.version>
@@ -155,10 +155,10 @@
         <commons-csv.version>1.4</commons-csv.version>
         <commons-digester.version>1.8.1</commons-digester.version>
         <commons-exec.version>1.3</commons-exec.version>
-        <commons-io.version>2.13.0</commons-io.version>
+        <commons-io.version>2.15.1</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <commons-logging.version>1.2</commons-logging.version>
+        <commons-lang3.version>3.13.0</commons-lang3.version>
+        <commons-logging.version>1.3.1</commons-logging.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <commons-net.version>3.5</commons-net.version>
         <countryconverter.version>0.1.8</countryconverter.version>
@@ -203,11 +203,11 @@
         <jts.geotools.version>1.19.0</jts.geotools.version>
         <jts.spatial4j.version>1.17.0</jts.spatial4j.version>
         <jwnl.version>1.3.3</jwnl.version>
-        <karaf.version>4.4.3</karaf.version>
-        <jansi.version>2.4.0</jansi.version>
-        <org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
+        <karaf.version>4.4.6</karaf.version>
+        <jansi.version>2.4.1</jansi.version>
+        <org.osgi.util.promise.version>1.3.0</org.osgi.util.promise.version>
         <org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
-        <apache-log4j.version>2.17.0</apache-log4j.version>
+        <apache-log4j.version>2.24.1</apache-log4j.version>
         <logback.classic.version>1.2.3</logback.classic.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.version>2.4.1</mariadb.version>
@@ -244,9 +244,10 @@
         <solr.httpcore.version>4.4.16</solr.httpcore.version>
         <solr.httpmime.version>4.5.14</solr.httpmime.version>
         <solr.jetty.version>10.0.12</solr.jetty.version>
-        <solr.zookeeper.version>3.8.1</solr.zookeeper.version>
+        <solr.zookeeper.version>3.8.3</solr.zookeeper.version>
         <solr.spatial4j.version>0.8</solr.spatial4j.version>
         <spatial4j.version>0.8</spatial4j.version>
+        <spifly.version>1.3.7</spifly.version>
         <tika.version>2.8.0</tika.version>
         <tika.slf4j.version>2.0.7</tika.slf4j.version>
         <usng4j.version>0.4</usng4j.version>

From cd18a79985843463513e6ec734c30ed6ca37b7ca Mon Sep 17 00:00:00 2001
From: "scott.middleton" <scott.middleton@octo.us>
Date: Thu, 12 Dec 2024 16:02:25 -0700
Subject: [PATCH 2/6] Fix kernel itests

---
 .../codice/ddf/itests/kernel/ITSynchronizedInstaller.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java b/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
index 61a145656ef5..ea7cf33df8f3 100644
--- a/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
+++ b/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
@@ -63,6 +63,7 @@
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
@@ -109,6 +110,7 @@ public static Option[] examConfiguration() {
   public void beforeExam() throws Exception {
     startExampleBundle();
     featuresService.installFeature(EXAMPLE_FEATURE);
+    resetBundleContext();
     syncInstaller.waitForBundles();
   }
 
@@ -325,6 +327,12 @@ private void resetExampleMSProps() throws IOException {
                     .equals(ExampleService.DEFAULT_EXAMPLE_PROP_VALUE));
   }
 
+  private void resetBundleContext() {
+    Bundle bundle = FrameworkUtil.getBundle(this.getClass());
+    bundleContext = bundle.getBundleContext();
+    configAdmin = getService(ConfigurationAdmin.class);
+  }
+
   private Stream<org.osgi.service.cm.Configuration> configurations(String filter)
       throws IOException, InvalidSyntaxException {
     org.osgi.service.cm.Configuration[] configs = configAdmin.listConfigurations(filter);

From eb6211a8717085412adbd2e429d4d437b6a66d9f Mon Sep 17 00:00:00 2001
From: middlets719 <scott.middleton@connexta.com>
Date: Tue, 14 Jan 2025 12:40:04 -0700
Subject: [PATCH 3/6] Update Karaf Version

---
 .../catalog-core-standardframework/pom.xml    |  5 +++--
 catalog/solr/catalog-solr-commands/pom.xml    |  6 ++++++
 .../ddf/commands/solr/SolrCommandTest.java    |  2 +-
 distribution/ddf-catalog/pom.xml              |  2 +-
 .../resources-filtered/etc/startup.properties |  4 ++--
 distribution/kernel/pom.xml                   |  5 +++++
 .../kernel/ITSynchronizedInstaller.java       |  8 +++++++
 .../branding/src/main/feature/feature.xml     |  1 +
 features/kernel/src/main/feature/feature.xml  |  1 +
 .../utilities/src/main/feature/feature.xml    |  4 ++++
 pom.xml                                       | 21 ++++++++++---------
 11 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/catalog/core/catalog-core-standardframework/pom.xml b/catalog/core/catalog-core-standardframework/pom.xml
index 4ac11a8078f0..367585a8868f 100644
--- a/catalog/core/catalog-core-standardframework/pom.xml
+++ b/catalog/core/catalog-core-standardframework/pom.xml
@@ -182,9 +182,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <scope>test</scope>
+            <version>${apache-log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>ddf.mime.core</groupId>
diff --git a/catalog/solr/catalog-solr-commands/pom.xml b/catalog/solr/catalog-solr-commands/pom.xml
index 90a264c50e1a..e9667b6f9247 100644
--- a/catalog/solr/catalog-solr-commands/pom.xml
+++ b/catalog/solr/catalog-solr-commands/pom.xml
@@ -85,6 +85,12 @@
             <version>${solr.jetty.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>${pax.logging.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-test-framework</artifactId>
diff --git a/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java b/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
index d70dda4342f0..3cc68dca11f7 100644
--- a/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
+++ b/catalog/solr/catalog-solr-commands/src/test/java/org/codice/ddf/commands/solr/SolrCommandTest.java
@@ -164,7 +164,7 @@ protected static void createMiniSolrCloudCluster() throws Exception {
             .addConfig(
                 DEFAULT_CONFIGSET,
                 Paths.get(
-                    BackupCommandTest.class.getClassLoader().getResource("configset").getPath()))
+                    BackupCommandTest.class.getClassLoader().getResource("configset").toURI()))
             .build();
     miniSolrCloud.getSolrClient().connect();
     System.setProperty("solr.cloud.shardCount", "1");
diff --git a/distribution/ddf-catalog/pom.xml b/distribution/ddf-catalog/pom.xml
index 2ae9c8cf0dbf..67f0593645f5 100644
--- a/distribution/ddf-catalog/pom.xml
+++ b/distribution/ddf-catalog/pom.xml
@@ -182,7 +182,7 @@
                         <configuration>
                             <rules>
                                 <requireFilesSize>
-                                    <maxsize>160000000</maxsize>
+                                    <maxsize>260000000</maxsize>
                                     <minsize>120000000</minsize>
                                     <files>
                                         <file>${project.build.directory}/${distribution.file.name}.zip</file>
diff --git a/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties b/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
index 41abb939ec3d..a908867156d6 100644
--- a/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
+++ b/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
@@ -11,10 +11,10 @@ mvn\:org.osgi/org.osgi.util.promise/${org.osgi.util.promise.version} = 9
 mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9
 mvn\:org.osgi/org.osgi.util.function/${org.osgi.util.function.version} = 9
 mvn\:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}=10
-mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.6 = 11
+mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.2.8 = 11
 mvn\:org.apache.felix/org.apache.felix.configurator/1.0.16 = 11
 mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11
-mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.14 = 11
+mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.16 = 11
 mvn\:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}=12
 mvn\:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${servicemix.specs.jaxb.version}=13
 mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${servicemix.bundles.jaxb.version}=14
diff --git a/distribution/kernel/pom.xml b/distribution/kernel/pom.xml
index 832a585d230d..b4d87ecba2c4 100644
--- a/distribution/kernel/pom.xml
+++ b/distribution/kernel/pom.xml
@@ -339,5 +339,10 @@
             <artifactId>org.apache.servicemix.bundles.jaxb-runtime</artifactId>
             <version>${servicemix.bundles.jaxb.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.spifly</groupId>
+            <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+            <version>${spifly.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java b/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
index 61a145656ef5..ea7cf33df8f3 100644
--- a/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
+++ b/distribution/test/itests/test-itests-kernel/src/test/java/org/codice/ddf/itests/kernel/ITSynchronizedInstaller.java
@@ -63,6 +63,7 @@
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
@@ -109,6 +110,7 @@ public static Option[] examConfiguration() {
   public void beforeExam() throws Exception {
     startExampleBundle();
     featuresService.installFeature(EXAMPLE_FEATURE);
+    resetBundleContext();
     syncInstaller.waitForBundles();
   }
 
@@ -325,6 +327,12 @@ private void resetExampleMSProps() throws IOException {
                     .equals(ExampleService.DEFAULT_EXAMPLE_PROP_VALUE));
   }
 
+  private void resetBundleContext() {
+    Bundle bundle = FrameworkUtil.getBundle(this.getClass());
+    bundleContext = bundle.getBundleContext();
+    configAdmin = getService(ConfigurationAdmin.class);
+  }
+
   private Stream<org.osgi.service.cm.Configuration> configurations(String filter)
       throws IOException, InvalidSyntaxException {
     org.osgi.service.cm.Configuration[] configs = configAdmin.listConfigurations(filter);
diff --git a/features/branding/src/main/feature/feature.xml b/features/branding/src/main/feature/feature.xml
index 2188a9aa8f7e..d113a8c09fef 100644
--- a/features/branding/src/main/feature/feature.xml
+++ b/features/branding/src/main/feature/feature.xml
@@ -24,6 +24,7 @@
 
     <feature name="ddf-branding" version="${project.version}" description="DDF Branding">
         <feature>branding-api</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:commons-configuration/commons-configuration/${commons-configuration.version}</bundle>
         <bundle>mvn:ddf.distribution/ddf-branding-plugin/${project.version}</bundle>
diff --git a/features/kernel/src/main/feature/feature.xml b/features/kernel/src/main/feature/feature.xml
index 7ff57c1d6d60..d28436c0a2c9 100644
--- a/features/kernel/src/main/feature/feature.xml
+++ b/features/kernel/src/main/feature/feature.xml
@@ -17,6 +17,7 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository>
+    <repository>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</repository>
     <repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>
 
     <feature name="kernel" version="${project.version}"
diff --git a/features/utilities/src/main/feature/feature.xml b/features/utilities/src/main/feature/feature.xml
index 7197712c13ec..824e1dd0ae86 100644
--- a/features/utilities/src/main/feature/feature.xml
+++ b/features/utilities/src/main/feature/feature.xml
@@ -42,6 +42,7 @@
     <feature name="parser-xml" version="${project.version}"
              description="Platform JAXB support.">
         <feature>guava</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:ddf.platform/platform-parser-api/${project.version}</bundle>
         <bundle>mvn:ddf.platform/platform-parser-xml/${project.version}</bundle>
     </feature>
@@ -97,6 +98,7 @@
              description="Tika MIME Resolver">
         <feature>mime-core-api</feature>
         <feature>slf4j</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:ddf.mime.tika/mime-tika-resolver/${project.version}</bundle>
     </feature>
 
@@ -163,6 +165,7 @@
         <feature prerequisite="true">wrap</feature>
         <feature>spifly</feature>
         <feature version="${project.version}">jackson</feature>
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:org.slf4j/slf4j-api/${tika.slf4j.version}</bundle>
         <bundle>mvn:org.slf4j/slf4j-nop/${tika.slf4j.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
@@ -173,6 +176,7 @@
     </feature>
 
     <feature name="io" version="${project.version}" description="I/O Utilities">
+        <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:ddf.platform.io/platform-io-internal-api/${project.version}</bundle>
         <bundle>mvn:ddf.platform.io/platform-io-impl/${project.version}</bundle>
     </feature>
diff --git a/pom.xml b/pom.xml
index 374aa7f4d75e..eb267ace4052 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,8 +119,8 @@
         <spock.version>2.3-groovy-3.0</spock.version>
         <mockito.version>4.9.0</mockito.version>
         <pax.exam.version>4.13.5</pax.exam.version>
-        <pax.logging.version>2.2.0</pax.logging.version>
-        <pax.url.version>2.6.12</pax.url.version>
+        <pax.logging.version>2.2.7</pax.logging.version>
+        <pax.url.version>2.6.14</pax.url.version>
         <pax.web.version>8.0.15</pax.web.version>
         <restito.version>1.1.0</restito.version>
         <restassured.version>3.3.0</restassured.version>
@@ -155,10 +155,10 @@
         <commons-csv.version>1.4</commons-csv.version>
         <commons-digester.version>1.8.1</commons-digester.version>
         <commons-exec.version>1.3</commons-exec.version>
-        <commons-io.version>2.13.0</commons-io.version>
+        <commons-io.version>2.15.1</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <commons-logging.version>1.2</commons-logging.version>
+        <commons-lang3.version>3.13.0</commons-lang3.version>
+        <commons-logging.version>1.3.1</commons-logging.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <commons-net.version>3.5</commons-net.version>
         <countryconverter.version>0.1.8</countryconverter.version>
@@ -203,11 +203,11 @@
         <jts.geotools.version>1.19.0</jts.geotools.version>
         <jts.spatial4j.version>1.17.0</jts.spatial4j.version>
         <jwnl.version>1.3.3</jwnl.version>
-        <karaf.version>4.4.3</karaf.version>
-        <jansi.version>2.4.0</jansi.version>
-        <org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
+        <karaf.version>4.4.6</karaf.version>
+        <jansi.version>2.4.1</jansi.version>
+        <org.osgi.util.promise.version>1.3.0</org.osgi.util.promise.version>
         <org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
-        <apache-log4j.version>2.17.0</apache-log4j.version>
+        <apache-log4j.version>2.24.1</apache-log4j.version>
         <logback.classic.version>1.2.3</logback.classic.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.version>2.4.1</mariadb.version>
@@ -244,9 +244,10 @@
         <solr.httpcore.version>4.4.16</solr.httpcore.version>
         <solr.httpmime.version>4.5.14</solr.httpmime.version>
         <solr.jetty.version>10.0.12</solr.jetty.version>
-        <solr.zookeeper.version>3.8.1</solr.zookeeper.version>
+        <solr.zookeeper.version>3.8.3</solr.zookeeper.version>
         <solr.spatial4j.version>0.8</solr.spatial4j.version>
         <spatial4j.version>0.8</spatial4j.version>
+        <spifly.version>1.3.7</spifly.version>
         <tika.version>2.8.0</tika.version>
         <tika.slf4j.version>2.0.7</tika.slf4j.version>
         <usng4j.version>0.4</usng4j.version>

From 4e5096d952eadc721814de7c1ee80d3efb3b589e Mon Sep 17 00:00:00 2001
From: middlets719 <scott.middleton@connexta.com>
Date: Wed, 22 Jan 2025 06:29:51 -0700
Subject: [PATCH 4/6] Karaf 4.4.6 dependency updates

---
 catalog/spatial/csw/spatial-csw-source-common/pom.xml | 2 +-
 catalog/transformer/catalog-transformer-pdf/pom.xml   | 6 +++---
 catalog/transformer/catalog-transformer-pptx/pom.xml  | 4 ++--
 distribution/kernel/pom.xml                           | 6 +++---
 pom.xml                                               | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/catalog/spatial/csw/spatial-csw-source-common/pom.xml b/catalog/spatial/csw/spatial-csw-source-common/pom.xml
index 6b44a49a4246..94b5255b4ad8 100644
--- a/catalog/spatial/csw/spatial-csw-source-common/pom.xml
+++ b/catalog/spatial/csw/spatial-csw-source-common/pom.xml
@@ -166,7 +166,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
+                <artifactId>bcprov-jdk18on</artifactId>
                 <version>${bouncy.version}</version>
             </dependency>
         </dependencies>
diff --git a/catalog/transformer/catalog-transformer-pdf/pom.xml b/catalog/transformer/catalog-transformer-pdf/pom.xml
index d3962f6cc566..13ce2aa45798 100644
--- a/catalog/transformer/catalog-transformer-pdf/pom.xml
+++ b/catalog/transformer/catalog-transformer-pdf/pom.xml
@@ -67,17 +67,17 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcmail-jdk15on</artifactId>
+            <artifactId>bcmail-jdk18on</artifactId>
             <version>${bouncy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <version>${bouncy.version}</version>
         </dependency>
         <dependency>
diff --git a/catalog/transformer/catalog-transformer-pptx/pom.xml b/catalog/transformer/catalog-transformer-pptx/pom.xml
index fcef408f3fc9..8e34846f47a9 100644
--- a/catalog/transformer/catalog-transformer-pptx/pom.xml
+++ b/catalog/transformer/catalog-transformer-pptx/pom.xml
@@ -69,12 +69,12 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncy.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <version>${bouncy.version}</version>
         </dependency>
         <dependency>
diff --git a/distribution/kernel/pom.xml b/distribution/kernel/pom.xml
index b4d87ecba2c4..00ea2a281a28 100644
--- a/distribution/kernel/pom.xml
+++ b/distribution/kernel/pom.xml
@@ -114,21 +114,21 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcprov-jdk15on</artifactId>
+                                    <artifactId>bcprov-jdk18on</artifactId>
                                     <version>${bouncy.version}</version>
                                     <outputDirectory>${setup.folder}/jdk9plus</outputDirectory>
                                     <destFileName>bcprov-${bouncy.version}.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcmail-jdk15on</artifactId>
+                                    <artifactId>bcmail-jdk18on</artifactId>
                                     <version>${bouncy.version}</version>
                                     <outputDirectory>${setup.folder}/jdk9plus</outputDirectory>
                                     <destFileName>bcmail-${bouncy.version}.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcpkix-jdk15on</artifactId>
+                                    <artifactId>bcpkix-jdk18on</artifactId>
                                     <version>${bouncy.version}</version>
                                     <outputDirectory>${setup.folder}/jdk9plus</outputDirectory>
                                     <destFileName>bcpkix-${bouncy.version}.jar</destFileName>
diff --git a/pom.xml b/pom.xml
index eb267ace4052..5369cd831a9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
         <pax.exam.version>4.13.5</pax.exam.version>
         <pax.logging.version>2.2.7</pax.logging.version>
         <pax.url.version>2.6.14</pax.url.version>
-        <pax.web.version>8.0.15</pax.web.version>
+        <pax.web.version>8.0.27</pax.web.version>
         <restito.version>1.1.0</restito.version>
         <restassured.version>3.3.0</restassured.version>
         <groovy.version>3.0.12</groovy.version>
@@ -133,7 +133,7 @@
         <project.report.output.directory>project-info</project.report.output.directory>
 
         <!--Documentation properties-->
-        <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
+        <asciidoctor.maven.plugin.version>2.2.5</asciidoctor.maven.plugin.version>
         <asciidoctorj.diagram.version>2.2.3</asciidoctorj.diagram.version>
         <asciidoctorj.version>2.5.7</asciidoctorj.version>
         <jruby.version>9.2.20.1</jruby.version>
@@ -143,10 +143,10 @@
         <antlr.version>4.3</antlr.version>
         <asm.version>9.5</asm.version>
         <awaitility.version>3.1.6</awaitility.version>
-        <bouncy.version>1.70</bouncy.version>
+        <bouncy.version>1.80</bouncy.version>
         <cal10n.version>0.8.1</cal10n.version>
         <cal10n.thirdparty.bundle.version>${cal10n.version}_1</cal10n.thirdparty.bundle.version>
-        <commons-compress.version>1.23.0</commons-compress.version>
+        <commons-compress.version>1.26.1</commons-compress.version>
         <commons.fileupload.version>1.5</commons.fileupload.version>
         <commons-codec.version>1.15</commons-codec.version>
         <commons-collections.version>3.2.2</commons-collections.version>

From ef9c817552c2733070252652b6cfbe3d6ca11d1f Mon Sep 17 00:00:00 2001
From: middlets719 <scott.middleton@connexta.com>
Date: Wed, 22 Jan 2025 09:19:42 -0700
Subject: [PATCH 5/6] Additional Dependency updates

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5369cd831a9d..7dcc555e5fa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
         <abdera.osgi.version>1.1.3_2</abdera.osgi.version>
         <abdera.version>1.1.3</abdera.version>
         <antlr.version>4.3</antlr.version>
-        <asm.version>9.5</asm.version>
+        <asm.version>9.6</asm.version>
         <awaitility.version>3.1.6</awaitility.version>
         <bouncy.version>1.80</bouncy.version>
         <cal10n.version>0.8.1</cal10n.version>
@@ -157,7 +157,7 @@
         <commons-exec.version>1.3</commons-exec.version>
         <commons-io.version>2.15.1</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <commons-lang3.version>3.13.0</commons-lang3.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
         <commons-logging.version>1.3.1</commons-logging.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <commons-net.version>3.5</commons-net.version>
@@ -706,7 +706,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.0</version>
                     <configuration>
                         <source>${maven.compiler.source}</source>
                         <target>${maven.compiler.target}</target>
@@ -779,7 +779,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
@@ -807,7 +807,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.4.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>ddf.support</groupId>

From 326c992c664887c9f44f90cf5956937815d69369 Mon Sep 17 00:00:00 2001
From: middlets719 <scott.middleton@connexta.com>
Date: Thu, 23 Jan 2025 12:32:03 -0700
Subject: [PATCH 6/6] Fix CSW comparison test when running on windows

---
 .../ogc/csw/catalog/converter/CswRecordConverterTest.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java b/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java
index dfa396c3da6f..8e589ba1e5da 100644
--- a/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java
+++ b/catalog/spatial/csw/spatial-csw-transformer/src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/converter/CswRecordConverterTest.java
@@ -137,7 +137,9 @@ public static void setUpBeforeClass() throws Exception {
     converter = new CswRecordConverter(getCswMetacardType());
 
     cswRecordXml =
-        IOUtils.toString(CswRecordConverterTest.class.getResourceAsStream("/Csw_Record_Text.xml"));
+        IOUtils.toString(
+            CswRecordConverterTest.class.getResourceAsStream("/Csw_Record_Text.xml"),
+            StandardCharsets.UTF_8);
   }
 
   @Test
@@ -489,7 +491,7 @@ public void testMetacardTransformWithCswRecordMetadata()
 
     BinaryContent content = converter.transform(metacard, args);
 
-    String xml = IOUtils.toString(content.getInputStream());
+    String xml = IOUtils.toString(content.getInputStream(), StandardCharsets.UTF_8);
     assertThat(xml, containsString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
     XMLUnit.setIgnoreWhitespace(true);
     assertXMLEqual(cswRecordXml, xml);