Upgrade to Quarkus 3.6.9

pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2</version>
+    <version>5</version>
   </parent>
   <groupId>org.commonjava.util</groupId>
   <artifactId>sidecar</artifactId>
@@ -39,7 +39,7 @@
     <projectEmail>https://github.com/Commonjava/indy-sidecar</projectEmail>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0</surefire-plugin.version>
 
     <httpTestserverVersion>2.2</httpTestserverVersion>
   </properties>
@@ -71,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-opentelemetry-exporter-otlp</artifactId>
+      <artifactId>quarkus-opentelemetry</artifactId>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
@@ -88,15 +88,15 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-jsonb</artifactId>
+      <artifactId>quarkus-rest-client-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-reactive-routes</artifactId>
+      <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-mutiny</artifactId>
+      <artifactId>quarkus-reactive-routes</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -110,6 +110,11 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.11.0</version>
+    </dependency>
     <dependency>
       <groupId>io.smallrye.reactive</groupId>
       <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
@@ -147,6 +152,7 @@
       <plugin>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus.version}</version>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

src/main/java/org/commonjava/util/sidecar/client/folo/TrackingService.java

@@ -17,11 +17,11 @@
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 @Path( "/api/folo/admin" )
 @RegisterRestClient( configKey = "tracking-service-api" )

src/main/java/org/commonjava/util/sidecar/config/ProxyConfiguration.java

@@ -26,9 +26,9 @@
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

src/main/java/org/commonjava/util/sidecar/config/SidecarConfig.java

@@ -15,17 +15,14 @@
  */
 package org.commonjava.util.sidecar.config;
 
-import io.quarkus.arc.config.ConfigProperties;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import io.smallrye.config.ConfigMapping;
 
 import java.util.Optional;
 
-@ConfigProperties( prefix = "sidecar" )
-public class SidecarConfig
+@ConfigMapping( prefix = "sidecar" )
+public interface SidecarConfig
 {
-    @ConfigProperty( name = "archive-api" )
-    public Optional<String> archiveApi;
+    Optional<String> archiveApi();
 
-    @ConfigProperty( name = "local-repository" )
-    public Optional<String> localRepository;
+    Optional<String> localRepository();
 }

src/main/java/org/commonjava/util/sidecar/interceptor/ExceptionHandler.java

@@ -15,7 +15,7 @@
  */
 package org.commonjava.util.sidecar.interceptor;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 

src/main/java/org/commonjava/util/sidecar/interceptor/ExceptionHandlerInterceptor.java

@@ -18,10 +18,10 @@
 import io.smallrye.mutiny.Uni;
 import org.commonjava.util.sidecar.exception.ServiceNotFoundException;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-import javax.ws.rs.core.Response;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
+import jakarta.ws.rs.core.Response;
 
 @Interceptor
 @ExceptionHandler

src/main/java/org/commonjava/util/sidecar/jaxrs/FoloContentAccessResource.java

@@ -32,15 +32,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HEAD;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Optional;

src/main/java/org/commonjava/util/sidecar/jaxrs/ProxyResource.java

@@ -22,15 +22,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HEAD;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
 import java.io.InputStream;
 
 @Path( "/{path: (.*)}" )

src/main/java/org/commonjava/util/sidecar/services/ArchiveRetrieveService.java

@@ -19,8 +19,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.io.File;
 import java.util.Optional;
 
@@ -42,7 +42,7 @@ public class ArchiveRetrieveService
 
     public Optional<File> getLocally( final String path )
     {
-        File download = new File( sidecarConfig.localRepository.orElse( DEFAULT_REPO_PATH ) + File.separator + path );
+        File download = new File( sidecarConfig.localRepository().orElse( DEFAULT_REPO_PATH ) + File.separator + path );
         if ( !download.exists() )
         {
             return Optional.empty();

src/main/java/org/commonjava/util/sidecar/services/Classifier.java

@@ -28,9 +28,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/org/commonjava/util/sidecar/services/ProxyService.java

@@ -28,13 +28,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.Response;
 import java.io.InputStream;
 
 import static io.vertx.core.http.HttpMethod.HEAD;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
 import static org.commonjava.util.sidecar.services.PreSeedConstants.FOLO_TRACK_REST_BASE_PATH;
 import static org.commonjava.util.sidecar.services.PreSeedConstants.FORBIDDEN_HEADERS;
 import static org.commonjava.util.sidecar.util.SidecarUtils.normalizePathAnd;

src/main/java/org/commonjava/util/sidecar/services/ReportService.java

@@ -29,10 +29,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.Response;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -67,7 +67,7 @@ public class ReportService
     @PostConstruct
     void init()
     {
-        loadReport( sidecarConfig.localRepository.orElse( DEFAULT_REPO_PATH ) );
+        loadReport( sidecarConfig.localRepository().orElse( DEFAULT_REPO_PATH ) );
     }
 
     private void loadReport( String path )

src/main/java/org/commonjava/util/sidecar/util/OtelAdapter.java

@@ -24,8 +24,8 @@
 import okhttp3.Request;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class OtelAdapter

src/main/java/org/commonjava/util/sidecar/util/ProxyStreamingOutput.java

@@ -22,7 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.OutputStream;
 

src/main/java/org/commonjava/util/sidecar/util/TransferStreamingOutput.java

@@ -20,8 +20,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

src/main/java/org/commonjava/util/sidecar/util/WebClientAdapter.java

@@ -50,8 +50,8 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.HttpHeaders.HOST;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static jakarta.ws.rs.core.HttpHeaders.HOST;
 import static org.commonjava.util.sidecar.util.SidecarUtils.getMediaType;
 
 public class WebClientAdapter

src/test/java/org/commonjava/util/sidecar/ftest/MavenDownloadContentTest.java

@@ -24,8 +24,8 @@
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
 
 @QuarkusTest
 @TestProfile( SidecarFunctionProfile.class )

src/test/java/org/commonjava/util/sidecar/ftest/TrackedContentDownloadTest.java

@@ -26,12 +26,12 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import static io.restassured.RestAssured.given;
 import static io.restassured.parsing.Parser.JSON;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.hamcrest.CoreMatchers.containsString;
 
 @QuarkusTest

src/test/java/org/commonjava/util/sidecar/ftest/mock/BuildConfigIdEnvMock.java

@@ -17,8 +17,8 @@
 
 import org.commonjava.util.sidecar.services.ArchiveRetrieveService;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
 
 @ApplicationScoped
 @Alternative

src/test/java/org/commonjava/util/sidecar/jaxrs/MavenDownloadFromArchiveTest.java

@@ -23,8 +23,8 @@
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
 
 @QuarkusTest
 @TestProfile( MockTestProfile.class )

src/test/java/org/commonjava/util/sidecar/jaxrs/NPMDownloadFromArchiveTest.java

@@ -23,8 +23,8 @@
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
 
 @QuarkusTest
 @TestProfile( MockTestProfile.class )

src/test/java/org/commonjava/util/sidecar/jaxrs/mock/MockArchiveRetrieveService.java

@@ -18,9 +18,9 @@
 import org.apache.commons.io.FileUtils;
 import org.commonjava.util.sidecar.services.ArchiveRetrieveService;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
 import java.io.File;
 import java.io.IOException;