From e1a8e65a020940703196a100549e6fb788df8078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Thu, 9 Feb 2023 23:06:28 +0100 Subject: [PATCH] Jakarta migration - fix FW injection by migration remaining imports https://github.com/quarkus-qe/quarkus-test-framework/pull/668 follow-up where I missed javax Inject --- .../src/test/java/io/quarkus/qe/QuarkusCliClientIT.java | 2 +- .../src/main/java/io/quarkus/qe/GreetingResource.java | 8 ++++---- .../test/java/io/quarkus/qe/helm/CommonHelmScenarios.java | 2 +- .../io/quarkus/qe/helm/KubernetesQuarkusHelmClientIT.java | 2 +- .../io/quarkus/qe/helm/OpenShiftQuarkusHelmClientIT.java | 2 +- .../java/io/quarkus/qe/helm/QuarkusHelmFileClientIT.java | 2 +- .../io/quarkus/qe/helm/QuarkusKubernetesHelmClientIT.java | 2 +- .../io/quarkus/qe/helm/QuarkusOpenShiftHelmClientIT.java | 2 +- .../src/main/java/io/quarkus/qe/PingResource.java | 4 ++-- .../src/main/java/io/quarkus/qe/PongClient.java | 4 ++-- pom.xml | 2 +- .../src/test/java/io/quarkus/test/QuarkusCliClientIT.java | 2 +- .../quarkus/test/bootstrap/QuarkusScenarioBootstrap.java | 2 +- .../test/java/io/quarkus/test/QuarkusHelmClientIT.java | 2 +- .../test/java/io/quarkus/qe/KubernetesUsingClientsIT.java | 2 +- ...S2iGitRepositoryQuarkusApplicationManagedResource.java | 3 +-- .../test/java/io/quarkus/qe/OpenShiftUsingClientsIT.java | 2 +- 17 files changed, 22 insertions(+), 23 deletions(-) diff --git a/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java b/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java index 785a9bd11..5b7f62394 100644 --- a/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java +++ b/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java @@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Tag; diff --git a/examples/quarkus-helm/src/main/java/io/quarkus/qe/GreetingResource.java b/examples/quarkus-helm/src/main/java/io/quarkus/qe/GreetingResource.java index d24ab9ef4..e1ccd7b20 100644 --- a/examples/quarkus-helm/src/main/java/io/quarkus/qe/GreetingResource.java +++ b/examples/quarkus-helm/src/main/java/io/quarkus/qe/GreetingResource.java @@ -1,9 +1,9 @@ package io.quarkus.qe; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/greeting") public class GreetingResource { diff --git a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/CommonHelmScenarios.java b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/CommonHelmScenarios.java index 5badc4c78..23d3cc91c 100644 --- a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/CommonHelmScenarios.java +++ b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/CommonHelmScenarios.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/KubernetesQuarkusHelmClientIT.java b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/KubernetesQuarkusHelmClientIT.java index 47cd02213..44f6a379d 100644 --- a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/KubernetesQuarkusHelmClientIT.java +++ b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/KubernetesQuarkusHelmClientIT.java @@ -1,6 +1,6 @@ package io.quarkus.qe.helm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Disabled; diff --git a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/OpenShiftQuarkusHelmClientIT.java b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/OpenShiftQuarkusHelmClientIT.java index d4bda4fac..4d23dd4c4 100644 --- a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/OpenShiftQuarkusHelmClientIT.java +++ b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/OpenShiftQuarkusHelmClientIT.java @@ -1,6 +1,6 @@ package io.quarkus.qe.helm; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.bootstrap.QuarkusHelmClient; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusHelmFileClientIT.java b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusHelmFileClientIT.java index 4814e0430..bf2135e2c 100644 --- a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusHelmFileClientIT.java +++ b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusHelmFileClientIT.java @@ -6,7 +6,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusKubernetesHelmClientIT.java b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusKubernetesHelmClientIT.java index db6e1f79b..20d26f6a6 100644 --- a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusKubernetesHelmClientIT.java +++ b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusKubernetesHelmClientIT.java @@ -6,7 +6,7 @@ import java.io.FileNotFoundException; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusOpenShiftHelmClientIT.java b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusOpenShiftHelmClientIT.java index 8d25c31b7..d641a8345 100644 --- a/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusOpenShiftHelmClientIT.java +++ b/examples/quarkus-helm/src/test/java/io/quarkus/qe/helm/QuarkusOpenShiftHelmClientIT.java @@ -5,7 +5,7 @@ import java.io.FileNotFoundException; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/examples/restclient/src/main/java/io/quarkus/qe/PingResource.java b/examples/restclient/src/main/java/io/quarkus/qe/PingResource.java index cca64dcbd..befdc09b0 100644 --- a/examples/restclient/src/main/java/io/quarkus/qe/PingResource.java +++ b/examples/restclient/src/main/java/io/quarkus/qe/PingResource.java @@ -1,13 +1,13 @@ package io.quarkus.qe; -import org.eclipse.microprofile.rest.client.inject.RestClient; - import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.eclipse.microprofile.rest.client.inject.RestClient; + @Path("/ping") public class PingResource { diff --git a/examples/restclient/src/main/java/io/quarkus/qe/PongClient.java b/examples/restclient/src/main/java/io/quarkus/qe/PongClient.java index 7af0d16d5..37d6d5486 100644 --- a/examples/restclient/src/main/java/io/quarkus/qe/PongClient.java +++ b/examples/restclient/src/main/java/io/quarkus/qe/PongClient.java @@ -1,12 +1,12 @@ package io.quarkus.qe; -import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; - import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + @RegisterRestClient @Path("/pong") public interface PongClient { diff --git a/pom.xml b/pom.xml index a926bb21f..a55662843 100644 --- a/pom.xml +++ b/pom.xml @@ -281,7 +281,7 @@ .cache - java.,javax.,org.,com. + java.,javax.,jakarta.,org.,com. * true diff --git a/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java b/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java index 2a5d0bcca..c3fb27d7d 100644 --- a/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java +++ b/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Tag; diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/bootstrap/QuarkusScenarioBootstrap.java b/quarkus-test-core/src/main/java/io/quarkus/test/bootstrap/QuarkusScenarioBootstrap.java index 3caa2bce5..8642513b5 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/bootstrap/QuarkusScenarioBootstrap.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/bootstrap/QuarkusScenarioBootstrap.java @@ -10,7 +10,7 @@ import java.util.ServiceLoader; import java.util.ServiceLoader.Provider; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/quarkus-test-helm/src/test/java/io/quarkus/test/QuarkusHelmClientIT.java b/quarkus-test-helm/src/test/java/io/quarkus/test/QuarkusHelmClientIT.java index 624ba4884..df3aab9cc 100644 --- a/quarkus-test-helm/src/test/java/io/quarkus/test/QuarkusHelmClientIT.java +++ b/quarkus-test-helm/src/test/java/io/quarkus/test/QuarkusHelmClientIT.java @@ -1,6 +1,6 @@ package io.quarkus.test; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; diff --git a/quarkus-test-kubernetes/src/test/java/io/quarkus/qe/KubernetesUsingClientsIT.java b/quarkus-test-kubernetes/src/test/java/io/quarkus/qe/KubernetesUsingClientsIT.java index bba60f553..2535a00bc 100644 --- a/quarkus-test-kubernetes/src/test/java/io/quarkus/qe/KubernetesUsingClientsIT.java +++ b/quarkus-test-kubernetes/src/test/java/io/quarkus/qe/KubernetesUsingClientsIT.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/quarkus-test-openshift/src/main/java/io/quarkus/test/services/quarkus/OpenShiftS2iGitRepositoryQuarkusApplicationManagedResource.java b/quarkus-test-openshift/src/main/java/io/quarkus/test/services/quarkus/OpenShiftS2iGitRepositoryQuarkusApplicationManagedResource.java index f865aa010..d876e532d 100644 --- a/quarkus-test-openshift/src/main/java/io/quarkus/test/services/quarkus/OpenShiftS2iGitRepositoryQuarkusApplicationManagedResource.java +++ b/quarkus-test-openshift/src/main/java/io/quarkus/test/services/quarkus/OpenShiftS2iGitRepositoryQuarkusApplicationManagedResource.java @@ -23,9 +23,8 @@ public class OpenShiftS2iGitRepositoryQuarkusApplicationManagedResource private static final String QUARKUS_SOURCE_S2I_SETTINGS_MVN_FILENAME = "settings-mvn.yml"; private static final String INTERNAL_MAVEN_REPOSITORY_PROPERTY = "${internal.s2i.maven.remote.repository}"; private static final PropertyLookup MAVEN_REMOTE_REPOSITORY = new PropertyLookup("s2i.maven.remote.repository"); - // TODO: use ubi-quarkus-native-binary-s2i once upstream https://github.com/quarkusio/quarkus/issues/30829 is fixed private static final PropertyLookup QUARKUS_NATIVE_S2I_FROM_SRC = new PropertyLookup("s2i.openshift.base-native-image", - "quay.io/quarkus/ubi-quarkus-native-s2i:22.2-java17"); + "quay.io/quarkus/ubi-quarkus-graalvmce-s2i:22.3-java17"); private final GitRepositoryQuarkusApplicationManagedResourceBuilder model; diff --git a/quarkus-test-openshift/src/test/java/io/quarkus/qe/OpenShiftUsingClientsIT.java b/quarkus-test-openshift/src/test/java/io/quarkus/qe/OpenShiftUsingClientsIT.java index 3f6ec214a..e0d358a19 100644 --- a/quarkus-test-openshift/src/test/java/io/quarkus/qe/OpenShiftUsingClientsIT.java +++ b/quarkus-test-openshift/src/test/java/io/quarkus/qe/OpenShiftUsingClientsIT.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test;