moving to log4j2

CrescoEdge · Jun 13, 2024 · e3a81b1 · e3a81b1
1 parent 5d81526
commit e3a81b1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,18 +30,19 @@
 
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>6.0.0</version>
+                <artifactId>osgi.core</artifactId>
+                <version>7.0.0</version>
                 <scope>provided</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>osgi.cmpn</artifactId>
-                <version>6.0.0</version>
+                <version>7.0.0</version>
                 <scope>provided</scope>
             </dependency>
 
+            <!--
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>osgi.annotation</artifactId>
@@ -68,6 +69,7 @@
                 <version>1.4.0</version>
                 <scope>provided</scope>
             </dependency>
+            -->
 
         </dependencies>
 

diff --git a/src/main/java/io/cresco/logger/Activator.java b/src/main/java/io/cresco/logger/Activator.java
@@ -54,10 +54,15 @@ public void start( final BundleContext bundleContext )
 
         osgiService = installInternalBundleJars(bundleContext,"org.osgi.service.cm-1.6.0.jar");
         osgiService.start();
-        loggerService = installInternalBundleJars(bundleContext,"pax-logging-service-1.10.4.jar");
-        //Bundle loggerService = installInternalBundleJars(bundleContext,"pax-logging-service-1.11.3.jar");
-        loggerAPI = installInternalBundleJars(bundleContext,"pax-logging-api-1.10.4.jar");
-        //Bundle loggerAPI = installInternalBundleJars(bundleContext,"pax-logging-api-1.11.3.jar");
+
+        //loggerService = installInternalBundleJars(bundleContext,"pax-logging-service-1.11.17.jar");
+        //loggerAPI = installInternalBundleJars(bundleContext,"pax-logging-api-1.11.17.jar");
+
+        //loggerService = installInternalBundleJars(bundleContext,"pax-logging-service-1.10.4.jar");
+        //loggerAPI = installInternalBundleJars(bundleContext,"pax-logging-api-1.10.4.jar");
+        loggerService = installInternalBundleJars(bundleContext,"pax-logging-log4j2-2.2.7.jar");
+        loggerAPI = installInternalBundleJars(bundleContext,"pax-logging-api-2.2.7.jar");
+
         loggerService.start();
         loggerAPI.start();
 

diff --git a/src/main/resources/pax-logging-api-2.2.7.jar b/src/main/resources/pax-logging-api-2.2.7.jar
diff --git a/src/main/resources/pax-logging-log4j2-2.2.7.jar b/src/main/resources/pax-logging-log4j2-2.2.7.jar