Jakarta transofrmation (Health 4.0)

smallrye · Sep 7, 2022 · 1e7765c · 1e7765c
1 parent a19acb9
commit 1e7765c
Show file tree

Hide file tree

Showing 55 changed files with 127 additions and 127 deletions.
diff --git 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.1-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
@@ -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
@@ -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
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-health-parent</artifactId>
-    <version>3.3.1-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -21,28 +21,28 @@
 
   <parent>
     <groupId>io.smallrye</groupId>
-    <artifactId>smallrye-parent</artifactId>
+    <artifactId>smallrye-jakarta-parent</artifactId>
     <version>36</version>
   </parent>
 
   <artifactId>smallrye-health-parent</artifactId>
-  <version>3.3.1-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.1</version.eclipse.microprofile.config>
+    <version.eclipse.microprofile.health>4.0</version.eclipse.microprofile.health>
     <version.httpclient>4.5.13</version.httpclient>
-    <version.jakarta.servlet>4.0.4</version.jakarta.servlet>
+    <version.jakarta.servlet>6.0.0</version.jakarta.servlet>
     <version.mutiny>1.7.0</version.mutiny>
-    <version.smallrye-config>2.11.1</version.smallrye-config>
-    <version.smallrye-common>1.13.0</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.0.0</version.smallrye-config>
+    <version.smallrye-common>2.0.0</version.smallrye-common>
+    <version.smallrye.testing.utilities>2.0.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
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>smallrye-health-parent</artifactId>
     <groupId>io.smallrye</groupId>
-    <version>3.3.1-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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-health-parent</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>smallrye-health-release</artifactId>

diff --git 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.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/...experimental/src/test/java/io/smallrye/health/deployment/ChangingLivenessHealthCheck.java b/...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/...mental/src/test/java/io/smallrye/health/deployment/ChangingReadinessHealthCheckAsync.java b/...mental/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ite/experimental/src/test/java/io/smallrye/health/deployment/NullHealthCheckProducer.java b/...ite/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
@@ -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
@@ -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
@@ -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/...suite/experimental/src/test/java/io/smallrye/health/deployment/SuccessReadinessAsync.java b/...suite/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
@@ -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/...uite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulStartupAsync.java b/...uite/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
@@ -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/...ite/experimental/src/test/java/io/smallrye/health/deployment/SuccessfulWellnessAsync.java b/...ite/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/...te/experimental/src/test/java/io/smallrye/health/test/AdditionalHealthPropertiesTest.java b/...te/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
@@ -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
@@ -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
@@ -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
@@ -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;