From 1e7765c25b495c6b887c07d851565dcfc25809e0 Mon Sep 17 00:00:00 2001 From: xstefank Date: Wed, 7 Sep 2022 16:16:36 +0200 Subject: [PATCH] Jakarta transofrmation (Health 4.0) --- api/pom.xml | 2 +- .../io/smallrye/health/api/HealthGroup.java | 4 +-- .../java/io/smallrye/health/api/Wellness.java | 4 +-- implementation/pom.xml | 2 +- .../health/AsyncHealthCheckFactory.java | 2 +- .../io/smallrye/health/SmallRyeHealth.java | 2 +- .../health/SmallRyeHealthReporter.java | 30 +++++++++---------- .../health/registry/HealthRegistries.java | 4 +-- .../smallrye/health/HealthRegistryTest.java | 4 +-- .../health/SmallRyeHealthReporterTest.java | 4 +-- pom.xml | 20 ++++++------- provided-checks/pom.xml | 2 +- release/pom.xml | 2 +- testsuite/experimental/pom.xml | 2 +- .../ChangingLivenessHealthCheck.java | 2 +- .../ChangingReadinessHealthCheckAsync.java | 2 +- .../health/deployment/FailedCustom.java | 2 +- .../deployment/FailedLivenessAsync.java | 2 +- .../deployment/FailedReadinessAsync.java | 2 +- .../health/deployment/FailedStartupAsync.java | 2 +- .../health/deployment/FailedWellness.java | 2 +- .../deployment/NullHealthCheckProducer.java | 6 ++-- .../health/deployment/SuccessLiveness.java | 2 +- .../deployment/SuccessLivenessAsync.java | 2 +- .../health/deployment/SuccessReadiness.java | 2 +- .../deployment/SuccessReadinessAsync.java | 2 +- .../health/deployment/SuccessfulCustom.java | 2 +- .../deployment/SuccessfulStartupAsync.java | 2 +- .../health/deployment/SuccessfulWellness.java | 2 +- .../deployment/SuccessfulWellnessAsync.java | 2 +- .../test/AdditionalHealthPropertiesTest.java | 4 +-- .../health/test/AllCustomFailedTest.java | 4 +-- .../health/test/AsyncFailedHealthTest.java | 4 +-- .../smallrye/health/test/AsyncHealthTest.java | 4 +-- .../health/test/AsyncSyncHealthTest.java | 4 +-- .../health/test/ChangingHealthTest.java | 4 +-- .../health/test/DisableHealthCheckTest.java | 4 +-- .../test/HealthRegistriesInjectionTest.java | 6 ++-- .../health/test/MultipleCustomFailedTest.java | 4 +-- .../test/NullHealthCheckProducerTest.java | 4 +-- .../test/SingleCustomSuccessfulTest.java | 4 +-- .../test/SingleStartupAsyncFailedTest.java | 4 +-- .../SingleStartupAsyncSuccessfulTest.java | 4 +-- .../java/io/smallrye/health/test/TCKBase.java | 6 ++-- .../health/test/WellnessFailedTest.java | 4 +-- .../health/test/WellnessSuccessfulTest.java | 4 +-- testsuite/pom.xml | 2 +- testsuite/tck/pom.xml | 2 +- .../health/SmallRyeHealthGroupServlet.java | 10 +++---- .../health/SmallRyeHealthServlet.java | 10 +++---- .../health/SmallRyeLivenessServlet.java | 10 +++---- .../health/SmallRyeReadinessServlet.java | 10 +++---- .../health/SmallRyeStartupServlet.java | 10 +++---- .../health/SmallRyeWellnessServlet.java | 10 +++---- ui/pom.xml | 2 +- 55 files changed, 127 insertions(+), 127 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 2ba1c217..fe2813ad 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -3,7 +3,7 @@ smallrye-health-parent io.smallrye - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT 4.0.0 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 94342956..f8216dc8 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.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 8dcfcd56..6244d825 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.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 330183b9..72db020f 100644 --- a/implementation/pom.xml +++ b/implementation/pom.xml @@ -22,7 +22,7 @@ io.smallrye smallrye-health-parent - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT smallrye-health diff --git a/implementation/src/main/java/io/smallrye/health/AsyncHealthCheckFactory.java b/implementation/src/main/java/io/smallrye/health/AsyncHealthCheckFactory.java index e57b3b4b..8f94010c 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.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 41d62c45..4fc5d1f7 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 @@ 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 c8f8b276..96bba4e6 100644 --- a/implementation/src/main/java/io/smallrye/health/SmallRyeHealthReporter.java +++ b/implementation/src/main/java/io/smallrye/health/SmallRyeHealthReporter.java @@ -18,21 +18,21 @@ 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.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.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 b607788f..82cf3f2b 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.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/implementation/src/test/java/io/smallrye/health/HealthRegistryTest.java b/implementation/src/test/java/io/smallrye/health/HealthRegistryTest.java index 86dfac38..c706fe7d 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 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 31c12057..d0ebd053 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.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/pom.xml b/pom.xml index d0d5931e..787bc3cd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,28 +21,28 @@ io.smallrye - smallrye-parent + smallrye-jakarta-parent 36 smallrye-health-parent - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT pom SmallRye Health: Parent http://smallrye.io - 2.0 - 3.1 + 3.0.1 + 4.0 4.5.13 - 4.0.4 + 6.0.0 1.7.0 - 2.11.1 - 1.13.0 - 1.0.0 - 6.14.3 - 26.1.2.Final + 3.0.0 + 2.0.0 + 2.0.0 + 7.5 + 27.0.0.Alpha4 ${project.basedir}/target/jacoco.xml diff --git a/provided-checks/pom.xml b/provided-checks/pom.xml index 6fa52aac..4fce286d 100644 --- a/provided-checks/pom.xml +++ b/provided-checks/pom.xml @@ -4,7 +4,7 @@ smallrye-health-parent io.smallrye - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT smallrye-health-provided-checks diff --git a/release/pom.xml b/release/pom.xml index c01d8112..b0a33e25 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-health-parent - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT smallrye-health-release diff --git a/testsuite/experimental/pom.xml b/testsuite/experimental/pom.xml index b44eb2ca..675d818b 100644 --- a/testsuite/experimental/pom.xml +++ b/testsuite/experimental/pom.xml @@ -3,7 +3,7 @@ io.smallrye smallrye-health-testsuite-parent - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT 4.0.0 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 f3e75366..1fc733c4 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 @@ 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 c97bec62..1b027f80 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 @@ 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/FailedCustom.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedCustom.java index f82b76e8..6614be38 100644 --- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedCustom.java +++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/FailedCustom.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 b78fc030..8297319b 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 @@ 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 22d4e6e1..cd2329f8 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 @@ 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 6ad3e76e..5dc2d62d 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 @@ 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 65a2e30a..7f96314b 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/NullHealthCheckProducer.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/NullHealthCheckProducer.java index 95809b60..ef0eafda 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 1bed5731..0d9528c3 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 bd8dc439..3aff5115 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 @@ 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 8d429504..93a44174 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 b42c62eb..acea71a5 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 @@ 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/SuccessfulCustom.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulCustom.java index bcef2348..b711b88b 100644 --- a/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulCustom.java +++ b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulCustom.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/SuccessfulStartupAsync.java b/testsuite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulStartupAsync.java index d204ebd2..1961d8e8 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 @@ 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 9cc83144..d1ae2d25 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 49270ce7..598c8477 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 @@ 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 48f1db1c..2df98139 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 828e62ae..a8870d01 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 d432593f..9942b93d 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 0fce4065..d1123b2d 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 9bc31411..ada11fc5 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 800c1a36..6038a71b 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 @@ 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 1ba172e2..4c5322d1 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/HealthRegistriesInjectionTest.java b/testsuite/experimental/src/test/java/io/smallrye/health/test/HealthRegistriesInjectionTest.java index 15c8dae7..24f903bc 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 @@ 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 353d2b2a..f5c1f2af 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 60cb8f03..f051862c 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 7a29c5fa..6674c5c2 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 50f99110..13f17f47 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 7f15e9c3..51b6b57e 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 38adfeb5..0e17b9b3 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.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 69f9db21..9f7ff169 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 55aa47fb..45b6ddbf 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 37fde83e..66ecec93 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -3,7 +3,7 @@ smallrye-health-parent io.smallrye - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT 4.0.0 diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml index ee174f7a..71a58f9c 100644 --- a/testsuite/tck/pom.xml +++ b/testsuite/tck/pom.xml @@ -22,7 +22,7 @@ io.smallrye smallrye-health-testsuite-parent - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT smallrye-health-tck 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 1b6b37fc..5cad1dde 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 @@ 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 602e2368..2002087a 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 @@ 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 761a2576..58c29d49 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 @@ 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 87600611..cf2ca4b0 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 @@ 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 b93c3cb2..2180a5ad 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 @@ 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 f82bc6af..6c63c5a4 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 @@ 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") diff --git a/ui/pom.xml b/ui/pom.xml index d0e774c5..93d7bd73 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-health-parent - 3.3.1-SNAPSHOT + 4.0.0-SNAPSHOT smallrye-health-ui