Merge pull request #30856 from gsmet/jakarta-10

Upgrade Quarkus to Jakarta EE 10

build-parent/pom.xml

@@ -41,7 +41,7 @@
         <htmlunit.version>2.70.0</htmlunit.version>
         <javaparser-core.version>3.24.2</javaparser-core.version>
         <jdeparser.version>2.0.3.Final</jdeparser.version>
-        <subethasmtp.version>5.2.8</subethasmtp.version>
+        <subethasmtp.version>6.0.1</subethasmtp.version>
 
         <!-- Dev tools -->
         <freemarker.version>2.3.32</freemarker.version>
@@ -360,7 +360,6 @@
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>artemis-server</artifactId>
                 <version>${artemis.version}</version>
-                <!-- Force the test scope as we want to make sure this is not used outside of tests -->
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
@@ -383,29 +382,18 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
-                    <!-- Excluding the API jar as the impl jar also contains the API -->
-                    <exclusion>
-                        <groupId>jakarta.json</groupId>
-                        <artifactId>jakarta.json-api</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>artemis-amqp-protocol</artifactId>
                 <version>${artemis.version}</version>
-                <!-- Force the test scope as we want to make sure this is not used outside of tests -->
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.activemq</groupId>
                         <artifactId>artemis-server</artifactId>
                     </exclusion>
-                    <!-- Excluding the API jar as the impl jar also contains the API -->
-                    <exclusion>
-                        <groupId>jakarta.json</groupId>
-                        <artifactId>jakarta.json-api</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
         </dependencies>

core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java

@@ -43,7 +43,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;

core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java

@@ -208,7 +208,7 @@ public static class DefaultIgnoreTypePredicate implements Predicate<DotName> {
         public static final DefaultIgnoreTypePredicate INSTANCE = new DefaultIgnoreTypePredicate();
 
         private static final List<String> DEFAULT_IGNORED_PACKAGES = Arrays.asList("java.", "io.reactivex.",
-                "org.reactivestreams.", "org.slf4j.", "javax.json.", "jakarta.json.",
+                "org.reactivestreams.", "org.slf4j.", "jakarta.json.", "jakarta.json.",
                 "com.fasterxml.jackson.databind.", "io.vertx.core.json.");
         // if this gets more complicated we will need to move to some tree like structure
         static final Set<String> ALLOWED_FROM_IGNORED_PACKAGES = new HashSet<>(

core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java

@@ -12,7 +12,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.FieldDescriptor;

core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java

@@ -17,7 +17,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;

core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java

@@ -42,7 +42,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ArrayType;

core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java

@@ -81,7 +81,7 @@ public Object instance(Class<?> clazz, Annotation... qualifiers) {
         try {
             Class<?> actualClass = Class.forName(clazz.getName(), true,
                     classLoader);
-            Class<?> cdi = classLoader.loadClass("javax.enterprise.inject.spi.CDI");
+            Class<?> cdi = classLoader.loadClass("jakarta.enterprise.inject.spi.CDI");
             Object instance = cdi.getMethod("current").invoke(null);
             Method selectMethod = cdi.getMethod("select", Class.class, Annotation[].class);
             Object cdiInstance = selectMethod.invoke(instance, actualClass, qualifiers);

core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithNonSerializableInjectedInConstructor.java

@@ -1,6 +1,6 @@
 package io.quarkus.deployment.recording;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class TestRecorderWithNonSerializableInjectedInConstructor {
 

core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithTestJavaBeanInjectedInConstructor.java

@@ -1,6 +1,6 @@
 package io.quarkus.deployment.recording;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class TestRecorderWithTestJavaBeanInjectedInConstructor {
 

core/runtime/pom.xml

@@ -194,26 +194,6 @@
                         <parentFirstArtifact>org.opentest4j:opentest4j</parentFirstArtifact>
                         <parentFirstArtifact>org.junit.platform:junit-platform-commons</parentFirstArtifact>
 
-                        <!-- Pact[<4.1.0] support. It would be great if there was somewhere better to put this-->
-                        <parentFirstArtifact>au.com.dius:pact-jvm-provider-junit5</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-provider</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-core-support</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-core-pact-broker</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-core-model</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-core-matchers</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-junit5</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-consumer-java8</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius:pact-jvm-consumer</parentFirstArtifact>
-                        <!-- Pact[>=4.1.0] support.-->
-                        <parentFirstArtifact>au.com.dius.pact.provider:junit5</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius.pact:provider</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius.pact.core:support</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius.pact.core:pactbroker</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius.pact.core:model</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius.pact.core:matcher</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius.pact.consumer:junit5</parentFirstArtifact>
-                        <parentFirstArtifact>au.com.dius.pact:consumer</parentFirstArtifact>
-
                         <!-- Make use of byteman frictionless -->
                         <parentFirstArtifact>org.jboss.byteman:byteman</parentFirstArtifact>
                     </parentFirstArtifacts>

core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java

@@ -12,11 +12,11 @@
 import java.util.logging.Handler;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
 
 import org.jboss.logging.Logger;
 import org.jboss.logmanager.handlers.AsyncHandler;

core/runtime/src/main/java/io/quarkus/runtime/Startup.java

@@ -8,13 +8,13 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.spi.ObserverMethod;
 
 /**
  * This annotation can be used to initialize a CDI bean at application startup:
  * <ul>
- * <li>If a bean class is annotated then a contextual instance is created and the {@link javax.annotation.PostConstruct}
+ * <li>If a bean class is annotated then a contextual instance is created and the {@link jakarta.annotation.PostConstruct}
  * callbacks are invoked.</li>
  * <li>If a producer method is annotated then a contextual instance is created, i.e. the producer method is invoked.</li>
  * <li>If a producer field is annotated then a contextual instance is created, i.e. the producer field is read.</li>
@@ -68,7 +68,7 @@
     /**
      *
      * @return the priority
-     * @see javax.annotation.Priority
+     * @see jakarta.annotation.Priority
      */
     int value() default ObserverMethod.DEFAULT_PRIORITY;
 

core/runtime/src/main/java/io/quarkus/runtime/annotations/CommandLineArguments.java

@@ -3,7 +3,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 /**
  * A qualifier that can be used to inject the command line arguments.

core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 import java.nio.charset.Charset;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/CidrAddressConverter.java

@@ -4,7 +4,7 @@
 
 import java.io.Serializable;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 import org.wildfly.common.net.CidrAddress;

core/runtime/src/main/java/io/quarkus/runtime/configuration/ConverterSupport.java

@@ -1,6 +1,6 @@
 package io.quarkus.runtime.configuration;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java

@@ -7,7 +7,7 @@
 import java.time.format.DateTimeParseException;
 import java.util.regex.Pattern;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/InetAddressConverter.java

@@ -6,7 +6,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 import org.wildfly.common.net.Inet;

core/runtime/src/main/java/io/quarkus/runtime/configuration/InetSocketAddressConverter.java

@@ -6,7 +6,7 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 import org.wildfly.common.net.Inet;

core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java

@@ -6,7 +6,7 @@
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySizeConverter.java

@@ -9,7 +9,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/NormalizeRootHttpPathConverter.java

@@ -2,7 +2,7 @@
 
 import static io.quarkus.runtime.configuration.ConverterSupport.DEFAULT_QUARKUS_CONVERTER_PRIORITY;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/PathConverter.java

@@ -6,7 +6,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/RegexConverter.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 import java.util.regex.Pattern;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java

@@ -5,7 +5,7 @@
 import java.io.Serializable;
 import java.time.ZoneId;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 

core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java

@@ -6,7 +6,7 @@
 import java.util.Locale;
 import java.util.logging.Level;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 
 import org.eclipse.microprofile.config.spi.Converter;
 import org.jboss.logmanager.LogContext;

devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import io.quarkus.cli.common.HelpOption;
 import io.quarkus.cli.common.OutputOptionMixin;

devtools/maven/pom.xml

@@ -82,8 +82,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.json</artifactId>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
         </dependency>
 
         <!-- extensions reader -->

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/Function.java

@@ -9,7 +9,7 @@
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Optional;
 
 /**

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/GreetingService.java

@@ -1,6 +1,6 @@
 package org.acme;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class GreetingService {

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/test/java/org/acme/FunctionTest.java

@@ -9,7 +9,7 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/java/src/main/java/org/acme/GreetingResource.java

@@ -1,9 +1,9 @@
 package org.acme;
 
-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("/hello")
 public class GreetingResource {

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java

@@ -1,6 +1,6 @@
 package org.acme.funqygooglecloudfunctions;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import io.cloudevents.CloudEvent;
 import io.quarkus.funqy.Funq;

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java

@@ -1,6 +1,6 @@
 package org.acme.funqygooglecloudfunctions;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class GreetingService {