Jakarta migration - fix FW injection by migration remaining imports

#668 follow-up where I missed javax Inject
quarkus-qe · Feb 9, 2023 · e1a8e65 · e1a8e65
1 parent 1563214
commit e1a8e65
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -281,7 +281,7 @@
                 <configuration>
                     <!-- store outside of target to speed up formatting when mvn clean is used -->
                     <cachedir>.cache</cachedir>
-                    <groups>java.,javax.,org.,com.</groups>
+                    <groups>java.,javax.,jakarta.,org.,com.</groups>
                     <staticGroups>*</staticGroups>
                     <removeUnused>true</removeUnused>
                 </configuration>

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
@@ -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
@@ -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
@@ -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
@@ -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/...kus/test/services/quarkus/OpenShiftS2iGitRepositoryQuarkusApplicationManagedResource.java b/...kus/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
@@ -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;