Merge pull request #26 from geoand/quarkus3

Bump to Quarkus 3
quarkusio · Jul 10, 2024 · 49c838d · 49c838d
2 parents 0b51a94 + 651958e
commit 49c838d
Show file tree

Hide file tree

Showing 32 changed files with 98 additions and 98 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8, 11 ]
+        java: [ 11, 17 ]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/pom.xml b/pom.xml
@@ -41,10 +41,10 @@
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus-plugin.version>2.4.2.Final</quarkus-plugin.version>
-        <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.version>2.4.2.Final</quarkus.platform.version>
+        <quarkus-plugin.version>3.0.1.Final</quarkus-plugin.version>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+        <quarkus.platform.version>3.0.1.Final</quarkus.platform.version>
         <surefire-plugin.version>2.22.1</surefire-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <version.gpg.plugin>1.6</version.gpg.plugin>
@@ -147,8 +147,8 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-universe-bom</artifactId>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>${quarkus.platform.artifact-id}</artifactId>
                 <version>${quarkus.platform.version}</version>
                 <type>pom</type>
                 <scope>import</scope>

diff --git a/quarkus/extension/deployment/src/main/java/io/quarkus/qson/deployment/QsonBuildStep.java b/quarkus/extension/deployment/src/main/java/io/quarkus/qson/deployment/QsonBuildStep.java
@@ -21,6 +21,7 @@
 import io.quarkus.qson.runtime.QuarkusQsonMapper;
 import io.quarkus.qson.runtime.QuarkusQsonRegistry;
 import io.quarkus.qson.util.Types;
+import java.util.Objects;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.AnnotationValue;
@@ -46,6 +47,7 @@ public class QsonBuildStep {
     public static final DotName QSON_TRANSFORMER = DotName.createSimple(QsonTransformer.class.getName());
     public static final DotName QSON_CUSTOM_WRITER = DotName.createSimple(QsonCustomWriter.class.getName());
     public static final DotName QUARKUS_QSON_INITIALIZER = DotName.createSimple(QuarkusQsonInitializer.class.getName());
+    public static final DotName QUARKUS_QSON_GENERATOR = DotName.createSimple(QuarkusQsonGenerator.class.getName());
     public static final DotName QSON_PROPERTY = DotName.createSimple(QsonProperty.class.getName());
     public static final DotName QSON_IGNORE = DotName.createSimple(QsonIgnore.class.getName());
 
@@ -171,7 +173,7 @@ public GeneratedQsonClassesBuildItem generate(BuildProducer<GeneratedClassBuildI
                     || !Modifier.isStatic(method.flags())
                     || method.returnType().kind() != org.jboss.jandex.Type.Kind.VOID
                     || method.parameters().size() != 1
-                    || method.parameters().get(0).kind() != org.jboss.jandex.Type.Kind.CLASS
+                    || !Objects.equals(method.parameters().get(0).type().name(), QUARKUS_QSON_GENERATOR)
             ) {
                 throw new BuildException("Bad signature for @QuarkusQsonInitializer annotated method: " + method.toString(), Collections.emptyList());
             }

diff --git a/quarkus/extension/deployment/src/test/java/io/quarkus/qson/test/ConfigTest.java b/quarkus/extension/deployment/src/test/java/io/quarkus/qson/test/ConfigTest.java
@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Date;
 
 public class ConfigTest {

diff --git a/quarkus/extension/deployment/src/test/java/io/quarkus/qson/test/InitializerTest.java b/quarkus/extension/deployment/src/test/java/io/quarkus/qson/test/InitializerTest.java
@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Date;
 
 public class InitializerTest {

diff --git a/quarkus/extension/deployment/src/test/java/io/quarkus/qson/test/TransformerTest.java b/quarkus/extension/deployment/src/test/java/io/quarkus/qson/test/TransformerTest.java
@@ -12,7 +12,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class TransformerTest {
 

diff --git a/quarkus/extension/runtime/pom.xml b/quarkus/extension/runtime/pom.xml
@@ -31,14 +31,14 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${quarkus.platform.version}</version>
                 <executions>
                     <execution>
+                        <phase>compile</phase>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
                             <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
                             </deployment>

diff --git a/quarkus/extension/runtime/src/main/java/io/quarkus/qson/runtime/QuarkusQsonMapper.java b/quarkus/extension/runtime/src/main/java/io/quarkus/qson/runtime/QuarkusQsonMapper.java
@@ -3,7 +3,7 @@
 import io.quarkus.qson.parser.QsonParser;
 import io.quarkus.qson.writer.QsonObjectWriter;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.lang.reflect.Type;
 
 /**

diff --git a/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java b/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java
@@ -3,7 +3,7 @@
 import io.quarkus.funqy.Funq;
 import io.smallrye.mutiny.Uni;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class GreetingFunctions {
     @Inject

diff --git a/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java b/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java
@@ -1,6 +1,6 @@
 package io.quarkus.funqy.test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class GreetingService {

diff --git a/quarkus/funqy-http/runtime/pom.xml b/quarkus/funqy-http/runtime/pom.xml
@@ -31,14 +31,14 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${quarkus.platform.version}</version>
                 <executions>
                     <execution>
+                        <phase>compile</phase>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
                             <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
                             </deployment>

diff --git a/...ttp/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java b/...ttp/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java
@@ -22,8 +22,8 @@
 import io.vertx.ext.web.RoutingContext;
 import org.jboss.logging.Logger;
 
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.CDI;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 

diff --git a/quarkus/resteasy-qson-common/deployment/pom.xml b/quarkus/resteasy-qson-common/deployment/pom.xml
@@ -25,8 +25,8 @@
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/...eployment/src/main/java/io/quarkus/qson/resteasy/deployment/CommonQsonJaxrsBuildStep.java b/...eployment/src/main/java/io/quarkus/qson/resteasy/deployment/CommonQsonJaxrsBuildStep.java
@@ -12,11 +12,12 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.MethodParameterInfo;
 import org.jboss.jandex.Type;
 
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -144,7 +145,7 @@ private Method findMethod(MethodInfo method) throws Exception {
             return declaring.getDeclaredMethod(method.name());
         }
         List<Class> params = new LinkedList<>();
-        for (Type type : method.parameters()) {
+        for (Type type : method.parameterTypes()) {
             params.add(tcl.loadClass(type.name().toString()));
         }
         return declaring.getDeclaredMethod(method.name(), params.toArray(new Class[params.size()]));

diff --git a/...sy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/DotNames.java b/...sy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/DotNames.java
@@ -7,11 +7,11 @@ public final class DotNames {
     private DotNames() {
     }
 
-    static final DotName CONSUMES = DotName.createSimple("javax.ws.rs.Consumes");
-    static final DotName PRODUCES = DotName.createSimple("javax.ws.rs.Produces");
-    static final DotName GET = DotName.createSimple("javax.ws.rs.GET");
-    static final DotName DELETE = DotName.createSimple("javax.ws.rs.DELETE");
-    static final DotName PATCH = DotName.createSimple("javax.ws.rs.PATCH");
-    static final DotName POST = DotName.createSimple("javax.ws.rs.POST");
-    static final DotName PUT = DotName.createSimple("javax.ws.rs.PUT");
+    static final DotName CONSUMES = DotName.createSimple("jakarta.ws.rs.Consumes");
+    static final DotName PRODUCES = DotName.createSimple("jakarta.ws.rs.Produces");
+    static final DotName GET = DotName.createSimple("jakarta.ws.rs.GET");
+    static final DotName DELETE = DotName.createSimple("jakarta.ws.rs.DELETE");
+    static final DotName PATCH = DotName.createSimple("jakarta.ws.rs.PATCH");
+    static final DotName POST = DotName.createSimple("jakarta.ws.rs.POST");
+    static final DotName PUT = DotName.createSimple("jakarta.ws.rs.PUT");
 }
diff --git a/quarkus/resteasy-qson-common/runtime/pom.xml b/quarkus/resteasy-qson-common/runtime/pom.xml
@@ -23,14 +23,14 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${quarkus.platform.version}</version>
                 <executions>
                     <execution>
+                        <phase>compile</phase>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
                             <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
                             </deployment>

diff --git a/...kus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AbstractResource.java b/...kus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AbstractResource.java
@@ -1,8 +1,8 @@
 package io.quarkus.qson.resteasy;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Produces;
 
 public abstract class AbstractResource<T> {
 

diff --git a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AddressResource.java b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AddressResource.java
@@ -1,6 +1,6 @@
 package io.quarkus.qson.resteasy;
 
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
 
 @Path("/address")
 public class AddressResource extends AbstractResource<Address> {

diff --git a/...kus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/CustomerResource.java b/...kus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/CustomerResource.java
@@ -3,14 +3,14 @@
 import io.quarkus.qson.runtime.QuarkusQsonMapper;
 import org.junit.jupiter.api.Assertions;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/OnClassResource.java b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/OnClassResource.java
@@ -1,9 +1,9 @@
 package io.quarkus.qson.resteasy;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
 
 @Path("/onclass")
 @Produces("application/json")

diff --git a/quarkus/resteasy-qson/runtime/pom.xml b/quarkus/resteasy-qson/runtime/pom.xml
@@ -27,17 +27,16 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${quarkus.platform.version}</version>
                 <executions>
                     <execution>
+                        <phase>compile</phase>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
-                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
-                            </deployment>
+                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...kus/resteasy-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java b/...kus/resteasy-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java
@@ -1,13 +1,13 @@
 package io.quarkus.qson.resteasy;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/...TA-INF/services/javax.ws.rs.ext.Providers → ...-INF/services/jakarta.ws.rs.ext.Providers b/...TA-INF/services/javax.ws.rs.ext.Providers → ...-INF/services/jakarta.ws.rs.ext.Providers
diff --git a/...main/java/io/quarkus/qson/resteasy/reactive/deployment/QsonResteasyReactiveBuildStep.java b/...main/java/io/quarkus/qson/resteasy/reactive/deployment/QsonResteasyReactiveBuildStep.java
@@ -9,7 +9,7 @@
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Collections;
 
 public class QsonResteasyReactiveBuildStep {

diff --git a/...ive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AbstractResource.java b/...ive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AbstractResource.java
@@ -1,8 +1,8 @@
 package io.quarkus.qson.resteasy.reactive;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Produces;
 
 public abstract class AbstractResource<T> {
 

diff --git a/...tive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AddressResource.java b/...tive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AddressResource.java
@@ -1,6 +1,6 @@
 package io.quarkus.qson.resteasy.reactive;
 
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
 
 @Path("/address")
 public class AddressResource extends AbstractResource<Address> {

diff --git a/...ive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/CustomerResource.java b/...ive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/CustomerResource.java
@@ -3,14 +3,14 @@
 import io.quarkus.qson.runtime.QuarkusQsonMapper;
 import org.junit.jupiter.api.Assertions;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/...tive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/OnClassResource.java b/...tive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/OnClassResource.java
@@ -1,9 +1,9 @@
 package io.quarkus.qson.resteasy.reactive;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
 
 @Path("/onclass")
 @Produces("application/json")