Remove empty comment line in Activator.java

Update OSGi dependencies and replace Properties with Hashtable in Activator

Add JDK 21 and JDK 25 test runners

Update dependencies

Author: RutujChheda

.github/workflows/main.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - '*'
+      - 'origin/*'
   pull_request:
     branches:
       - '*'
@@ -26,7 +27,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        jdk: [11, 17, 19]
+        jdk: [11, 17, 19, 21, 25]
         os: [ubuntu-latest, windows-latest, macos-latest]
       fail-fast: true
       max-parallel: 4

integration/pom.xml

@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.main</artifactId>
-      <version>5.6.1</version>
+      <version>7.0.5</version>
       <!--<version>2.0.2</version>-->
     </dependency>
   </dependencies>

osgi-over-slf4j/pom.xml

@@ -25,13 +25,13 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>4.2.0</version>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.enterprise</artifactId>
-      <version>4.2.0</version>
+      <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
 

osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java

@@ -32,7 +32,7 @@
 
 package org.slf4j.osgi.logservice.impl;
 
-import java.util.Properties;
+import java.util.Hashtable;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -57,7 +57,7 @@ public class Activator implements BundleActivator {
      */
     public void start(BundleContext bundleContext) throws Exception {
 
-        Properties props = new Properties();
+        Hashtable<String, String> props = new Hashtable<>();
         props.put("description", "An SLF4J LogService implementation.");
         ServiceFactory factory = new LogServiceFactory();
         bundleContext.registerService(LogService.class.getName(), factory, props);

parent/pom.xml

@@ -37,10 +37,10 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- used in integration testing -->
     <cal10n.version>0.8.1</cal10n.version>
-    <reload4j.version>1.2.22</reload4j.version>
+    <reload4j.version>1.2.26</reload4j.version>
     <logback.version>1.2.10</logback.version>
     <jcl.version>1.2</jcl.version>
-    <junit.version>4.13.1</junit.version>
+    <junit.version>4.13.2</junit.version>
     <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>

slf4j-ext/pom.xml

@@ -36,9 +36,9 @@
       <optional>true</optional>
     </dependency>		
     <dependency>
-      <groupId>javassist</groupId>
+      <groupId>org.javassist</groupId>
       <artifactId>javassist</artifactId>
-      <version>3.4.GA</version>
+      <version>3.30.2-GA</version>
       <optional>true</optional>
     </dependency>
   </dependencies>