diff --git a/base/pom.xml b/base/pom.xml
index 65701b4a3..ec68a0e3e 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-base</artifactId>
diff --git a/base/spotbugs-exclude.xml b/base/spotbugs-exclude.xml
index 8dea15d91..b0f7aa792 100644
--- a/base/spotbugs-exclude.xml
+++ b/base/spotbugs-exclude.xml
@@ -37,4 +37,26 @@
         <Method name="getDelegate" />
         <Bug pattern="EI_EXPOSE_REP" />
     </Match>
-</FindBugsFilter>
\ No newline at end of file
+
+    <!-- justification: constructors intentionally validate configuration and bootstrap external resources; these types are not finalizable and the warning is not actionable here -->
+    <Match>
+        <Class name="org.killbill.billing.platform.config.DefaultKillbillConfigSource" />
+        <Or>
+            <Method name="&lt;init&gt;" params="" />
+            <Method name="&lt;init&gt;" params="java.util.Map" />
+            <Method name="&lt;init&gt;" params="java.lang.String" />
+            <Method name="&lt;init&gt;" params="java.lang.String, java.util.Map" />
+        </Or>
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
+
+    <!-- justification: constructor bootstraps the in-memory RMI registry and may legitimately throw RemoteException during startup; this manager is not intended for finalization-sensitive inheritance -->
+    <Match>
+        <Class name="org.killbill.billing.platform.jndi.JNDIManager" />
+        <Or>
+            <Method name="&lt;init&gt;" params="" />
+            <Method name="&lt;init&gt;" params="int" />
+        </Or>
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
+</FindBugsFilter>
diff --git a/lifecycle/pom.xml b/lifecycle/pom.xml
index 2485fb31f..b12bed221 100644
--- a/lifecycle/pom.xml
+++ b/lifecycle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-lifecycle</artifactId>
@@ -40,16 +40,16 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/lifecycle/spotbugs-exclude.xml b/lifecycle/spotbugs-exclude.xml
index 1cc1caf12..79e26cf40 100644
--- a/lifecycle/spotbugs-exclude.xml
+++ b/lifecycle/spotbugs-exclude.xml
@@ -39,4 +39,21 @@
         <Method name="doFireStage" />
         <Bug pattern="DM_EXIT" />
     </Match>
-</FindBugsFilter>
\ No newline at end of file
+
+    <!-- justification: constructor eagerly discovers services and may fail fast on injector/bootstrap problems during lifecycle startup -->
+    <Match>
+        <Class name="org.killbill.billing.lifecycle.DefaultLifecycle" />
+        <Or>
+            <Method name="&lt;init&gt;" params="com.google.inject.Injector, org.killbill.billing.lifecycle.config.LifecycleConfig" />
+            <Method name="&lt;init&gt;" params="java.lang.Iterable" />
+        </Or>
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
+
+    <!-- justification: constructor performs classpath scanning immediately and intentionally fails fast if service discovery cannot be initialized -->
+    <Match>
+        <Class name="org.killbill.billing.lifecycle.ServiceFinder" />
+        <Method name="&lt;init&gt;" params="java.lang.ClassLoader, java.lang.String" />
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
+</FindBugsFilter>
diff --git a/lifecycle/src/main/java/org/killbill/billing/lifecycle/DefaultLifecycle.java b/lifecycle/src/main/java/org/killbill/billing/lifecycle/DefaultLifecycle.java
index 568165e0e..90dabad4a 100644
--- a/lifecycle/src/main/java/org/killbill/billing/lifecycle/DefaultLifecycle.java
+++ b/lifecycle/src/main/java/org/killbill/billing/lifecycle/DefaultLifecycle.java
@@ -32,7 +32,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.lifecycle.api.Lifecycle;
 import org.killbill.billing.lifecycle.config.LifecycleConfig;
diff --git a/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultBusService.java b/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultBusService.java
index ede9c7210..495733a52 100644
--- a/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultBusService.java
+++ b/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultBusService.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.lifecycle.bus;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.lifecycle.api.BusService;
 import org.killbill.billing.platform.api.LifecycleHandlerType;
diff --git a/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultExternalBusService.java b/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultExternalBusService.java
index d7761378e..4736b58b1 100644
--- a/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultExternalBusService.java
+++ b/lifecycle/src/main/java/org/killbill/billing/lifecycle/bus/DefaultExternalBusService.java
@@ -19,8 +19,8 @@
 
 package org.killbill.billing.lifecycle.bus;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.killbill.billing.lifecycle.api.ExternalBusService;
 import org.killbill.billing.lifecycle.glue.BusModule;
diff --git a/lifecycle/src/main/java/org/killbill/billing/lifecycle/glue/PersistentBusProvider.java b/lifecycle/src/main/java/org/killbill/billing/lifecycle/glue/PersistentBusProvider.java
index f03dba0cf..188fa1dc6 100644
--- a/lifecycle/src/main/java/org/killbill/billing/lifecycle/glue/PersistentBusProvider.java
+++ b/lifecycle/src/main/java/org/killbill/billing/lifecycle/glue/PersistentBusProvider.java
@@ -19,9 +19,9 @@
 
 package org.killbill.billing.lifecycle.glue;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
 
 import org.killbill.bus.DefaultPersistentBus;
 import org.killbill.bus.InMemoryPersistentBus;
diff --git a/lifecycle/src/test/java/org/killbill/billing/lifecycle/TestLifecycle.java b/lifecycle/src/test/java/org/killbill/billing/lifecycle/TestLifecycle.java
index ddb8f1eef..bf743e259 100644
--- a/lifecycle/src/test/java/org/killbill/billing/lifecycle/TestLifecycle.java
+++ b/lifecycle/src/test/java/org/killbill/billing/lifecycle/TestLifecycle.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.lifecycle.DefaultLifecycle.LifecycleHandler;
 import org.killbill.billing.platform.api.KillbillService;
diff --git a/osgi-api/pom.xml b/osgi-api/pom.xml
index ee107c342..526c588b7 100644
--- a/osgi-api/pom.xml
+++ b/osgi-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-api</artifactId>
diff --git a/osgi-bundles/bundles/eureka/pom.xml b/osgi-bundles/bundles/eureka/pom.xml
index a57c3795c..c2eb7c80f 100644
--- a/osgi-bundles/bundles/eureka/pom.xml
+++ b/osgi-bundles/bundles/eureka/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-eureka</artifactId>
@@ -74,15 +74,15 @@
             <artifactId>jakarta.activation-api</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
diff --git a/osgi-bundles/bundles/eureka/src/main/java/org/killbill/billing/osgi/bundles/eureka/EurekaServiceRegistry.java b/osgi-bundles/bundles/eureka/src/main/java/org/killbill/billing/osgi/bundles/eureka/EurekaServiceRegistry.java
index 6ee6b68f6..c04438e3a 100644
--- a/osgi-bundles/bundles/eureka/src/main/java/org/killbill/billing/osgi/bundles/eureka/EurekaServiceRegistry.java
+++ b/osgi-bundles/bundles/eureka/src/main/java/org/killbill/billing/osgi/bundles/eureka/EurekaServiceRegistry.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.osgi.bundles.eureka;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.osgi.api.ServiceDiscoveryRegistry;
 import org.slf4j.Logger;
diff --git a/osgi-bundles/bundles/graphite/pom.xml b/osgi-bundles/bundles/graphite/pom.xml
index 1590abf3b..d11322efb 100644
--- a/osgi-bundles/bundles/graphite/pom.xml
+++ b/osgi-bundles/bundles/graphite/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-graphite</artifactId>
@@ -40,6 +40,11 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <!-- Keep use the standard jakarta.servlet-api -->
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-jakarta-servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/osgi-bundles/bundles/influxdb/pom.xml b/osgi-bundles/bundles/influxdb/pom.xml
index c39aea326..a8e070192 100644
--- a/osgi-bundles/bundles/influxdb/pom.xml
+++ b/osgi-bundles/bundles/influxdb/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-influxdb</artifactId>
@@ -41,6 +41,11 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <!-- Keep use the standard jakarta.servlet-api -->
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-jakarta-servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/osgi-bundles/bundles/kpm/pom.xml b/osgi-bundles/bundles/kpm/pom.xml
index cd6e66d97..9e3a4a71e 100644
--- a/osgi-bundles/bundles/kpm/pom.xml
+++ b/osgi-bundles/bundles/kpm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-kpm</artifactId>
@@ -64,28 +64,20 @@
             <artifactId>jakarta.activation-api</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jooby</groupId>
-            <artifactId>jooby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jooby</groupId>
-            <artifactId>jooby-jackson</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
             <artifactId>killbill-api</artifactId>
@@ -117,6 +109,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.kill-bill.commons</groupId>
+            <artifactId>killbill-jooby</artifactId>
+            <exclusions>
+                <!-- slf4j-api is marked as provided: ignore RequireUpperBoundDeps errors -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-utils</artifactId>
diff --git a/osgi-bundles/bundles/kpm/spotbugs-exclude.xml b/osgi-bundles/bundles/kpm/spotbugs-exclude.xml
index e87d3ba5a..d682aa6d0 100644
--- a/osgi-bundles/bundles/kpm/spotbugs-exclude.xml
+++ b/osgi-bundles/bundles/kpm/spotbugs-exclude.xml
@@ -45,4 +45,25 @@
         <Method name="uninstall" params="java.lang.String, java.lang.String" />
         <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE" />
     </Match>
-</FindBugsFilter>
\ No newline at end of file
+
+    <!-- Justification: default bundles path intentionally falls back to the standard on-disk plugin install root when no property is configured -->
+    <Match>
+        <Class name="org.killbill.billing.osgi.bundles.kpm.KpmProperties" />
+        <Method name="getBundlesPath" />
+        <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" />
+    </Match>
+
+    <!-- Justification: constructor eagerly initializes downloader/DAO state and must fail fast when plugin management dependencies cannot be created -->
+    <Match>
+        <Class name="org.killbill.billing.osgi.bundles.kpm.impl.DefaultPluginManager" />
+        <Method name="&lt;init&gt;" params="org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI, org.killbill.billing.osgi.bundles.kpm.KpmProperties" />
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
+
+    <!-- Justification: constructor creates the persistent identifiers directory/file up front and intentionally aborts plugin management startup on filesystem initialization errors -->
+    <Match>
+        <Class name="org.killbill.billing.osgi.bundles.kpm.impl.FileBasedPluginIdentifiersDAO" />
+        <Method name="&lt;init&gt;" params="org.killbill.billing.osgi.bundles.kpm.KpmProperties" />
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
+</FindBugsFilter>
diff --git a/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/Activator.java b/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/Activator.java
index 35f728694..a06855248 100644
--- a/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/Activator.java
+++ b/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/Activator.java
@@ -22,8 +22,8 @@
 import java.util.Hashtable;
 import java.util.Properties;
 
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
 
 import org.jooby.json.Jackson;
 import org.killbill.billing.osgi.api.OSGIKillbillRegistrar;
diff --git a/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/PluginsResource.java b/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/PluginsResource.java
index b44e9d1d8..11928a89e 100644
--- a/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/PluginsResource.java
+++ b/osgi-bundles/bundles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/PluginsResource.java
@@ -21,8 +21,8 @@
 
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.jooby.Result;
 import org.jooby.Results;
diff --git a/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java b/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java
index 6051e29c3..6c09716c8 100644
--- a/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java
+++ b/osgi-bundles/bundles/kpm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java
@@ -23,6 +23,7 @@
 import org.killbill.billing.osgi.bundles.kpm.KpmProperties;
 import org.killbill.billing.osgi.bundles.kpm.PluginIdentifiersDAO;
 import org.killbill.billing.osgi.bundles.kpm.PluginManager.GetAvailablePluginsModel;
+import org.killbill.billing.osgi.bundles.kpm.TestUtils;
 import org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI;
 import org.killbill.billing.util.nodes.KillbillNodesApi;
 import org.killbill.billing.util.nodes.NodeInfo;
@@ -47,7 +48,7 @@ public void beforeMethod() {
         final OSGIKillbillAPI osgiKillbillAPI = Mockito.mock(OSGIKillbillAPI.class);
         Mockito.when(osgiKillbillAPI.getKillbillNodesApi()).thenReturn(nodesApi);
 
-        final Properties properties = new Properties();
+        final Properties properties = TestUtils.getTestProperties();
         properties.setProperty("org.killbill.billing.plugin.kpm.availablePlugins.cache.enabled", "true");
         final KpmProperties kpmProperties = new KpmProperties(properties);
 
diff --git a/osgi-bundles/bundles/logger/pom.xml b/osgi-bundles/bundles/logger/pom.xml
index 0eecf98c2..9e0a2f54f 100644
--- a/osgi-bundles/bundles/logger/pom.xml
+++ b/osgi-bundles/bundles/logger/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-logger</artifactId>
@@ -54,21 +54,6 @@
             <artifactId>org.apache.felix.framework</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jooby</groupId>
-            <artifactId>funzy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jooby</groupId>
-            <artifactId>jooby</artifactId>
-            <exclusions>
-                <!-- slf4j-api is marked as provided: ignore RequireUpperBoundDeps errors -->
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>
             <artifactId>killbill-api</artifactId>
@@ -99,6 +84,17 @@
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-concurrent</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.kill-bill.commons</groupId>
+            <artifactId>killbill-jooby</artifactId>
+            <exclusions>
+                <!-- slf4j-api is marked as provided: ignore RequireUpperBoundDeps errors -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-utils</artifactId>
diff --git a/osgi-bundles/bundles/logger/src/main/java/org/killbill/billing/osgi/bundles/logger/Activator.java b/osgi-bundles/bundles/logger/src/main/java/org/killbill/billing/osgi/bundles/logger/Activator.java
index c4d793651..26989abdd 100644
--- a/osgi-bundles/bundles/logger/src/main/java/org/killbill/billing/osgi/bundles/logger/Activator.java
+++ b/osgi-bundles/bundles/logger/src/main/java/org/killbill/billing/osgi/bundles/logger/Activator.java
@@ -21,8 +21,8 @@
 
 import java.util.Hashtable;
 
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
 
 import org.killbill.billing.osgi.api.OSGIKillbillRegistrar;
 import org.killbill.billing.osgi.api.OSGIPluginProperties;
diff --git a/osgi-bundles/bundles/metrics/pom.xml b/osgi-bundles/bundles/metrics/pom.xml
index 7abcbb4dc..0213e74e9 100644
--- a/osgi-bundles/bundles/metrics/pom.xml
+++ b/osgi-bundles/bundles/metrics/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-metrics</artifactId>
diff --git a/osgi-bundles/bundles/pom.xml b/osgi-bundles/bundles/pom.xml
index b5bbd4d2e..ff1fad4b9 100644
--- a/osgi-bundles/bundles/pom.xml
+++ b/osgi-bundles/bundles/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-all-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles</artifactId>
diff --git a/osgi-bundles/bundles/prometheus/pom.xml b/osgi-bundles/bundles/prometheus/pom.xml
index 25cef03a1..ed71efe95 100644
--- a/osgi-bundles/bundles/prometheus/pom.xml
+++ b/osgi-bundles/bundles/prometheus/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-prometheus</artifactId>
diff --git a/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/Activator.java b/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/Activator.java
index fb6062105..6c12d6ccf 100644
--- a/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/Activator.java
+++ b/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/Activator.java
@@ -19,7 +19,7 @@
 
 import java.util.Hashtable;
 
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
 
 import org.killbill.billing.osgi.api.OSGIPluginProperties;
 import org.killbill.billing.osgi.libs.killbill.KillbillActivatorBase;
diff --git a/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillExporter.java b/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillExporter.java
index 26ea614bb..9d48ba99a 100644
--- a/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillExporter.java
+++ b/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillExporter.java
@@ -27,9 +27,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.Predicate;
diff --git a/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillMetricsServlet.java b/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillMetricsServlet.java
index c8ad94e51..e4740ac75 100644
--- a/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillMetricsServlet.java
+++ b/osgi-bundles/bundles/prometheus/src/main/java/org/killbill/billing/osgi/bundles/prometheus/KillBillMetricsServlet.java
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import io.prometheus.client.CollectorRegistry;
 
diff --git a/osgi-bundles/defaultbundles/pom.xml b/osgi-bundles/defaultbundles/pom.xml
index f66460596..4c946ef4b 100644
--- a/osgi-bundles/defaultbundles/pom.xml
+++ b/osgi-bundles/defaultbundles/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-all-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-defaultbundles</artifactId>
diff --git a/osgi-bundles/libs/killbill/pom.xml b/osgi-bundles/libs/killbill/pom.xml
index a5f2d8e7b..a3d76b452 100644
--- a/osgi-bundles/libs/killbill/pom.xml
+++ b/osgi-bundles/libs/killbill/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-lib-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-lib-killbill</artifactId>
diff --git a/osgi-bundles/libs/pom.xml b/osgi-bundles/libs/pom.xml
index 99968f33f..aa05b4d33 100644
--- a/osgi-bundles/libs/pom.xml
+++ b/osgi-bundles/libs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-all-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-lib-bundles</artifactId>
diff --git a/osgi-bundles/libs/slf4j-osgi/pom.xml b/osgi-bundles/libs/slf4j-osgi/pom.xml
index c0b80a5ce..8e76fd669 100644
--- a/osgi-bundles/libs/slf4j-osgi/pom.xml
+++ b/osgi-bundles/libs/slf4j-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-lib-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-lib-slf4j-osgi</artifactId>
diff --git a/osgi-bundles/libs/slf4j-osgi/spotbugs-exclude.xml b/osgi-bundles/libs/slf4j-osgi/spotbugs-exclude.xml
index 945d673dc..351e90cf8 100644
--- a/osgi-bundles/libs/slf4j-osgi/spotbugs-exclude.xml
+++ b/osgi-bundles/libs/slf4j-osgi/spotbugs-exclude.xml
@@ -35,4 +35,17 @@
         <Bug pattern="EI_EXPOSE_REP,MS_EXPOSE_REP" />
     </Match>
 
-</FindBugsFilter>
\ No newline at end of file
+    <!-- justification: vendored SLF4J SimpleLogger initializes these process-wide configuration flags once during bootstrap and then treats them as global logger settings -->
+    <Match>
+        <Class name="org.slf4j.impl.SimpleLogger" />
+        <Or>
+            <Field name="LEVEL_IN_BRACKETS" />
+            <Field name="SHOW_DATE_TIME" />
+            <Field name="SHOW_LOG_NAME" />
+            <Field name="SHOW_SHORT_LOG_NAME" />
+            <Field name="SHOW_THREAD_NAME" />
+        </Or>
+        <Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE" />
+    </Match>
+
+</FindBugsFilter>
diff --git a/osgi-bundles/pom.xml b/osgi-bundles/pom.xml
index 38aac168e..1cc18ceb8 100644
--- a/osgi-bundles/pom.xml
+++ b/osgi-bundles/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-all-bundles</artifactId>
diff --git a/osgi-bundles/tests/beatrix/pom.xml b/osgi-bundles/tests/beatrix/pom.xml
index 7b10861d7..33c588d22 100644
--- a/osgi-bundles/tests/beatrix/pom.xml
+++ b/osgi-bundles/tests/beatrix/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-test-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-test-beatrix</artifactId>
diff --git a/osgi-bundles/tests/payment/pom.xml b/osgi-bundles/tests/payment/pom.xml
index 485cfb656..daee6e0f5 100644
--- a/osgi-bundles/tests/payment/pom.xml
+++ b/osgi-bundles/tests/payment/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-test-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-bundles-test-payment</artifactId>
diff --git a/osgi-bundles/tests/pom.xml b/osgi-bundles/tests/pom.xml
index df02b3bc9..fe2b7458e 100644
--- a/osgi-bundles/tests/pom.xml
+++ b/osgi-bundles/tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform-osgi-all-bundles</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi-test-bundles</artifactId>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 3939e9095..0b6f7e331 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-osgi</artifactId>
@@ -69,12 +69,12 @@
             <artifactId>guice</artifactId>
         </dependency>
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
diff --git a/osgi/spotbugs-exclude.xml b/osgi/spotbugs-exclude.xml
index 63b9165d2..bcebaab3e 100644
--- a/osgi/spotbugs-exclude.xml
+++ b/osgi/spotbugs-exclude.xml
@@ -68,10 +68,11 @@
         <Class name="org.killbill.billing.osgi.DefaultOSGIKillbill" />
         <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
     </Match>
+
+    <!-- justification: constructor validates plugin layout eagerly and intentionally throws when the plugin directory does not contain a usable bundle jar -->
     <Match>
-        <Class name="org.killbill.billing.osgi.http.DefaultHttpService" />
-        <Method name="&lt;init&gt;"/>
-        <Bug pattern="EI_EXPOSE_REP2" />
+        <Class name="org.killbill.billing.osgi.pluginconf.DefaultPluginJavaConfig" />
+        <Method name="&lt;init&gt;" params="java.lang.String, java.lang.String, java.lang.String, java.io.File, java.util.Properties, boolean, boolean" />
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
     </Match>
-
-</FindBugsFilter>
\ No newline at end of file
+</FindBugsFilter>
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/BundleRegistry.java b/osgi/src/main/java/org/killbill/billing/osgi/BundleRegistry.java
index 8b9a9c318..830bd1596 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/BundleRegistry.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/BundleRegistry.java
@@ -28,7 +28,7 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.osgi.api.DefaultPluginsInfoApi.DefaultPluginServiceInfo;
 import org.killbill.billing.osgi.api.OSGIServiceDescriptor;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java b/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java
index d478adedf..bdecb3d55 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java
@@ -20,7 +20,7 @@
 package org.killbill.billing.osgi;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.account.api.AccountUserApi;
 import org.killbill.billing.catalog.api.CatalogUserApi;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIService.java b/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIService.java
index 21218b519..89c75c034 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIService.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIService.java
@@ -27,8 +27,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.felix.framework.Felix;
 import org.apache.felix.framework.util.FelixConstants;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/FileInstall.java b/osgi/src/main/java/org/killbill/billing/osgi/FileInstall.java
index cdc0bb05b..158c3c22f 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/FileInstall.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/FileInstall.java
@@ -25,7 +25,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.osgi.api.KillbillNodesApiHolder;
 import org.killbill.billing.osgi.api.config.PluginConfig;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java b/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java
index de1ea244b..deff9df35 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java
@@ -29,9 +29,9 @@
 import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.Servlet;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.Servlet;
 import javax.sql.DataSource;
 
 import org.killbill.billing.catalog.plugin.api.CatalogPluginApi;
@@ -63,7 +63,6 @@
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.event.Event;
-import org.osgi.service.http.HttpService;
 import org.osgi.service.log.LogService;
 import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
@@ -80,7 +79,6 @@ public class KillbillActivator implements BundleActivator, AllServiceListener {
     private static final String LOG_SERVICE_NAME = "org.osgi.service.log.LogService";
 
     private final OSGIKillbill osgiKillbill;
-    private final HttpService defaultHttpService;
     private final DataSource dataSource;
     private final Clock clock;
     private final KillbillEventRetriableBusHandler killbillEventRetriableBusHandler;
@@ -103,7 +101,6 @@ public KillbillActivator(@Named(DefaultOSGIModule.OSGI_DATA_SOURCE_ID) final Dat
                              final OSGIKillbill osgiKillbill,
                              final Clock clock,
                              final BundleRegistry bundleRegistry,
-                             final HttpService defaultHttpService,
                              final KillbillEventRetriableBusHandler killbillEventRetriableBusHandler,
                              final KillbillEventObservable observable,
                              final OSGIConfigProperties configProperties,
@@ -112,7 +109,6 @@ public KillbillActivator(@Named(DefaultOSGIModule.OSGI_DATA_SOURCE_ID) final Dat
                              final JNDIManager jndiManager) {
         this.osgiKillbill = osgiKillbill;
         this.bundleRegistry = bundleRegistry;
-        this.defaultHttpService = defaultHttpService;
         this.dataSource = dataSource;
         this.clock = clock;
         this.killbillEventRetriableBusHandler = killbillEventRetriableBusHandler;
@@ -208,7 +204,6 @@ public void start(final BundleContext context) throws Exception {
         killbillEventRetriableBusHandler.register();
 
         registrar.registerService(context, OSGIKillbill.class, osgiKillbill, props);
-        registrar.registerService(context, HttpService.class, defaultHttpService, props);
         registrar.registerService(context, Observable.class, observable, props);
         registrar.registerService(context, DataSource.class, dataSource, props);
         registrar.registerService(context, OSGIConfigProperties.class, configProperties, props);
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventRetriableBusHandler.java b/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventRetriableBusHandler.java
index cad34f3fb..dcdd351fd 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventRetriableBusHandler.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/KillbillEventRetriableBusHandler.java
@@ -22,8 +22,8 @@
 import java.io.IOException;
 import java.util.UUID;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.killbill.billing.notification.plugin.api.ExtBusEvent;
 import org.killbill.billing.osgi.api.KillbillEventRetriableBusHandlerService;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/MetricRegistryServiceRegistration.java b/osgi/src/main/java/org/killbill/billing/osgi/MetricRegistryServiceRegistration.java
index 10481445e..41aacf9c4 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/MetricRegistryServiceRegistration.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/MetricRegistryServiceRegistration.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.killbill.billing.osgi.api.OSGIServiceDescriptor;
 import org.killbill.billing.osgi.api.OSGISingleServiceRegistration;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/OSGIListener.java b/osgi/src/main/java/org/killbill/billing/osgi/OSGIListener.java
index d2b67f3f3..3bfcdd76d 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/OSGIListener.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/OSGIListener.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.notification.plugin.api.BroadcastMetadata;
 import org.killbill.billing.notification.plugin.api.ExtBusEvent;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/PureOSGIBundleFinder.java b/osgi/src/main/java/org/killbill/billing/osgi/PureOSGIBundleFinder.java
index 90d83a146..072cc54a4 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/PureOSGIBundleFinder.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/PureOSGIBundleFinder.java
@@ -26,8 +26,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.killbill.billing.osgi.config.OSGIConfig;
 import org.killbill.billing.osgi.pluginconf.PluginConfigException;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/ServiceRegistryServiceRegistration.java b/osgi/src/main/java/org/killbill/billing/osgi/ServiceRegistryServiceRegistration.java
index 0c698a107..b47e54a91 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/ServiceRegistryServiceRegistration.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/ServiceRegistryServiceRegistration.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.killbill.billing.osgi.api.OSGIServiceDescriptor;
 import org.killbill.billing.osgi.api.OSGIServiceRegistration;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/api/DefaultPluginsInfoApi.java b/osgi/src/main/java/org/killbill/billing/osgi/api/DefaultPluginsInfoApi.java
index 652d786ed..ab63525d2 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/api/DefaultPluginsInfoApi.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/api/DefaultPluginsInfoApi.java
@@ -29,7 +29,7 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.osgi.BundleRegistry;
 import org.killbill.billing.osgi.BundleRegistry.BundleWithMetadata;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/api/KillbillNodesApiHolder.java b/osgi/src/main/java/org/killbill/billing/osgi/api/KillbillNodesApiHolder.java
index af9e3214e..531a1ea95 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/api/KillbillNodesApiHolder.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/api/KillbillNodesApiHolder.java
@@ -20,7 +20,7 @@
 package org.killbill.billing.osgi.api;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.util.nodes.KillbillNodesApi;
 
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/config/OSGIConfig.java b/osgi/src/main/java/org/killbill/billing/osgi/config/OSGIConfig.java
index 48c578df8..d947c970b 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/config/OSGIConfig.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/config/OSGIConfig.java
@@ -215,7 +215,7 @@ public interface OSGIConfig extends KillbillPlatformConfig {
              "javax.transaction.xa," +
              // XML (sax parser)
              "javax.xml," +
-             "javax.xml.bind," +
+             "jakarta.xml.bind," +
              "javax.xml.validation," +
              "javax.xml.namespace," +
              "javax.xml.parsers," +
@@ -254,15 +254,15 @@ public interface OSGIConfig extends KillbillPlatformConfig {
              "org.xml.sax," +
              "org.xml.sax.ext," +
              "org.xml.sax.helpers," +
-             // javax.servlet and javax.servlet.http are not exported by default - we
+             // jakarta.servlet and jakarta.servlet.http are not exported by default - we
              // need the bundles to see them for them to be able to register their servlets.
-             // Note: bundles should mark javax.servlet:servlet-api as provided
+             // Note: bundles should mark jakarta.servlet:jakarta.servlet-api as provided.
              "sun.misc," +
              "sun.misc.unsafe," +
              "sun.security," +
              "sun.security.util," +
-             "javax.servlet;version=4.0," +
-             "javax.servlet.http;version=4.0")
+             "jakarta.servlet;version=5.0," +
+             "jakarta.servlet.http;version=5.0")
     @Description("Java extension/platform Packages to export from the system bundle")
     public String getSystemBundleExportPackagesJava();
 
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/glue/DefaultOSGIModule.java b/osgi/src/main/java/org/killbill/billing/osgi/glue/DefaultOSGIModule.java
index 8fccb46ec..1f9a0f6bc 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/glue/DefaultOSGIModule.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/glue/DefaultOSGIModule.java
@@ -19,9 +19,9 @@
 
 package org.killbill.billing.osgi.glue;
 
-import javax.inject.Provider;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.inject.Provider;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
 import javax.sql.DataSource;
 
 import org.killbill.billing.osgi.BundleRegistry;
@@ -41,7 +41,6 @@
 import org.killbill.billing.osgi.api.PluginsInfoApi;
 import org.killbill.billing.osgi.api.config.PluginConfigServiceApi;
 import org.killbill.billing.osgi.config.OSGIConfig;
-import org.killbill.billing.osgi.http.DefaultHttpService;
 import org.killbill.billing.osgi.http.DefaultServletRouter;
 import org.killbill.billing.osgi.http.OSGIServlet;
 import org.killbill.billing.osgi.pluginconf.DefaultPluginConfigServiceApi;
@@ -52,7 +51,6 @@
 import org.killbill.billing.platform.glue.ReferenceableDataSourceSpyProvider;
 import org.killbill.commons.embeddeddb.EmbeddedDB;
 import org.killbill.commons.jdbi.guice.DaoConfig;
-import org.osgi.service.http.HttpService;
 import org.skife.config.AugmentedConfigurationObjectFactory;
 
 import com.google.inject.TypeLiteral;
@@ -115,15 +113,10 @@ protected void installOSGIComponents() {
         bind(PluginsInfoApi.class).to(DefaultPluginsInfoApi.class).asEagerSingleton();
     }
 
-    protected void installHttpService() {
-        bind(HttpService.class).to(DefaultHttpService.class).asEagerSingleton();
-    }
-
     @Override
     protected void configure() {
         installConfig();
         installOSGIServlet();
-        installHttpService();
         installDataSource();
         installOSGIComponents();
     }
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultHttpContext.java b/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultHttpContext.java
deleted file mode 100644
index fcfbca969..000000000
--- a/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultHttpContext.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2014 Ning, Inc.
- * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
- *
- * The Billing Project licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.killbill.billing.osgi.http;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.osgi.service.http.HttpContext;
-
-public class DefaultHttpContext implements HttpContext {
-
-    @Override
-    public boolean handleSecurity(final HttpServletRequest request, final HttpServletResponse response) throws IOException {
-        // Security should have already been handled by Shiro
-        return true;
-    }
-
-    @Override
-    public URL getResource(final String name) {
-        // Maybe it's in our classpath?
-        return DefaultHttpContext.class.getClassLoader().getResource(name);
-    }
-
-    @Override
-    public String getMimeType(final String name) {
-        return null;
-    }
-}
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultHttpService.java b/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultHttpService.java
deleted file mode 100644
index c75279cce..000000000
--- a/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultHttpService.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2010-2014 Ning, Inc.
- * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
- *
- * The Billing Project licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.killbill.billing.osgi.http;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-
-import org.killbill.billing.osgi.ContextClassLoaderHelper;
-import org.killbill.commons.metrics.api.MetricRegistry;
-import org.osgi.service.http.HttpContext;
-import org.osgi.service.http.HttpService;
-import org.osgi.service.http.NamespaceException;
-
-@Singleton
-public class DefaultHttpService implements HttpService {
-
-    private final DefaultServletRouter servletRouter;
-    private final MetricRegistry metricsRegistry;
-
-    @Inject
-    public DefaultHttpService(final DefaultServletRouter servletRouter, final MetricRegistry metricsRegistry) {
-        this.servletRouter = servletRouter;
-        this.metricsRegistry = metricsRegistry;
-    }
-
-    @Override
-    public void registerServlet(final String alias, final Servlet servlet, final Dictionary initparams, final HttpContext httpContext) throws ServletException {
-
-        if (alias == null) {
-            throw new IllegalArgumentException("Invalid alias (null)");
-        } else if (servlet == null) {
-            throw new IllegalArgumentException("Invalid servlet (null)");
-        }
-        final Servlet wrappedServlet = ContextClassLoaderHelper.getWrappedServiceWithCorrectContextClassLoader(servlet, Servlet.class, alias, metricsRegistry);
-
-        servletRouter.registerServiceFromPath(alias, wrappedServlet);
-    }
-
-    @Override
-    public void registerResources(final String alias, final String name, final HttpContext httpContext) throws NamespaceException {
-        final Servlet staticServlet = new StaticServlet(httpContext);
-        try {
-            registerServlet(alias, staticServlet, new Hashtable(), httpContext);
-        } catch (final ServletException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    @Override
-    public void unregister(final String alias) {
-        servletRouter.unregisterServiceFromPath(alias);
-    }
-
-    @Override
-    public HttpContext createDefaultHttpContext() {
-        return new DefaultHttpContext();
-    }
-}
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultServletRouter.java b/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultServletRouter.java
index 5eb73e8d6..73f44e6fc 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultServletRouter.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/http/DefaultServletRouter.java
@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Singleton;
-import javax.servlet.Servlet;
+import jakarta.inject.Singleton;
+import jakarta.servlet.Servlet;
 
 import org.killbill.billing.osgi.api.OSGIServiceDescriptor;
 import org.killbill.billing.osgi.api.OSGIServiceRegistration;
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/http/OSGIServlet.java b/osgi/src/main/java/org/killbill/billing/osgi/http/OSGIServlet.java
index bbac0088b..ae2861a14 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/http/OSGIServlet.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/http/OSGIServlet.java
@@ -22,15 +22,15 @@
 import java.io.IOException;
 import java.util.Vector;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.killbill.commons.utils.annotation.VisibleForTesting;
 
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/http/StaticServlet.java b/osgi/src/main/java/org/killbill/billing/osgi/http/StaticServlet.java
index e0da4dc71..59df89dec 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/http/StaticServlet.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/http/StaticServlet.java
@@ -23,12 +23,12 @@
 import java.io.InputStream;
 import java.net.URL;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.osgi.service.http.HttpContext;
 
diff --git a/osgi/src/main/java/org/killbill/billing/osgi/pluginconf/PluginFinder.java b/osgi/src/main/java/org/killbill/billing/osgi/pluginconf/PluginFinder.java
index 63f76d5d0..b18529cad 100644
--- a/osgi/src/main/java/org/killbill/billing/osgi/pluginconf/PluginFinder.java
+++ b/osgi/src/main/java/org/killbill/billing/osgi/pluginconf/PluginFinder.java
@@ -37,7 +37,7 @@
 import java.util.Properties;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.killbill.billing.osgi.api.config.PluginConfig;
 import org.killbill.billing.osgi.api.config.PluginJavaConfig;
diff --git a/osgi/src/test/java/org/killbill/billing/osgi/http/TestOSGIServlet.java b/osgi/src/test/java/org/killbill/billing/osgi/http/TestOSGIServlet.java
index 677613c4e..8963bda7c 100644
--- a/osgi/src/test/java/org/killbill/billing/osgi/http/TestOSGIServlet.java
+++ b/osgi/src/test/java/org/killbill/billing/osgi/http/TestOSGIServlet.java
@@ -22,14 +22,14 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.killbill.billing.osgi.ContextClassLoaderHelper;
 import org.killbill.commons.metrics.api.MetricRegistry;
diff --git a/platform-api/pom.xml b/platform-api/pom.xml
index e8fca26c7..65b9b77b2 100644
--- a/platform-api/pom.xml
+++ b/platform-api/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-api</artifactId>
     <packaging>jar</packaging>
     <name>killbill-platform-api</name>
-    <dependencies />
+    <dependencies/>
 </project>
diff --git a/platform-test/pom.xml b/platform-test/pom.xml
index c14e548f4..34336aae5 100644
--- a/platform-test/pom.xml
+++ b/platform-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-test</artifactId>
@@ -78,8 +78,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
@@ -278,8 +278,8 @@
                         <phase>initialize</phase>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-platform-osgi-bundles-test-beatrix-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-jar-with-dependencies.jar" />
-                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-platform-osgi-bundles-test-payment-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-jar-with-dependencies.jar" />
+                                <copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-platform-osgi-bundles-test-beatrix-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-jar-with-dependencies.jar"/>
+                                <copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-platform-osgi-bundles-test-payment-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-jar-with-dependencies.jar"/>
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/platform-test/spotbugs-exclude.xml b/platform-test/spotbugs-exclude.xml
index d613dd5ed..14bbe1193 100644
--- a/platform-test/spotbugs-exclude.xml
+++ b/platform-test/spotbugs-exclude.xml
@@ -38,5 +38,25 @@
         </Or>
         <Bug pattern="EI_EXPOSE_REP" />
     </Match>
+    <!-- justification: test helper intentionally uses a lazy singleton entry point while keeping the constructor
+         non-private for subclass-based test customization in this module -->
+    <Match>
+        <Class name="org.killbill.billing.platform.test.PlatformDBTestingHelper" />
+        <Bug pattern="SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR" />
+    </Match>
+    <!-- justification: test config source fails fast during bootstrap when loading defaults or creating the DB-backed
+         helper, and this constructor is only used in test infrastructure -->
+    <Match>
+        <Class name="org.killbill.billing.platform.test.config.TestKillbillConfigSource" />
+        <Method name="&lt;init&gt;" params="java.lang.String,java.lang.Class"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
+    <!-- justification: test config source eagerly validates file/default setup and DB helper wiring before tests run,
+         so constructor exceptions are expected bootstrap failures rather than production object-lifecycle issues -->
+    <Match>
+        <Class name="org.killbill.billing.platform.test.config.TestKillbillConfigSource" />
+        <Method name="&lt;init&gt;" params="java.lang.String,java.lang.Class,java.util.Map"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
 
-</FindBugsFilter>
\ No newline at end of file
+</FindBugsFilter>
diff --git a/platform-test/src/main/java/org/killbill/billing/platform/test/glue/TestPlatformModuleWithEmbeddedDB.java b/platform-test/src/main/java/org/killbill/billing/platform/test/glue/TestPlatformModuleWithEmbeddedDB.java
index 438fc6cbb..8531ca41a 100644
--- a/platform-test/src/main/java/org/killbill/billing/platform/test/glue/TestPlatformModuleWithEmbeddedDB.java
+++ b/platform-test/src/main/java/org/killbill/billing/platform/test/glue/TestPlatformModuleWithEmbeddedDB.java
@@ -20,8 +20,8 @@
 package org.killbill.billing.platform.test.glue;
 
 import javax.annotation.Nullable;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import javax.sql.DataSource;
 
 import org.killbill.billing.osgi.api.OSGIConfigProperties;
diff --git a/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/TestOSGIBase.java b/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/TestOSGIBase.java
index 184032355..fcf70c9f0 100644
--- a/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/TestOSGIBase.java
+++ b/platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/TestOSGIBase.java
@@ -21,8 +21,8 @@
 
 import java.util.concurrent.Callable;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import javax.sql.DataSource;
 
 import org.killbill.billing.beatrix.integration.osgi.glue.TestIntegrationModule;
diff --git a/pom.xml b/pom.xml
index 089dc1c2f..bceeb47ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,10 +56,123 @@
         <check.fail-spotbugs>true</check.fail-spotbugs>
         <!-- Bug with maven-deploy-plugin -->
         <deploy.deploy-at-end>false</deploy.deploy-at-end>
+        <extra-enforcer-rules.version>1.12.0</extra-enforcer-rules.version>
+        <guice.version>7.0.0</guice.version>
+        <!-- Required by killbill-skeleton -> org.glassfish.hk2:{guice-bridge,hk2-api,hk2-locator} -->
+        <hk2.version>3.0.6</hk2.version>
+        <!-- Required by killbill-api -> jakarta.xml.bind:jakarta.xml.bind-api:4.0.4 -->
+        <jakarta.activation-api.version>2.1.4</jakarta.activation-api.version>
+        <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
+        <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
+        <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
+        <!-- Required by killbill-skeleton -> org.glassfish.jersey.core:jersey-server:3.0.18 -->
+        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
+        <jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version>
+        <!-- Required by killbill-skeleton -> org.glassfish.jersey.inject:jersey-hk2:3.0.18 and org.glassfish.hk2:hk2-locator:3.0.6 -->
+        <javassist.version>3.30.2-GA</javassist.version>
+        <!-- Required by killbill-api -> jakarta.xml.bind:jakarta.xml.bind-api:4.0.4 -->
+        <jaxb-api.version>4.0.4</jaxb-api.version>
+        <!-- Required by killbill-commons:killbill-xmlloader:0.27.0 -->
+        <jaxb-runtime.version>4.0.4</jaxb-runtime.version>
+        <!-- Required by killbill-skeleton -> org.glassfish.jersey:{jersey-common,jersey-server,jersey-container-servlet-core,jersey-hk2} -->
+        <jersey.version>3.0.18</jersey.version>
+        <jetty.version>11.0.24</jetty.version>
+        <killbill-api.version>0.55.0-370fa77-SNAPSHOT</killbill-api.version>
+        <killbill-base-plugin.version>5.2.0-a5c0ade-SNAPSHOT</killbill-base-plugin.version>
+        <killbill-commons.version>0.27.0</killbill-commons.version>
+        <killbill-jooby.version>0.27.0</killbill-jooby.version>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+        <project.build.targetJdk>21</project.build.targetJdk>
+        <spotbugs-maven-plugin.version>4.9.8.3</spotbugs-maven-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>${guice.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-servlet</artifactId>
+                <version>${guice.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>${jakarta.activation-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject-api</artifactId>
+                <version>${jakarta.inject-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
+                <version>${jakarta.validation-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jaxb-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.hk2</groupId>
+                <artifactId>guice-bridge</artifactId>
+                <version>${hk2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.hk2</groupId>
+                <artifactId>hk2-api</artifactId>
+                <version>${hk2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.hk2</groupId>
+                <artifactId>hk2-locator</artifactId>
+                <version>${hk2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${jaxb-runtime.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.activation</groupId>
+                        <artifactId>jakarta.activation</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.containers</groupId>
+                <artifactId>jersey-container-servlet-core</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-common</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-server</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.inject</groupId>
+                <artifactId>jersey-hk2</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>${javassist.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.kill-bill.billing</groupId>
                 <artifactId>killbill-platform-api</artifactId>
@@ -193,6 +306,31 @@
                 <artifactId>killbill-platform-test</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.kill-bill.commons</groupId>
+                <artifactId>killbill-jooby</artifactId>
+                <version>${killbill-jooby.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>${spotbugs-maven-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>extra-enforcer-rules</artifactId>
+                        <version>${extra-enforcer-rules.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/server/pom.xml b/server/pom.xml
index 0b8e3d9cc..b305951fa 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-platform</artifactId>
-        <version>0.41.20-SNAPSHOT</version>
+        <version>0.42.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-platform-server</artifactId>
@@ -80,12 +80,12 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -115,6 +115,11 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <!-- Keep use the standard jakarta.servlet-api -->
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-jakarta-servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java b/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java
index 66aea5ec6..1ae3483ca 100644
--- a/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java
+++ b/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java
@@ -19,8 +19,8 @@
 
 package org.killbill.billing.server.filters;
 
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
 
 import org.killbill.billing.server.healthchecks.KillbillHealthcheck;
 import org.killbill.billing.server.updatechecker.UpdateChecker;
diff --git a/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillHealthcheck.java b/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillHealthcheck.java
index 3ca7e5000..c75c0b8cb 100644
--- a/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillHealthcheck.java
+++ b/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillHealthcheck.java
@@ -24,8 +24,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.killbill.billing.osgi.api.OSGIServiceRegistration;
 import org.killbill.billing.osgi.api.ServiceDiscoveryRegistry;
diff --git a/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillPluginsHealthcheck.java b/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillPluginsHealthcheck.java
index 67a056c61..e50c18f27 100644
--- a/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillPluginsHealthcheck.java
+++ b/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillPluginsHealthcheck.java
@@ -23,8 +23,8 @@
 import java.util.Map;
 
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.killbill.billing.osgi.api.Healthcheck;
 import org.killbill.billing.osgi.api.Healthcheck.HealthStatus;
diff --git a/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillQueuesHealthcheck.java b/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillQueuesHealthcheck.java
index bf356a477..3e99e5677 100644
--- a/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillQueuesHealthcheck.java
+++ b/server/src/main/java/org/killbill/billing/server/healthchecks/KillbillQueuesHealthcheck.java
@@ -26,9 +26,9 @@
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import org.apache.commons.math3.stat.regression.SimpleRegression;
 import org.joda.time.DateTime;
diff --git a/server/src/main/java/org/killbill/billing/server/listeners/KillbillPlatformGuiceListener.java b/server/src/main/java/org/killbill/billing/server/listeners/KillbillPlatformGuiceListener.java
index c8cdbbcd0..5625a1bc3 100644
--- a/server/src/main/java/org/killbill/billing/server/listeners/KillbillPlatformGuiceListener.java
+++ b/server/src/main/java/org/killbill/billing/server/listeners/KillbillPlatformGuiceListener.java
@@ -23,8 +23,8 @@
 import java.net.URISyntaxException;
 import java.util.List;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 
 import org.killbill.billing.lifecycle.api.BusService;
 import org.killbill.billing.lifecycle.api.Lifecycle;
diff --git a/server/src/main/java/org/killbill/billing/server/modules/DistributedClockProvider.java b/server/src/main/java/org/killbill/billing/server/modules/DistributedClockProvider.java
index 71dae59ed..6068218e4 100644
--- a/server/src/main/java/org/killbill/billing/server/modules/DistributedClockProvider.java
+++ b/server/src/main/java/org/killbill/billing/server/modules/DistributedClockProvider.java
@@ -19,8 +19,8 @@
 
 package org.killbill.billing.server.modules;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.killbill.billing.server.config.KillbillServerConfig;
 import org.killbill.clock.DistributedClockMock;
diff --git a/server/src/main/java/org/killbill/billing/server/modules/EmbeddedDBProvider.java b/server/src/main/java/org/killbill/billing/server/modules/EmbeddedDBProvider.java
index 0e3f49416..1ab528add 100644
--- a/server/src/main/java/org/killbill/billing/server/modules/EmbeddedDBProvider.java
+++ b/server/src/main/java/org/killbill/billing/server/modules/EmbeddedDBProvider.java
@@ -31,8 +31,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.killbill.billing.server.dao.EmbeddedDBFactory;
 import org.killbill.commons.embeddeddb.EmbeddedDB;
diff --git a/server/src/main/java/org/killbill/billing/server/modules/KillbillPlatformModule.java b/server/src/main/java/org/killbill/billing/server/modules/KillbillPlatformModule.java
index c7dc1a277..162c6485f 100644
--- a/server/src/main/java/org/killbill/billing/server/modules/KillbillPlatformModule.java
+++ b/server/src/main/java/org/killbill/billing/server/modules/KillbillPlatformModule.java
@@ -19,10 +19,10 @@
 
 package org.killbill.billing.server.modules;
 
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+import jakarta.servlet.ServletContext;
 import javax.sql.DataSource;
 
 import org.killbill.billing.lifecycle.glue.BusModule;
diff --git a/server/src/main/java/org/killbill/billing/server/modules/RODBIProvider.java b/server/src/main/java/org/killbill/billing/server/modules/RODBIProvider.java
index 80f0ab05a..29f876243 100644
--- a/server/src/main/java/org/killbill/billing/server/modules/RODBIProvider.java
+++ b/server/src/main/java/org/killbill/billing/server/modules/RODBIProvider.java
@@ -19,8 +19,8 @@
 
 package org.killbill.billing.server.modules;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import javax.sql.DataSource;
 
 import org.killbill.commons.jdbi.guice.DBIProvider;
diff --git a/server/src/main/java/org/killbill/billing/server/updatechecker/ClientInfo.java b/server/src/main/java/org/killbill/billing/server/updatechecker/ClientInfo.java
index 447092e6f..52aa201fb 100644
--- a/server/src/main/java/org/killbill/billing/server/updatechecker/ClientInfo.java
+++ b/server/src/main/java/org/killbill/billing/server/updatechecker/ClientInfo.java
@@ -22,7 +22,7 @@
 import java.net.InetAddress;
 import java.util.Objects;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.killbill.commons.utils.StandardSystemProperty;
 import org.killbill.commons.utils.Strings;
diff --git a/server/src/main/java/org/killbill/billing/server/updatechecker/UpdateChecker.java b/server/src/main/java/org/killbill/billing/server/updatechecker/UpdateChecker.java
index f4e5d4d0e..1b023152d 100644
--- a/server/src/main/java/org/killbill/billing/server/updatechecker/UpdateChecker.java
+++ b/server/src/main/java/org/killbill/billing/server/updatechecker/UpdateChecker.java
@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.killbill.billing.server.config.UpdateCheckConfig;
 import org.skife.config.ConfigSource;