Migrate to Quarkus 3

pom.xml

@@ -63,10 +63,9 @@
     <quarkus-logging-kafka.version>1.0.6</quarkus-logging-kafka.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>2.16.12.Final</quarkus.platform.version>
+    <quarkus.platform.version>3.18.2</quarkus.platform.version>
     <compiler-plugin.version>3.13.0</compiler-plugin.version>
     <surefire-plugin.version>3.5.2</surefire-plugin.version>
-    <quarkus.package.type>uber-jar</quarkus.package.type>
     <indy.version>3.3.3</indy.version>
     <wiremock.version>2.35.2</wiremock.version>
     <!-- Package URL -->
@@ -75,6 +74,7 @@
     <version.javadoc.plugin>3.11.2</version.javadoc.plugin>
     <version.source.plugin>3.3.1</version.source.plugin>
     <tagSuffix />
+    <quarkus.package.jar.type>uber-jar</quarkus.package.jar.type>
   </properties>
 
   <dependencyManagement>
@@ -127,20 +127,16 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-jackson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-mutiny</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-mutiny</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
+    <!-- <dependency> -->
+    <!--   <groupId>io.quarkus</groupId> -->
+    <!--   <artifactId>quarkus-mutiny</artifactId> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>io.quarkus</groupId> -->
+    <!--   <artifactId>quarkus-resteasy-mutiny</artifactId> -->
+    <!-- </dependency> -->
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-arc</artifactId>
@@ -167,7 +163,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-opentelemetry-exporter-otlp</artifactId>
+      <artifactId>quarkus-opentelemetry</artifactId>
     </dependency>
     <dependency>
       <groupId>org.commonjava.indy</groupId>

src/main/java/org/jboss/pnc/repositorydriver/ApplicationLifecycle.java

@@ -4,8 +4,8 @@
 import io.quarkus.runtime.StartupEvent;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 
 @ApplicationScoped
 @Slf4j

src/main/java/org/jboss/pnc/repositorydriver/BeanFactory.java

@@ -5,13 +5,13 @@
 import java.time.Duration;
 import java.util.Optional;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 import javax.net.ssl.SSLContext;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.lang.StringUtils;
 import org.commonjava.cdi.util.weft.config.DefaultWeftConfig;
 import org.commonjava.cdi.util.weft.config.WeftConfig;

src/main/java/org/jboss/pnc/repositorydriver/Configuration.java

@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/org/jboss/pnc/repositorydriver/Driver.java

@@ -74,8 +74,8 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -591,7 +591,7 @@ private HttpRequest getNotifyHttpRequest(Request callback, String body) {
         callback.getHeaders().forEach(h -> builder.header(h.getName(), h.getValue()));
         // Add the service account's access token. We use a fresh one instead of serviceTokens since serviceTokens might
         // already be closed to expiry when we hit this method inside the executor
-        builder.header(javax.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken());
+        builder.header(jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken());
         return builder.build();
     }
 
@@ -981,7 +981,7 @@ private Runnable heartBeatSender(Request heartBeat) {
                     .method(heartBeat.getMethod().name(), HttpRequest.BodyPublishers.noBody())
                     .timeout(Duration.ofSeconds(configuration.getHttpClientRequestTimeout()));
             heartBeat.getHeaders().forEach(h -> builder.header(h.getName(), h.getValue()));
-            builder.header(javax.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken());
+            builder.header(jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION, "Bearer " + getFreshAccessToken());
             HttpRequest request = builder.build();
 
             CompletableFuture<HttpResponse<String>> response = httpClient

src/main/java/org/jboss/pnc/repositorydriver/TrackingReportProcessor.java

@@ -6,7 +6,7 @@
 import com.github.packageurl.MalformedPackageURLException;
 import com.github.packageurl.PackageURL;
 import com.github.packageurl.PackageURLBuilder;
-
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.lang.StringUtils;
 import org.commonjava.atlas.maven.ident.ref.ArtifactRef;
 import org.commonjava.atlas.maven.ident.ref.SimpleArtifactRef;
@@ -33,11 +33,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import java.io.File;
 import java.net.MalformedURLException;

src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterArchive.java

@@ -17,13 +17,13 @@
  */
 package org.jboss.pnc.repositorydriver.artifactfilter;
 
+import jakarta.annotation.PostConstruct;
 import org.commonjava.indy.folo.dto.TrackedContentEntryDTO;
 import org.commonjava.indy.model.core.StoreKey;
 import org.jboss.pnc.repositorydriver.Configuration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import java.util.Collections;
 

src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterDatabase.java

@@ -17,13 +17,13 @@
  */
 package org.jboss.pnc.repositorydriver.artifactfilter;
 
+import jakarta.annotation.PostConstruct;
 import org.commonjava.indy.folo.dto.TrackedContentEntryDTO;
 import org.commonjava.indy.model.core.StoreKey;
 import org.jboss.pnc.repositorydriver.Configuration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import static org.commonjava.indy.model.core.GenericPackageTypeDescriptor.GENERIC_PKG_KEY;
 import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;

src/main/java/org/jboss/pnc/repositorydriver/artifactfilter/ArtifactFilterPromotion.java

@@ -17,13 +17,13 @@
  */
 package org.jboss.pnc.repositorydriver.artifactfilter;
 
+import jakarta.annotation.PostConstruct;
 import org.commonjava.indy.folo.dto.TrackedContentEntryDTO;
 import org.commonjava.indy.model.core.StoreKey;
 import org.jboss.pnc.repositorydriver.Configuration;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import static org.commonjava.indy.model.core.GenericPackageTypeDescriptor.GENERIC_PKG_KEY;
 import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;

src/main/java/org/jboss/pnc/repositorydriver/endpoints/Public.java

@@ -18,17 +18,17 @@
 
 package org.jboss.pnc.repositorydriver.endpoints;
 
-import javax.annotation.security.RolesAllowed;
-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.PathParam;
-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.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
+import jakarta.annotation.security.RolesAllowed;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.pnc.api.dto.ComponentVersion;
 import org.jboss.pnc.api.repositorydriver.dto.ArchiveRequest;

src/main/java/org/jboss/pnc/repositorydriver/endpoints/ServiceHealth.java

@@ -1,6 +1,6 @@
 package org.jboss.pnc.repositorydriver.endpoints;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;

src/main/java/org/jboss/pnc/repositorydriver/indy/IndyPNCOAuthBearerAuthenticator.java

@@ -8,8 +8,8 @@
 import org.commonjava.indy.client.core.auth.IndyClientAuthenticator;
 import org.commonjava.util.jhttpc.JHttpCException;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class IndyPNCOAuthBearerAuthenticator extends IndyClientAuthenticator {

src/main/java/org/jboss/pnc/repositorydriver/runtime/ApplicationLifecycle.java

@@ -23,8 +23,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;

src/main/java/org/jboss/pnc/repositorydriver/runtime/BifrostLogUploaderProducer.java

@@ -21,10 +21,9 @@
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.pnc.bifrost.upload.BifrostLogUploader;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 import java.net.URI;
 
 @ApplicationScoped

src/main/java/org/jboss/pnc/repositorydriver/runtime/DefaultExceptionMapper.java

@@ -20,15 +20,14 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.NotFoundException;
-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 jakarta.ws.rs.NotFoundException;
+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;
 
 import org.jboss.pnc.api.dto.ErrorResponse;
-import org.jboss.resteasy.spi.Failure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,13 +54,6 @@ public Response toResponse(Throwable e) {
                 return response; // In case of 404 we want to return the empty body.
             }
             logger.debug("A WebApplicationExceptio occurred when processing REST response", e);
-        } else if (e instanceof Failure) { // Resteasy support
-            Failure failure = ((Failure) e);
-            if (failure.getErrorCode() > 0) {
-                status = failure.getErrorCode();
-            }
-            response = failure.getResponse();
-            logger.debug("A Failure occurred when processing REST response", e);
         } else {
             logger.error("An exception occurred when processing REST response", e);
         }

src/main/java/org/jboss/pnc/repositorydriver/runtime/LoggingFilter.java

@@ -27,14 +27,14 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.Provider;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/jboss/pnc/repositorydriver/runtime/StoppingExceptionMapper.java

@@ -17,9 +17,9 @@
  */
 package org.jboss.pnc.repositorydriver.runtime;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
 
 import org.jboss.pnc.repositorydriver.StoppingException;
 

src/test/java/org/jboss/pnc/repositorydriver/BeanFactoryMock.java

@@ -1,6 +1,6 @@
 package org.jboss.pnc.repositorydriver;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 import io.quarkus.test.Mock;
 import org.commonjava.indy.client.core.Indy;

src/test/java/org/jboss/pnc/repositorydriver/DriverTest.java

@@ -8,9 +8,9 @@
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

src/test/java/org/jboss/pnc/repositorydriver/MockOidcClient.java

@@ -16,16 +16,24 @@ public class MockOidcClient implements OidcClient {
     @Override
     public Uni<Tokens> getTokens(Map<String, String> additionalGrantParameters) {
         return Uni.createFrom()
-                .item(new Tokens("accessToken", 1L, Duration.of(5, ChronoUnit.MINUTES), "refreshToken", 1L, null));
+                .item(
+                        new Tokens(
+                                "accessToken",
+                                1L,
+                                Duration.of(5, ChronoUnit.MINUTES),
+                                "refreshToken",
+                                1L,
+                                null,
+                                "client-id"));
     }
 
     @Override
-    public Uni<Tokens> refreshTokens(String refreshToken) {
+    public Uni<Tokens> refreshTokens(String refreshToken, Map<String, String> something) {
         return null;
     }
 
     @Override
-    public Uni<Boolean> revokeAccessToken(String accessToken) {
+    public Uni<Boolean> revokeAccessToken(String accessToken, Map<String, String> something) {
         return null;
     }