Merge pull request #532 from thescouser89/quarkus3-fix

Migrate to Quarkus 3
project-ncl · Jan 23, 2025 · e219d34 · e219d34
2 parents db11b4d + fc3bf84
commit e219d34
Show file tree

Hide file tree

Showing 55 changed files with 252 additions and 280 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,19 +37,19 @@
   <properties>
     <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.package.type>uber-jar</quarkus.package.type>
+    <quarkus.platform.version>3.17.5</quarkus.platform.version>
     <compiler-plugin.version>3.13.0</compiler-plugin.version>
     <failsafe.useModulePath>false</failsafe.useModulePath>
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <surefire-plugin.version>3.5.2</surefire-plugin.version>
     <version.elasticSearch>5.6.15</version.elasticSearch>
-    <quarkus.package.type>uber-jar</quarkus.package.type>
+    <quarkus.package.jar.type>uber-jar</quarkus.package.jar.type>
     <elasticsearch.maven.plugin.version>6.23</elasticsearch.maven.plugin.version>
     <excludeTags>debug-test</excludeTags>
     <tagSuffix />
+    <quarkus.package.jar.type>uber-jar</quarkus.package.jar.type>
   </properties>
 
   <scm>
@@ -93,19 +93,11 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-jackson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+      <artifactId>quarkus-messaging-kafka</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -146,12 +138,20 @@
     <dependency>
       <groupId>org.jboss.pnc</groupId>
       <artifactId>pnc-api</artifactId>
-      <version>3.0.0</version>
+      <classifier>jakarta</classifier>
+      <version>3.0.5</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.pnc</groupId>
       <artifactId>pnc-common</artifactId>
+      <classifier>jakarta</classifier>
       <version>3.0.1</version>
+      <exclusions>
+        <exclusion>  <!-- don't pull in regular pnc-api, we need the jakarta one -->
+          <groupId>org.jboss.pnc</groupId>
+          <artifactId>pnc-api</artifactId>
+        </exclusion>
+      </exclusions> 
     </dependency>
     <dependency>
       <groupId>com.thetransactioncompany</groupId>
@@ -175,17 +175,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-jdbc-h2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-test-h2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-jackson</artifactId>
+      <artifactId>quarkus-resteasy-client-jackson</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -194,11 +184,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-opentelemetry-exporter-otlp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-context</artifactId>
+      <artifactId>quarkus-opentelemetry</artifactId>
     </dependency>
     <dependency>
       <groupId>org.elasticsearch.client</groupId>
@@ -273,9 +259,9 @@
           </execution>
         </executions>
         <configuration>
-          <systemProperties>
+          <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-          </systemProperties>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
       <plugin>

diff --git a/src/main/java/org/jboss/pnc/bifrost/Config.java b/src/main/java/org/jboss/pnc/bifrost/Config.java
@@ -21,7 +21,7 @@
 import lombok.Setter;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>

diff --git a/src/main/java/org/jboss/pnc/bifrost/Lifecycle.java b/src/main/java/org/jboss/pnc/bifrost/Lifecycle.java
@@ -26,8 +26,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/org/jboss/pnc/bifrost/common/ChecksumValidatingStream.java b/src/main/java/org/jboss/pnc/bifrost/common/ChecksumValidatingStream.java
@@ -17,8 +17,8 @@
  */
 package org.jboss.pnc.bifrost.common;
 
-import javax.validation.ValidationException;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.validation.ValidationException;
+import jakarta.xml.bind.DatatypeConverter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.DigestInputStream;

diff --git a/src/main/java/org/jboss/pnc/bifrost/common/DateUtil.java b/src/main/java/org/jboss/pnc/bifrost/common/DateUtil.java
@@ -20,7 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.TemporalAccessor;

diff --git a/src/main/java/org/jboss/pnc/bifrost/common/MainBean.java b/src/main/java/org/jboss/pnc/bifrost/common/MainBean.java
@@ -17,7 +17,7 @@
  */
 package org.jboss.pnc.bifrost.common;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 

diff --git a/src/main/java/org/jboss/pnc/bifrost/common/Produced.java b/src/main/java/org/jboss/pnc/bifrost/common/Produced.java
@@ -17,7 +17,7 @@
  */
 package org.jboss.pnc.bifrost.common;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 

diff --git a/src/main/java/org/jboss/pnc/bifrost/common/scheduler/BackOffRunnableConfig.java b/src/main/java/org/jboss/pnc/bifrost/common/scheduler/BackOffRunnableConfig.java
@@ -21,7 +21,7 @@
 import lombok.Setter;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>

diff --git a/src/main/java/org/jboss/pnc/bifrost/common/scheduler/Subscriptions.java b/src/main/java/org/jboss/pnc/bifrost/common/scheduler/Subscriptions.java
@@ -21,16 +21,15 @@
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.opentelemetry.context.Context;
-
+import jakarta.annotation.PostConstruct;
 import org.apache.lucene.util.NamedThreadFactory;
 import org.jboss.pnc.bifrost.Config;
 import org.jboss.pnc.bifrost.common.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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;
 import java.util.Map;
 import java.util.Optional;

diff --git a/src/main/java/org/jboss/pnc/bifrost/endpoint/BifrostHealthCheck.java b/src/main/java/org/jboss/pnc/bifrost/endpoint/BifrostHealthCheck.java
@@ -26,8 +26,8 @@
 import org.eclipse.microprofile.health.Readiness;
 import org.eclipse.microprofile.reactive.messaging.spi.Connector;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 /**
  * @author <a href="mailto:[email protected]">Matej Lazar</a>

diff --git a/src/main/java/org/jboss/pnc/bifrost/endpoint/FinalLogImpl.java b/src/main/java/org/jboss/pnc/bifrost/endpoint/FinalLogImpl.java
@@ -19,6 +19,8 @@
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.configuration.MemorySize;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.hibernate.engine.jdbc.BlobProxy;
@@ -34,28 +36,28 @@
 import org.jboss.pnc.common.concurrent.Sequence;
 import org.jboss.pnc.common.pnc.LongBase32IdConverter;
 
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
-import javax.validation.Valid;
-import javax.validation.ValidationException;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.validation.ValidationException;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Set;
@@ -91,9 +93,16 @@ public String uploadFinalLog(@Valid FinalLogUpload logUpload, @Context HttpHeade
             finalLog.tags = Set.of(logUpload.getTag().split(","));
         }
 
+        InputStream fileInputStream;
+
+        try {
+            fileInputStream = new FileInputStream(logUpload.getLogfile().uploadedFile().toFile());
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
         long logUploadStarted = System.currentTimeMillis();
-        ChecksumValidatingStream stream = ChecksumValidatingStream
-                .validate(logUpload.getLogfile(), logUpload.getMd5sum());
+        ChecksumValidatingStream stream = ChecksumValidatingStream.validate(fileInputStream, logUpload.getMd5sum());
 
         // Configure the proxy to read up to the max body post size. The proxy behaves well if the input
         // stream size is less than that size

diff --git a/src/main/java/org/jboss/pnc/bifrost/endpoint/Quarkus2StreamingOutputMessageBodyWriter.java b/src/main/java/org/jboss/pnc/bifrost/endpoint/Quarkus2StreamingOutputMessageBodyWriter.java
@@ -1,11 +1,11 @@
 package org.jboss.pnc.bifrost.endpoint;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.StreamingOutput;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;

diff --git a/src/main/java/org/jboss/pnc/bifrost/endpoint/RestImpl.java b/src/main/java/org/jboss/pnc/bifrost/endpoint/RestImpl.java
@@ -20,8 +20,8 @@
 import io.micrometer.core.annotation.Timed;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
-import io.opentelemetry.extension.annotations.WithSpan;
-
+import io.opentelemetry.instrumentation.annotations.WithSpan;
+import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import org.jboss.pnc.api.bifrost.dto.Line;
@@ -40,12 +40,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.ws.rs.Path;
-import javax.ws.rs.ServerErrorException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.ServerErrorException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/src/main/java/org/jboss/pnc/bifrost/endpoint/configuration/AllExceptionMapper.java b/src/main/java/org/jboss/pnc/bifrost/endpoint/configuration/AllExceptionMapper.java
@@ -22,18 +22,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotAllowedException;
-import javax.ws.rs.NotAuthorizedException;
-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.inject.Inject;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotAllowedException;
+import jakarta.ws.rs.NotAuthorizedException;
+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 static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
 
 @Provider
 public class AllExceptionMapper implements ExceptionMapper<Exception> {