Repository: smallrye/smallrye-health
Pull request #453 (2023-02-11 14:24:59)

Jakarta transformation


Patch:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79ed0c2..20951c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,6 @@ jobs:
         # To list the available releases for a given "feature version" (example for 16):
         # https://api.adoptium.net/v3/assets/latest/16/hotspot
         java:
-          - { name: "8" }
           - { name: "11" }
           - { name: "17" }
           - { name: "18" }
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a60d8d7..64d6792 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 11
           distribution: temurin
 
       - name: maven release ${{steps.metadata.outputs.current-version}}
diff --git a/api/pom.xml b/api/pom.xml
index 913b0f7..fe2813a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>smallrye-health-parent</artifactId>
     <groupId>io.smallrye</groupId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/api/src/main/java/io/smallrye/health/api/HealthGroup.java b/api/src/main/java/io/smallrye/health/api/HealthGroup.java
index 9434295..f8216dc 100644
--- a/api/src/main/java/io/smallrye/health/api/HealthGroup.java
+++ b/api/src/main/java/io/smallrye/health/api/HealthGroup.java
@@ -32,8 +32,8 @@ import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import io.smallrye.common.annotation.Experimental;
 
diff --git a/api/src/main/java/io/smallrye/health/api/Wellness.java b/api/src/main/java/io/smallrye/health/api/Wellness.java
index 8dcfcd5..6244d82 100644
--- a/api/src/main/java/io/smallrye/health/api/Wellness.java
+++ b/api/src/main/java/io/smallrye/health/api/Wellness.java
@@ -31,8 +31,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import io.smallrye.common.annotation.Experimental;
 
diff --git a/implementation/pom.xml b/implementation/pom.xml
index be34518..72db020 100644
--- a/implementation/pom.xml
+++ b/implementation/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-health-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>smallrye-health</artifactId>
diff --git a/implementation/src/main/java/io/smallrye/health/AsyncHealthCheckFactory.java b/implementation/src/main/java/io/smallrye/health/AsyncHealthCheckFactory.java
index e57b3b4..8f94010 100644
--- a/implementation/src/main/java/io/smallrye/health/AsyncHealthCheckFactory.java
+++ b/implementation/src/main/java/io/smallrye/health/AsyncHealthCheckFactory.java
@@ -4,7 +4,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Objects;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.health.HealthCheck;
diff --git a/implementation/src/main/java/io/smallrye/health/SmallRyeHealth.java b/implementation/src/main/java/io/smallrye/health/SmallRyeHealth.java
index 41d62c4..4fc5d1f 100644
--- a/implementation/src/main/java/io/smallrye/health/SmallRyeHealth.java
+++ b/implementation/src/main/java/io/smallrye/health/SmallRyeHealth.java
@@ -2,7 +2,7 @@ package io.smallrye.health;
 
 import java.util.Objects;
 
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 
diff --git a/implementation/src/main/java/io/smallrye/health/SmallRyeHealthReporter.java b/implementation/src/main/java/io/smallrye/health/SmallRyeHealthReporter.java
index 948b2c2..74761e8 100644
--- a/implementation/src/main/java/io/smallrye/health/SmallRyeHealthReporter.java
+++ b/implementation/src/main/java/io/smallrye/health/SmallRyeHealthReporter.java
@@ -18,22 +18,22 @@ import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
-import javax.inject.Inject;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
-import javax.json.spi.JsonProvider;
-import javax.json.stream.JsonGenerator;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.inject.Inject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
+import jakarta.json.spi.JsonProvider;
+import jakarta.json.stream.JsonGenerator;
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
diff --git a/implementation/src/main/java/io/smallrye/health/registry/HealthRegistries.java b/implementation/src/main/java/io/smallrye/health/registry/HealthRegistries.java
index b607788..82cf3f2 100644
--- a/implementation/src/main/java/io/smallrye/health/registry/HealthRegistries.java
+++ b/implementation/src/main/java/io/smallrye/health/registry/HealthRegistries.java
@@ -5,8 +5,8 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.health.Liveness;
diff --git a/pom.xml b/pom.xml
index 1c31049..f68b0a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,28 +21,28 @@
 
   <parent>
     <groupId>io.smallrye</groupId>
-    <artifactId>smallrye-parent</artifactId>
+    <artifactId>smallrye-jakarta-parent</artifactId>
     <version>37</version>
   </parent>
 
   <artifactId>smallrye-health-parent</artifactId>
-  <version>3.3.2-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>SmallRye Health: Parent</name>
   <url>http://smallrye.io</url>
 
   <properties>
-    <version.eclipse.microprofile.config>2.0</version.eclipse.microprofile.config>
-    <version.eclipse.microprofile.health>3.1</version.eclipse.microprofile.health>
+    <version.eclipse.microprofile.config>3.0.2</version.eclipse.microprofile.config>
+    <version.eclipse.microprofile.health>4.0</version.eclipse.microprofile.health>
     <version.httpclient>4.5.14</version.httpclient>
-    <version.jakarta.servlet>4.0.4</version.jakarta.servlet>
+    <version.jakarta.servlet>6.0.0</version.jakarta.servlet>
     <version.mutiny>1.8.0</version.mutiny>
-    <version.smallrye-config>2.12.2</version.smallrye-config>
-    <version.smallrye-common>1.13.2</version.smallrye-common>
-    <version.smallrye.testing.utilities>1.0.0</version.smallrye.testing.utilities>
-    <version.testng>6.14.3</version.testng>
-    <version.wildfly>26.1.2.Final</version.wildfly>
+    <version.smallrye-config>3.1.2</version.smallrye-config>
+    <version.smallrye-common>2.0.0</version.smallrye-common>
+    <version.smallrye.testing.utilities>2.2.0</version.smallrye.testing.utilities>
+    <version.testng>7.5</version.testng>
+    <version.wildfly>27.0.0.Alpha4</version.wildfly>
 
 
     <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
diff --git a/provided-checks/pom.xml b/provided-checks/pom.xml
index 02fc581..4fce286 100644
--- a/provided-checks/pom.xml
+++ b/provided-checks/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>smallrye-health-parent</artifactId>
     <groupId>io.smallrye</groupId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>smallrye-health-provided-checks</artifactId>
diff --git a/release/pom.xml b/release/pom.xml
index de87f15..b0a33e2 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-health-parent</artifactId>
-        <version>3.3.2-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-health-release</artifactId>
diff --git a/to-jakarta.sh b/to-jakarta.sh
deleted file mode 100755
index 8db8dc9..0000000
--- a/to-jakarta.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# move to jakarta parent
-find . -type f -name 'pom.xml' -exec sed -i 's/smallrye-parent/smallrye-jakarta-parent/g' {} +
-# java sources
-find . -type f -name '*.java' -exec sed -i 's/javax./jakarta./g' {} +
-# service loader files
-find . -type f -name "javax*" -exec sh -c 'mv "$0" "${0/javax/jakarta}"' '{}' \;
-# docs
-find doc -type f -name '*.adoc' -exec sed -i 's/javax./jakarta./g' {} +
-
-mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.nextMajorVersion}.0.0-SNAPSHOT
-find examples -depth 1 -type d | xargs -I{} mvn -pl {} build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.nextMajorVersion}.0.\${parsedVersion.incrementalVersion}-SNAPSHOT
-
-mvn versions:set-property -Dproperty=version.eclipse.microprofile.health -DnewVersion=4.0
-mvn versions:update-property -Dproperty=version.eclipse.microprofile.config -DnewVersion=3.0.1
-mvn versions:update-property -Dproperty=version.jakarta.servlet -DnewVersion=6.0.0
-mvn versions:update-property -Dproperty=version.smallrye-config -DnewVersion=3.0.0
-mvn versions:update-property -Dproperty=version.smallrye-common -DnewVersion=2.0.0
-mvn versions:set-property -Dproperty=version.wildfly -DnewVersion=27.0.0.Alpha4
-mvn versions:set-property -Dproperty=version.testng -DnewVersion=7.5
-mvn versions:update-property -Dproperty=version.smallrye.testing.utilities -DnewVersion=2.0.0
-
-# change the release version to 11 for 4.0.x stream
-sed -i 's/java-version: 8/java-version: 11/g' .github/workflows/release.yml
diff --git a/ui/pom.xml b/ui/pom.xml
index 63b54a5..93d7bd7 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-health-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>smallrye-health-ui</artifactId>


Test patch:
diff --git a/implementation/src/test/java/io/smallrye/health/HealthRegistryTest.java b/implementation/src/test/java/io/smallrye/health/HealthRegistryTest.java
index 86dfac3..c706fe7 100644
--- a/implementation/src/test/java/io/smallrye/health/HealthRegistryTest.java
+++ b/implementation/src/test/java/io/smallrye/health/HealthRegistryTest.java
@@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Arrays;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/implementation/src/test/java/io/smallrye/health/SmallRyeHealthReporterTest.java b/implementation/src/test/java/io/smallrye/health/SmallRyeHealthReporterTest.java
index 31c1205..d0ebd05 100644
--- a/implementation/src/test/java/io/smallrye/health/SmallRyeHealthReporterTest.java
+++ b/implementation/src/test/java/io/smallrye/health/SmallRyeHealthReporterTest.java
@@ -19,8 +19,8 @@ import java.util.Map;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/pom.xml b/testsuite/experimental/pom.xml
index fbdcc2a..675d818 100644
--- a/testsuite/experimental/pom.xml
+++ b/testsuite/experimental/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-health-testsuite-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingLivenessHealthCheck.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingLivenessHealthCheck.java
index f3e7536..1fc733c 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingLivenessHealthCheck.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingLivenessHealthCheck.java
@@ -2,7 +2,7 @@ package io.smallrye.health.deployment;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingReadinessHealthCheckAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingReadinessHealthCheckAsync.java
index c97bec6..1b027f8 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingReadinessHealthCheckAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/ChangingReadinessHealthCheckAsync.java
@@ -2,7 +2,7 @@ package io.smallrye.health.deployment;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Readiness;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/DefaultGroupExplicit.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/DefaultGroupExplicit.java
index 962e382..4aff7f3 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/DefaultGroupExplicit.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/DefaultGroupExplicit.java
@@ -1,6 +1,6 @@
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedHealthGroup2.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedHealthGroup2.java
index c7db335..f7e466a 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedHealthGroup2.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedHealthGroup2.java
@@ -21,7 +21,7 @@
  */
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedLivenessAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedLivenessAsync.java
index b78fc03..8297319 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedLivenessAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedLivenessAsync.java
@@ -2,7 +2,7 @@ package io.smallrye.health.deployment;
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Liveness;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedReadinessAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedReadinessAsync.java
index 22d4e6e..cd2329f 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedReadinessAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedReadinessAsync.java
@@ -2,7 +2,7 @@ package io.smallrye.health.deployment;
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Readiness;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedStartupAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedStartupAsync.java
index 6ad3e76..5dc2d62 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedStartupAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedStartupAsync.java
@@ -23,7 +23,7 @@ package io.smallrye.health.deployment;
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Startup;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedWellness.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedWellness.java
index 65a2e30..7f96314 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedWellness.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedWellness.java
@@ -21,7 +21,7 @@
  */
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup1.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup1.java
index 78488c9..5947225 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup1.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup1.java
@@ -1,6 +1,6 @@
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup12.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup12.java
index 0cd77ca..fab5560 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup12.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/HealthGroup12.java
@@ -1,6 +1,6 @@
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/NullHealthCheckProducer.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/NullHealthCheckProducer.java
index 95809b6..ef0eafd 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/NullHealthCheckProducer.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/NullHealthCheckProducer.java
@@ -1,8 +1,8 @@
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.Liveness;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLiveness.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLiveness.java
index 1bed573..0d9528c 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLiveness.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLiveness.java
@@ -1,6 +1,6 @@
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLivenessAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLivenessAsync.java
index bd8dc43..3aff511 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLivenessAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessLivenessAsync.java
@@ -2,7 +2,7 @@ package io.smallrye.health.deployment;
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Liveness;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadiness.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadiness.java
index 8d42950..93a4417 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadiness.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadiness.java
@@ -1,6 +1,6 @@
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadinessAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadinessAsync.java
index b42c62e..acea71a 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadinessAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadinessAsync.java
@@ -2,7 +2,7 @@ package io.smallrye.health.deployment;
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Readiness;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulStartupAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulStartupAsync.java
index d204ebd..1961d8e 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulStartupAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulStartupAsync.java
@@ -23,7 +23,7 @@ package io.smallrye.health.deployment;
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Startup;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellness.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellness.java
index 9cc8314..d1ae2d2 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellness.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellness.java
@@ -21,7 +21,7 @@
  */
 package io.smallrye.health.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellnessAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellnessAsync.java
index 49270ce..598c847 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellnessAsync.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellnessAsync.java
@@ -23,7 +23,7 @@ package io.smallrye.health.deployment;
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheckResponse;
 
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/AdditionalHealthPropertiesTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/AdditionalHealthPropertiesTest.java
index 48f1db1..2df9813 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/AdditionalHealthPropertiesTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/AdditionalHealthPropertiesTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/AllCustomFailedTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/AllCustomFailedTest.java
index 651ea54..b473282 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/AllCustomFailedTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/AllCustomFailedTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncFailedHealthTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncFailedHealthTest.java
index d432593..9942b93 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncFailedHealthTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncFailedHealthTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncHealthTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncHealthTest.java
index 0fce406..d1123b2 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncHealthTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncHealthTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncSyncHealthTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncSyncHealthTest.java
index 9bc3141..ada11fc 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncSyncHealthTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/AsyncSyncHealthTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/ChangingHealthTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/ChangingHealthTest.java
index 800c1a3..6038a71 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/ChangingHealthTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/ChangingHealthTest.java
@@ -24,8 +24,8 @@ package io.smallrye.health.test;
 
 import java.util.function.Supplier;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/DisableHealthCheckTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/DisableHealthCheckTest.java
index 1ba172e..4c5322d 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/DisableHealthCheckTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/DisableHealthCheckTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthGroupsTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthGroupsTest.java
index bcaee12..77415b8 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthGroupsTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthGroupsTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthRegistriesInjectionTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthRegistriesInjectionTest.java
index 15c8dae..24f903b 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthRegistriesInjectionTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthRegistriesInjectionTest.java
@@ -24,9 +24,9 @@ package io.smallrye.health.test;
 
 import java.util.Arrays;
 
-import javax.inject.Inject;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/MultipleCustomFailedTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/MultipleCustomFailedTest.java
index 20f9af0..025385f 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/MultipleCustomFailedTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/MultipleCustomFailedTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/NullHealthCheckProducerTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/NullHealthCheckProducerTest.java
index 60cb8f0..f051862 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/NullHealthCheckProducerTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/NullHealthCheckProducerTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleCustomSuccessfulTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleCustomSuccessfulTest.java
index a6d23e4..d00e3c4 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleCustomSuccessfulTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleCustomSuccessfulTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncFailedTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncFailedTest.java
index 50f9911..13f17f4 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncFailedTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncFailedTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncSuccessfulTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncSuccessfulTest.java
index 7f15e9c..51b6b57 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncSuccessfulTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/SingleStartupAsyncSuccessfulTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/TCKBase.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/TCKBase.java
index 38adfeb..0e17b9b 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/TCKBase.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/TCKBase.java
@@ -30,9 +30,9 @@ import java.net.URI;
 import java.util.Optional;
 import java.util.logging.Logger;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessFailedTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessFailedTest.java
index 69f9db2..9f7ff16 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessFailedTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessFailedTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessSuccessfulTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessSuccessfulTest.java
index 55aa47f..45b6ddb 100644
--- a/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessSuccessfulTest.java
+++ b/testsuite/experimental/src/test/java/io/smallrye/health/test/WellnessSuccessfulTest.java
@@ -22,8 +22,8 @@
 
 package io.smallrye.health.test;
 
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 723051a..66ecec9 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>smallrye-health-parent</artifactId>
     <groupId>io.smallrye</groupId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml
index 4427581..71a58f9 100644
--- a/testsuite/tck/pom.xml
+++ b/testsuite/tck/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-health-testsuite-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>smallrye-health-tck</artifactId>
diff --git a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthGroupServlet.java b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthGroupServlet.java
index 1b6b37f..5cad1dd 100644
--- a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthGroupServlet.java
+++ b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthGroupServlet.java
@@ -2,11 +2,11 @@ package io.smallrye.health;
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 @WebServlet(name = "SmallRyeHealthGroupServlet", urlPatterns = "/health/group/*")
diff --git a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthServlet.java b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthServlet.java
index 602e236..2002087 100644
--- a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthServlet.java
+++ b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeHealthServlet.java
@@ -2,11 +2,11 @@ package io.smallrye.health;
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 @WebServlet(name = "SmallRyeHealthServlet", urlPatterns = "/health")
diff --git a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeLivenessServlet.java b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeLivenessServlet.java
index 761a257..58c29d4 100644
--- a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeLivenessServlet.java
+++ b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeLivenessServlet.java
@@ -2,11 +2,11 @@ package io.smallrye.health;
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 @WebServlet(name = "SmallRyeLivenessServlet", urlPatterns = "/health/live")
diff --git a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeReadinessServlet.java b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeReadinessServlet.java
index 8760061..cf2ca4b 100644
--- a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeReadinessServlet.java
+++ b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeReadinessServlet.java
@@ -2,11 +2,11 @@ package io.smallrye.health;
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 @WebServlet(name = "SmallRyeReadinessServlet", urlPatterns = "/health/ready")
diff --git a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeStartupServlet.java b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeStartupServlet.java
index b93c3cb..2180a5a 100644
--- a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeStartupServlet.java
+++ b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeStartupServlet.java
@@ -2,11 +2,11 @@ package io.smallrye.health;
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 @WebServlet(name = "SmallRyeStartupServlet", urlPatterns = "/health/started")
diff --git a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeWellnessServlet.java b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeWellnessServlet.java
index f82bc6a..6c63c5a 100644
--- a/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeWellnessServlet.java
+++ b/testsuite/tck/src/main/java/io/smallrye/health/SmallRyeWellnessServlet.java
@@ -2,11 +2,11 @@ package io.smallrye.health;
 
 import java.io.IOException;
 
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 @WebServlet(name = "SmallRyeWellnessServlet", urlPatterns = "/health/well")