Bump Quarkus 3 Alpha 3 and migrate to Jakarta

bumps Quarkus, migrates to Jakarta, disables tests that do not work due to conflict between javax and jakarta
quarkus-qe · Feb 6, 2023 · dc0fb89 · dc0fb89
1 parent cbeaee8
commit dc0fb89
Show file tree

Hide file tree

Showing 77 changed files with 320 additions and 327 deletions.
diff --git a/.github/workflows/daily.yaml b/.github/workflows/daily.yaml
@@ -149,7 +149,7 @@ jobs:
 #          password: ${{ secrets.CI_REGISTRY_PASSWORD }}
       - name: Build Quarkus CLI
         run: |
-          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
+          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
       - name: Install Quarkus CLI
         run: |
           cat <<EOF > ./quarkus-dev-cli

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -155,7 +155,7 @@ jobs:
         run: tar -xzf maven-repo.tgz -C ~
       - name: Build Quarkus CLI
         run: |
-          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
+          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
       - name: Install Quarkus CLI
         run: |
           cat <<EOF > ./quarkus-dev-cli

diff --git a/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceConsumer.java b/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceConsumer.java
@@ -3,11 +3,11 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.jboss.logging.Logger;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class PriceConsumer {
 

diff --git a/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceProducer.java b/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceProducer.java
@@ -2,12 +2,11 @@
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 import org.jboss.logging.Logger;
 
 import io.smallrye.mutiny.Multi;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class PriceProducer {

diff --git a/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceResource.java b/examples/amq-amqp/src/main/java/io/quarkus/qe/amqp/PriceResource.java
@@ -1,11 +1,11 @@
 package io.quarkus.qe.amqp;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+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 jakarta.ws.rs.core.Response;
 
 @Path("/")
 public class PriceResource {

diff --git a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/FileResource.java b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/FileResource.java
@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 
-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("/file")
 public class FileResource {

diff --git a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceConsumer.java b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceConsumer.java
@@ -1,13 +1,14 @@
 package io.quarkus.qe.tcp;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
 import javax.jms.ConnectionFactory;
 import javax.jms.JMSConsumer;
 import javax.jms.JMSContext;
 import javax.jms.Message;
 import javax.jms.Session;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 /**
  * A bean consuming prices from the JMS queue.
  */

diff --git a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java
@@ -5,14 +5,14 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
 import javax.jms.ConnectionFactory;
 import javax.jms.JMSContext;
 import javax.jms.Session;
 
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 
 /**
  * A bean producing random prices every 5 seconds and sending them to the prices JMS queue.

diff --git a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceResource.java b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceResource.java
@@ -1,10 +1,10 @@
 package io.quarkus.qe.tcp;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+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;
 
 /**
  * A simple resource showing the last price.

diff --git a/examples/amq-tcp/src/test/java/io/quarkus/qe/tcp/OpenShiftTcpAmqIT.java b/examples/amq-tcp/src/test/java/io/quarkus/qe/tcp/OpenShiftTcpAmqIT.java
@@ -1,7 +1,11 @@
 package io.quarkus.qe.tcp;
 
+import org.junit.jupiter.api.Disabled;
+
 import io.quarkus.test.scenarios.OpenShiftScenario;
 
+// TODO: enable with next Quarkus Artemis bump
+@Disabled("Disabled until Quarkus Artemis using Jakarta is released")
 @OpenShiftScenario
 public class OpenShiftTcpAmqIT extends TcpAmqIT {
 

diff --git a/examples/amq-tcp/src/test/java/io/quarkus/qe/tcp/TcpAmqIT.java b/examples/amq-tcp/src/test/java/io/quarkus/qe/tcp/TcpAmqIT.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.bootstrap.AmqService;
@@ -19,6 +20,8 @@
 import io.quarkus.test.services.QuarkusApplication;
 import io.quarkus.test.services.containers.model.AmqProtocol;
 
+// TODO: enable with next Quarkus Artemis bump
+@Disabled("Disabled until Quarkus Artemis using Jakarta is released")
 @QuarkusScenario
 public class TcpAmqIT {
 

diff --git a/examples/blocking-reactive-model/pom.xml b/examples/blocking-reactive-model/pom.xml
@@ -10,10 +10,6 @@
     <artifactId>examples-blocking-reactive</artifactId>
     <name>Quarkus - Test Framework - Examples - Blocking + Reactive Model</name>
     <dependencies>
-        <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
@@ -33,6 +29,10 @@
             <artifactId>quarkus-test-kubernetes</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/examples/blocking-reactive-model/src/main/java/io/quarkus/qe/GreetingResource.java b/examples/blocking-reactive-model/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("/hello")
 public class GreetingResource {

diff --git a/examples/consul/src/main/java/io/quarkus/qe/GreetingResource.java b/examples/consul/src/main/java/io/quarkus/qe/GreetingResource.java
@@ -1,12 +1,12 @@
 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 org.eclipse.microprofile.config.inject.ConfigProperty;
 
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
 @Path("/api")
 public class GreetingResource {
 

diff --git a/...database-mysql/src/main/java/io/quarkus/qe/database/mysql/ApplicationExceptionMapper.java b/...database-mysql/src/main/java/io/quarkus/qe/database/mysql/ApplicationExceptionMapper.java
@@ -1,13 +1,13 @@
 package io.quarkus.qe.database.mysql;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 public class ApplicationExceptionMapper implements ExceptionMapper<Exception> {
     @Override

diff --git a/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/Book.java b/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/Book.java
@@ -1,10 +1,9 @@
 package io.quarkus.qe.database.mysql;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
-
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 
 @Entity
 @Table(name = "book")

diff --git a/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/BookResource.java b/examples/database-mysql/src/main/java/io/quarkus/qe/database/mysql/BookResource.java
@@ -2,22 +2,21 @@
 
 import java.util.List;
 
-import javax.transaction.Transactional;
-import javax.validation.Valid;
-import javax.ws.rs.ClientErrorException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import io.quarkus.panache.common.Sort;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 @Path("/book")
 @Produces(MediaType.APPLICATION_JSON)

diff --git a/...es/database-mysql/src/main/java/io/quarkus/qe/database/mysql/NotFoundExceptionMapper.java b/...es/database-mysql/src/main/java/io/quarkus/qe/database/mysql/NotFoundExceptionMapper.java
@@ -1,9 +1,9 @@
 package io.quarkus.qe.database.mysql;
 
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
 // workaround for Quarkus providing its own NotFoundExceptionMapper
 // which is more specific than our ApplicationExceptionMapper

diff --git a/.../database-mysql/src/main/java/io/quarkus/qe/database/mysql/ValidationExceptionMapper.java b/.../database-mysql/src/main/java/io/quarkus/qe/database/mysql/ValidationExceptionMapper.java
@@ -1,15 +1,15 @@
 package io.quarkus.qe.database.mysql;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 public class ValidationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
 

diff --git a/...tabase-oracle/src/main/java/io/quarkus/qe/database/oracle/ApplicationExceptionMapper.java b/...tabase-oracle/src/main/java/io/quarkus/qe/database/oracle/ApplicationExceptionMapper.java
@@ -1,13 +1,13 @@
 package io.quarkus.qe.database.oracle;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 public class ApplicationExceptionMapper implements ExceptionMapper<Exception> {
     @Override

diff --git a/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/Book.java b/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/Book.java
@@ -1,10 +1,9 @@
 package io.quarkus.qe.database.oracle;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
-
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 
 @Entity
 @Table(name = "book")

diff --git a/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/BookResource.java b/examples/database-oracle/src/main/java/io/quarkus/qe/database/oracle/BookResource.java
@@ -2,22 +2,21 @@
 
 import java.util.List;
 
-import javax.transaction.Transactional;
-import javax.validation.Valid;
-import javax.ws.rs.ClientErrorException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import io.quarkus.panache.common.Sort;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 @Path("/book")
 @Produces(MediaType.APPLICATION_JSON)