LDEV-6044 add spifly for osgi support, update log4j to 2.25.3

core/src/main/java/META-INF/MANIFEST.MF

@@ -6,7 +6,7 @@ Minor-Name-Explanation: https://en.wikipedia.org/wiki/Balto
 State: beta
 Bundle-Name: Lucee Core
 Multi-Release: true
-Require-Bundle-Fragment: slf4j.nop;bundle-version=1.7.36
+Require-Bundle-Fragment: slf4j.nop;bundle-version=2.0.17
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: lucee.core
 Bundle-ClassPath: .,META-INF/
@@ -328,8 +328,8 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0,
  org.lucee.commons.logging;bundle-version=1.2.0.0000L,
  org.apache.commons.commons-pool2;bundle-version=2.12.1,
  org.apache.oro;bundle-version=2.0.8,
- org.lucee.log4j-core;bundle-version=2.25.1,
- org.lucee.log4j-api;bundle-version=2.25.1,
+ org.apache.logging.log4j.core;bundle-version=2.25.3,
+ org.apache.logging.log4j.api;bundle-version=2.25.3,
  org.lucee.portlet;bundle-version=1.0.0,
  org.lucee.jta;bundle-version=1.1.0,
  fusiondebug.api.server;bundle-version=1.0.20,
@@ -341,13 +341,14 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0,
  jcifs;bundle-version=1.3.17,
  jencrypt;bundle-version=1.4.2.04,
  org.lucee.tika-core;bundle-version=1.28.4,
+ org.apache.aries.spifly.dynamic.bundle;bundle-version=1.3.7,
  org.objectweb.asm.tree.analysis;bundle-version=9.8,
  org.objectweb.asm.tree;bundle-version=9.8,
  org.objectweb.asm.commons;bundle-version=9.8,
  org.objectweb.asm.util;bundle-version=9.8,
  org.objectweb.asm;bundle-version=9.8,
  org.lucee.xml.resolver;bundle-version=1.2.0,
- slf4j.api;bundle-version=1.7.36,
+ slf4j.api;bundle-version=2.0.17,
  org.lucee.commons-email-all;bundle-version=1.6.0,
  tagsoup;bundle-version=1.2.1.0002L,
  org.lucee.jzlib;bundle-version=1.1.3,

core/src/main/java/META-INF/osgi-maven-mapping.ini

@@ -1075,10 +1075,18 @@ artifactId=postgresql
 groupId=com.amazonaws
 artifactId=aws-java-sdk-support
 
+[org.apache.logging.log4j.api]
+groupId=org.apache.logging.log4j
+artifactId=log4j-api
+
 [org.apache.logging.log4j.core]
 groupId=org.apache.logging.log4j
 artifactId=log4j-core
 
+[org.apache.aries.spifly.dynamic.bundle]
+groupId=org.apache.aries.spifly
+artifactId=org.apache.aries.spifly.dynamic.bundle
+
 [hypersonic.hsqldb]
 groupId=org.hsqldb
 artifactId=hsqldb

loader/pom.xml

@@ -414,6 +414,12 @@
     <version>1.28.4</version>
     <scope>provided</scope>
   </dependency>
+  <dependency>
+    <groupId>org.apache.aries.spifly</groupId>
+    <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+    <version>1.3.7</version>
+    <scope>provided</scope>
+  </dependency>
   <dependency>
     <groupId>commons-codec</groupId>
     <artifactId>commons-codec</artifactId>
@@ -488,14 +494,16 @@
     <scope>provided</scope>
   </dependency>
   <dependency>
-    <groupId>org.lucee</groupId>
+    <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-core</artifactId>
-    <version>2.25.1</version>
+    <version>2.25.3</version>
+    <scope>provided</scope>
   </dependency>
   <dependency>
-    <groupId>org.lucee</groupId>
+    <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-api</artifactId>
-    <version>2.25.1</version>
+    <version>2.25.3</version>
+    <scope>provided</scope>
   </dependency>
   <dependency>
     <groupId>org.lucee</groupId>
@@ -596,13 +604,13 @@
   <dependency>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-api</artifactId>
-    <version>1.7.36</version>
+    <version>2.0.17</version>
     <scope>provided</scope>
   </dependency>
   <dependency>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-nop</artifactId>
-    <version>1.7.36</version>
+    <version>2.0.17</version>
     <scope>provided</scope>
   </dependency>
   <dependency>
@@ -645,13 +653,13 @@
       <dependency>
           <groupId>org.apache.tomcat.embed</groupId>
           <artifactId>tomcat-embed-core</artifactId>
-          <version>9.0.108</version>
+          <version>9.0.113</version>
       </dependency>
       <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-annotations-api -->
       <dependency>
           <groupId>org.apache.tomcat</groupId>
           <artifactId>tomcat-annotations-api</artifactId>
-          <version>9.0.108</version>
+          <version>9.0.113</version>
       </dependency>
 
     <dependency>

loader/src/main/java/lucee/loader/engine/BundleProvider.java

@@ -229,7 +229,9 @@ public final class BundleProvider {
 		put(mappingsFallback, "org.apache.felix.framework", new Info("org.apache.felix", "org.apache.felix.framework"));
 		put(mappingsFallback, "org.apache.fop", new Info[0]);
 		put(mappingsFallback, "org.apache.hadoop.zookeeper", new Info[0]);
+		put(mappingsFallback, "org.apache.logging.log4j.api", new Info("org.apache.logging.log4j", "log4j-api"));
 		put(mappingsFallback, "org.apache.logging.log4j.core", new Info("org.apache.logging.log4j", "log4j-core"));
+		put(mappingsFallback, "org.apache.aries.spifly.dynamic.bundle", new Info("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.bundle"));
 		put(mappingsFallback, "org.apache.oro", new Info[0]);
 		put(mappingsFallback, "org.apache.pdfbox", new Info("org.apache.pdfbox", "pdfbox"));
 		put(mappingsFallback, "org.apache.pdfbox.fontbox", new Info("org.apache.pdfbox", "fontbox"));