diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86d57f72..e5b70f1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,11 @@ on:
 jobs:
   ci:
     uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
+    with:
+      test-profile-matrix: '[ "travis", "integration-mysql", "integration-postgresql" ]'
+    secrets:
+      CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+      CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
 
   integration_test:
     uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main
@@ -16,3 +21,6 @@ jobs:
       integration_tests_goal: 'test:plugins:analytics'
       ddl_file: 'src/main/resources/org/killbill/billing/plugin/analytics/ddl.sql'
       integration_tests_ref: 'refs/heads/master'
+    secrets:
+      CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+      CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
diff --git a/.github/workflows/cloudsmith_release.yml b/.github/workflows/cloudsmith_release.yml
deleted file mode 100644
index e2737981..00000000
--- a/.github/workflows/cloudsmith_release.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: cloudsmith_release
-
-on:
-  workflow_dispatch:
-
-jobs:
-  cloudsmith_release:
-    uses: killbill/gh-actions-shared/.github/workflows/cloudsmith_release.yml@main
-    with:
-      group_id: org.kill-bill.billing.plugin.java
-      artifact_id: analytics-plugin
-    secrets:
-      CLOUDSMITH_REPO: ${{ secrets.CLOUDSMITH_REPO }}
-      CLOUDSMITH_USER: ${{ secrets.CLOUDSMITH_USER }}
-      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c1506847..7d120c83 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -8,3 +8,6 @@ on:
 jobs:
   analyze:
     uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main
+    secrets:
+      CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+      CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c8bfeeba..ee54732b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,80 +12,18 @@ on:
         required: false
         default: ''
 
-env:
-  MAVEN_FLAGS: "-B --no-transfer-progress"
-  MAVEN_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError -Dmaven.wagon.rto=60000 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3"
-
 jobs:
   release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        if: github.event.inputs.perform_version == ''
-        uses: actions/checkout@v2
-      - name: Checkout full repository
-        # Required when performing an existing release.
-        if: github.event.inputs.perform_version != ''
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
-      - name: Setup git user
-        env:
-          BUILD_USER: ${{ secrets.BUILD_USER }}
-          BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }}
-        run: |
-          git config --global user.email "contact@killbill.io"
-          git config --global user.name "Kill Bill core team"
-          git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:"
-      - name: Configure Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Download Java dependencies
-        # We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82)
-        run: |
-          mvn ${MAVEN_FLAGS} clean install dependency:resolve dependency:resolve-plugins -DskipTests=true -Dgpg.skip=true -Psonatype-oss-release
-      - name: Update killbill-oss-parent
-        if: github.event.inputs.parent_version != ''
-        run: |
-          echo "Updating killbill-oss-parent pom.xml to ${{ github.event.inputs.parent_version }}:"
-          mvn ${MAVEN_FLAGS} versions:update-parent -DgenerateBackupPoms=false -DparentVersion="[${{ github.event.inputs.parent_version }}]"
-          echo "killbill-oss-parent pom.xml changes:"
-          git --no-pager diff
-          echo "Downloading new dependencies:"
-          mvn ${MAVEN_FLAGS} -U clean install -DskipTests=true
-
-          git add pom.xml
-          # Will be pushed as part of the release process, only if the release is successful
-          git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}"
-      - name: Configure settings.xml for release
-        uses: actions/setup-java@v3
-        with:
-          java-version: 11
-          distribution: temurin
-          server-id: central
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
-          gpg-passphrase: GPG_PASSPHRASE
-      - name: Release artifacts
-        if: github.event.inputs.perform_version == ''
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        # It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above).
-        run: |
-          mvn ${MAVEN_FLAGS} release:clean release:prepare release:perform
-      - name: Perform release
-        if: github.event.inputs.perform_version != ''
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        # It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above).
-        # See https://issues.apache.org/jira/browse/SCM-729 for why the release.properties file is required.
-        run: |
-          echo "scm.url=scm\:git\:git@github.com\:${GITHUB_REPOSITORY}.git" > release.properties
-          echo "scm.tag=${{ github.event.inputs.perform_version }}" >> release.properties
-          mvn ${MAVEN_FLAGS} release:perform
+    uses: killbill/gh-actions-shared/.github/workflows/release.yml@main
+    with:
+      parent_version: ${{ github.event.inputs.parent_version }}
+      perform_version: ${{ github.event.inputs.perform_version }}
+    secrets:
+      BUILD_USER: ${{ secrets.BUILD_USER }}
+      BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }}
+      CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+      CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
+      CLOUDSMITH_DISTRIBUTION_MAN_USERNAME: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_USERNAME }}
+      CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD }}
+      GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+      GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
new file mode 100644
index 00000000..d4ea57aa
--- /dev/null
+++ b/.github/workflows/snapshot.yml
@@ -0,0 +1,14 @@
+name: snapshot
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  snapshot:
+    uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main
+    secrets:
+      CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+      CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
+      CLOUDSMITH_DISTRIBUTION_MAN_USERNAME: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_USERNAME }}
+      CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD }}
diff --git a/README.md b/README.md
index 17f66c0a..e7c358f3 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,14 @@ Kill Bill plugin to provide business analytics and reporting capabilities. You c
 |          7.1.y |            0.22.z |
 |          7.2.y |            0.22.z |
 |          8.0.y |            0.24.z |
+|          9.0.y |            0.26.z |
 
 ### Release notes
 
 * Starting with `7.2.0`, the configuration is using a YAML format, instead of key-value pairs.
 * We've upgraded numerous dependencies in `7.1.x` (required for Java 11 support).
 * Version `8.1.0` of the plugin includes a DDL change. So, upgrading to this version requires running [this](https://github.com/killbill/killbill-analytics-plugin/blob/63c968f46001c7662d46464e608304c5bcd003bc/src/main/resources/migration/V20230712110325__rename_value_to_field_value_in_all_tables.sql) migration.
+* Version `9.0.x` mark of removal Java EE `javax` namespace and one need to use jakarta namespace instead. 
 
 ## Requirements
 
diff --git a/docker/docker-compose.ci.mysql.yml b/docker/docker-compose.ci.mysql.yml
index 46f3b2dc..7d98d77a 100644
--- a/docker/docker-compose.ci.mysql.yml
+++ b/docker/docker-compose.ci.mysql.yml
@@ -20,7 +20,7 @@ version: '3.8'
 services:
   killbill:
     network_mode: host
-    image: killbill/killbill:0.24.0
+    image: xsalefter/killbill:0.25.4
     environment:
       - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
       - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill
diff --git a/docker/docker-compose.ci.postgresql.yml b/docker/docker-compose.ci.postgresql.yml
index 9d41fa45..4e7f0433 100644
--- a/docker/docker-compose.ci.postgresql.yml
+++ b/docker/docker-compose.ci.postgresql.yml
@@ -20,7 +20,7 @@ version: '3.8'
 services:
   killbill:
     network_mode: host
-    image: killbill/killbill:0.24.0
+    image: xsalefter/killbill:0.25.4
     environment:
       - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
       - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill
diff --git a/pom.xml b/pom.xml
index 62a5eaf1..a60b162c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,11 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.63</version>
+        <version>0.147.30</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>analytics-plugin</artifactId>
-    <version>8.1.5-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Kill Bill OSGI Analytics bundle</name>
     <description>Kill Bill Analytics plugin</description>
@@ -42,20 +42,13 @@
         <url>https://github.com/killbill/killbill-analytics-plugin/issues</url>
     </issueManagement>
     <properties>
-        <check.fail-spotbugs>false</check.fail-spotbugs>
+        <check.fail-spotbugs>true</check.fail-spotbugs>
         <check.spotbugs-exclude-filter-file>spotbugs-exclude.xml</check.spotbugs-exclude-filter-file>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
         <osgi.private>org.killbill.billing.plugin.analytics.*</osgi.private>
+        <!-- Match 2 things: Repo name in both github.com/killbill and Cloudsmith -->
+        <repository.cloudsmith.repo>killbill-analytics-plugin</repository.cloudsmith.repo>
     </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.reactivestreams</groupId>
-                <artifactId>reactive-streams</artifactId>
-                <version>1.0.3</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>com.bpodgursky</groupId>
@@ -86,10 +79,6 @@
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -114,15 +103,19 @@
             <artifactId>embedded-postgres</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </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>joda-time</groupId>
             <artifactId>joda-time</artifactId>
@@ -158,10 +151,6 @@
             <artifactId>log4jdbc-log4j2-jdbc4</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jooby</groupId>
-            <artifactId>jooby</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
@@ -201,12 +190,24 @@
         <dependency>
             <groupId>org.kill-bill.billing.plugin.java</groupId>
             <artifactId>killbill-base-plugin</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.kill-bill.commons</groupId>
+                    <artifactId>killbill-jooby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing.plugin.java</groupId>
             <artifactId>killbill-base-plugin</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.kill-bill.commons</groupId>
+                    <artifactId>killbill-jooby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
@@ -245,6 +246,10 @@
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-jdbi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.kill-bill.commons</groupId>
+            <artifactId>killbill-jooby</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-locker</artifactId>
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
index 915b376c..320d21dc 100644
--- a/spotbugs-exclude.xml
+++ b/spotbugs-exclude.xml
@@ -25,4 +25,85 @@
             <Class name="org.killbill.billing.plugin.analytics.reports.KillBillArithmeticExprParser"/>
         </Or>
     </Match>
+
+    <!-- justification: this whole plugin's DTOs/DAOs (BusinessXXX, XXXModelDao, json.*) are plain data holders whose
+         getters/setters/constructors intentionally return or store their Collection/Map/DateTime fields directly
+         (no defensive copies), matching the same convention already excluded repo-wide in killbill/spotbugs-exclude.xml. -->
+    <Match>
+        <Class name="~org\.killbill\.billing\.plugin\.analytics\..*"/>
+        <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
+    </Match>
+
+    <!-- justification: ObjectMapperProvider is a static utility exposing shared, intentionally mutable
+         Jackson ObjectMapper/ObjectWriter singletons; this is the same accessor-exposure pattern as
+         EI_EXPOSE_REP above, just flagged under the static-field variant of the bug. -->
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.http.ObjectMapperProvider"/>
+        <Bug pattern="MS_EXPOSE_REP"/>
+    </Match>
+
+    <!-- justification: constructors below eagerly wire notification queues / JDBI-jOOQ metadata / parse
+         configuration and should fail fast during plugin startup if that eager initialization fails,
+         rather than defer the error. Same accepted pattern as killbill/spotbugs-exclude.xml. -->
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.AnalyticsListener"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.api.core.AnalyticsConfiguration"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.dao.factory.BusinessContextFactory"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.reports.ReportsUserApi"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.reports.SqlReportDataExtractor"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.reports.scheduler.JobsScheduler"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.reports.sql.Metadata"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+
+    <!-- justification: org.jooq.Parser#parseQuery(String) never returns null (it throws ParserException on
+         failure); SpotBugs' interface-dispatch nullness inference cannot see that contract and flags a false
+         positive null dereference on the returned Query in these two call sites. -->
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.reports.SqlReportDataExtractor"/>
+        <Method name="&lt;init&gt;"/>
+        <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
+    </Match>
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.reports.sql.Metadata"/>
+        <Method name="getTemplateVariables"/>
+        <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
+    </Match>
+
+    <!-- justification: org.jooq.SelectConditionStep#and(Condition) is annotated @CheckReturnValue, but its
+         concrete implementation (org.jooq.impl.SelectImpl#and, jooq-3.14.16 sources) mutates the shared
+         underlying SelectQueryImpl in place and returns "this" rather than a new step. "statement" here is
+         that same mutable instance, so the call at SqlReportDataExtractor.java:149 already applies the
+         tenant_record_id condition to it even though the (identical) return value is not reassigned.
+         SpotBugs cannot see this same-instance mutation semantics from the annotation alone. -->
+    <Match>
+        <Class name="org.killbill.billing.plugin.analytics.reports.SqlReportDataExtractor"/>
+        <Method name="toString"/>
+        <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
+    </Match>
 </FindBugsFilter>
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java
index a12e3fd1..28ad3884 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java
@@ -23,8 +23,8 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
 
 import org.killbill.billing.osgi.api.Healthcheck;
 import org.killbill.billing.osgi.api.OSGIPluginProperties;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java
index be847a2e..3c44a962 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java
@@ -25,7 +25,7 @@
 import java.util.UUID;
 import java.util.concurrent.Executor;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.ObjectType;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java b/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java
index d4cf3dbf..1148eb1c 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java
@@ -22,7 +22,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.osgi.api.Healthcheck;
 import org.killbill.billing.plugin.analytics.AnalyticsListener;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java
index 0f13f578..56782df6 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java
@@ -25,7 +25,7 @@
 import java.util.UUID;
 import java.util.concurrent.Executor;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.invoice.api.InvoiceStatus;
 import org.killbill.billing.osgi.libs.killbill.OSGIKillbillDataSource;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java
index 5b886388..af06b560 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java
@@ -27,7 +27,7 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.ErrorCode;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java
index 8e35b653..dcaf431a 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java
@@ -32,7 +32,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorCompletionService;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.catalog.api.Plan;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java
index a62bd5a1..3a2afc3a 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java
@@ -27,7 +27,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.entitlement.api.SubscriptionBundle;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java
index 0101a3fb..d29d3f83 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.factory;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.payment.api.PaymentMethod;
 import org.killbill.billing.payment.api.PaymentTransaction;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java
index e4226040..3f29476d 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java
index d5de24f1..72585812 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java
index 49dbad6c..69ade39f 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java
index 57bbcc20..6ac1f157 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.account.api.Account;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java
index 4946ecc5..b35222f7 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.entitlement.api.SubscriptionBundle;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java
index 18ff696e..5283faf9 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java
index fea9bb0f..149ff1bb 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.entitlement.api.SubscriptionBundle;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java
index 5323eb21..d47e4752 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.ObjectType;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java
index 953f7026..60f468e4 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.catalog.api.Plan;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java
index d62b4454..95f2a05f 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java
index 4d2605a0..b4d65ca8 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.catalog.api.Plan;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java
index e71321fe..c2b608a2 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java
index 53975abc..5c4694ac 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.catalog.api.Plan;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java
index d55cc70a..007d32d9 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.catalog.api.Plan;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java
index 0b88809c..12bf2cda 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java
index bcb0c2df..3297b03b 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java
index f1d70aa2..cfeb037c 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java
index db426345..91165606 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java
index 308a3c0b..00ecf37d 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java
index d52fa99e..426bbe85 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.invoice.api.Invoice;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java
index 1a10a85e..187931ff 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java
index be719c27..15c8e7a2 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.invoice.api.Invoice;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java
index f95620d8..0f73f907 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.invoice.api.Invoice;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java
index 6916b8f1..e2d34ec9 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.invoice.api.Invoice;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java
index f32ec6b9..fec19c9f 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java
index 684dc4d4..8b26ab39 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java
index 892dd51b..4251803c 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.invoice.api.Invoice;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java
index e006ee66..ae738bb5 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.invoice.api.Invoice;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java
index 4788f978..5ed039cb 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.invoice.api.Invoice;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java
index 4fb30f16..9d74f3ff 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.catalog.api.BillingPeriod;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java
index 66c47092..ed50c014 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.dao.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.catalog.api.Plan;
 import org.killbill.billing.catalog.api.Product;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java
index b672c358..6c9e931b 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.account.api.Account;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java
index a5f07ed9..202e2c2b 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.ObjectType;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java
index 4651d65b..fb29c4a5 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java
@@ -21,7 +21,7 @@
 
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.util.audit.AuditLog;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java
index 6ad3b316..7a1f4c25 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java
@@ -22,9 +22,9 @@
 import java.util.Optional;
 import java.util.UUID;
 
-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.jooby.Result;
 import org.jooby.Results;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java
index 97420226..29bc6f3a 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java
@@ -21,9 +21,9 @@
 
 import java.util.Optional;
 
-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.jooby.Result;
 import org.jooby.Results;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java
index 6d98690d..27d10cb8 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java
@@ -22,7 +22,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.osgi.libs.killbill.OSGIKillbillClock;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java
index c927fa30..8f6913c3 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java
@@ -28,9 +28,9 @@
 import java.util.List;
 import java.util.Optional;
 
-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.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java b/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java
index 2e31e9fb..4e5841b4 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.jooq.Field;
 
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java b/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java
index 91e2bfe1..6678987f 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.json;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.jooq.Field;
 import org.killbill.billing.plugin.analytics.reports.configuration.ReportsConfigurationModelDao;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java b/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java
index 4026be1b..e5009791 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.jooq.Field;
 import org.killbill.billing.plugin.analytics.reports.sql.TableMetadata;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java
index ab25d433..909dddb2 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java
index 8bcb4392..56786c54 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java
@@ -32,7 +32,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.ObjectType;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java
index 90ee5033..08034606 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java
@@ -22,7 +22,7 @@
 import java.util.Collection;
 import java.util.LinkedList;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java
index a387ecc7..6e669222 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeConstants;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java
index 1e2d1815..35376f42 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.reports.configuration;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.plugin.analytics.json.ReportConfigurationJson;
 
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java
index 9dd18aea..b471c021 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java
@@ -28,7 +28,7 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.killbill.billing.osgi.libs.killbill.OSGIKillbillDataSource;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java
index 23fa894d..dec7e25d 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java
@@ -28,7 +28,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import javax.sql.DataSource;
 
 import org.jooq.ConnectionCallable;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java
index 904b0c49..83829631 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.jooq.Table;
 
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java
index 4916742c..1df93f30 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.utils;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.LocalDate;
 import org.killbill.billing.catalog.api.PlanPhase;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java
index eb0805e7..8777da9b 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java
@@ -22,7 +22,7 @@
 import java.math.BigDecimal;
 import java.util.Collection;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.catalog.api.Currency;
 import org.killbill.billing.invoice.api.InvoiceItem;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java
index 310cdfa5..7359fb76 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.LocalDate;
 import org.killbill.billing.account.api.Account;
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java
index 6ed5e692..02ed765d 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java
@@ -23,7 +23,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.killbill.billing.payment.api.Payment;
 import org.killbill.billing.payment.api.PaymentTransaction;
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java
index 008321bc..980b91b7 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java
@@ -25,7 +25,7 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import javax.sql.DataSource;
 
 import org.joda.time.DateTime;
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java b/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java
index 3862c93b..9a00d57c 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java
@@ -19,7 +19,7 @@
 
 package org.killbill.billing.plugin.analytics.reports;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;