Upgrade service parent to version 5-SNAPSHOT

pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.commonjava</groupId>
         <artifactId>service-parent</artifactId>
-        <version>2</version>
+        <version>5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.commonjava.indy.service</groupId>
@@ -41,11 +41,10 @@
         <httpcoreVersion>4.4.9</httpcoreVersion>
         <httpclientVersion>4.5.13</httpclientVersion>
         <indyModelVersion>1.5-SNAPSHOT</indyModelVersion>
-        <quarkus-plugin.version>2.3.0.Final</quarkus-plugin.version>
         <weftVersion>1.22</weftVersion>
         <keycloakVersion>22.0.3</keycloakVersion>
         <quarkus.package.type>uber-jar</quarkus.package.type>
-        <infinispanVersion>12.1.11.Final</infinispanVersion>
+        <infinispanVersion>14.0.21.Final</infinispanVersion>
     </properties>
 
     <dependencyManagement>
@@ -172,12 +171,12 @@
 
         <dependency>
             <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-core</artifactId>
+            <artifactId>infinispan-core-jakarta</artifactId>
             <version>${infinispanVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-commons</artifactId>
+            <artifactId>infinispan-commons-jakarta</artifactId>
             <version>${infinispanVersion}</version>
         </dependency>
         <dependency>
@@ -196,7 +195,7 @@
         </resources>
         <plugins>
             <plugin>
-                <groupId>io.quarkus</groupId>
+                <groupId>io.quarkus.platform</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
             </plugin>
             <plugin>

src/main/java/org/commonjava/indy/service/httprox/HttpProxy.java

@@ -26,9 +26,9 @@
 import org.xnio.*;
 import org.xnio.channels.AcceptingChannel;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 

src/main/java/org/commonjava/indy/service/httprox/client/Classifier.java

@@ -26,9 +26,8 @@
 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 javax.management.ServiceNotFoundException;
 import java.util.Map;
 import java.util.Set;

src/main/java/org/commonjava/indy/service/httprox/client/content/ContentRetrievalService.java

@@ -24,10 +24,10 @@
 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 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.indy.service.httprox.util.ProxyUtils.normalizePathAnd;
 
 @ApplicationScoped

src/main/java/org/commonjava/indy/service/httprox/client/repository/RepositoryService.java

@@ -19,8 +19,8 @@
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 
 @Path("/api/admin/stores")
 @RegisterRestClient(configKey="repo-service-api")

src/main/java/org/commonjava/indy/service/httprox/config/KeycloakConfig.java

@@ -18,7 +18,7 @@
 import io.quarkus.runtime.Startup;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.Properties;
 
 @Startup

src/main/java/org/commonjava/indy/service/httprox/config/ProxyConfiguration.java

@@ -20,7 +20,7 @@
 import org.commonjava.indy.service.httprox.model.TrackingType;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.Optional;
 
 @Startup

src/main/java/org/commonjava/indy/service/httprox/config/ProxyWeftConfig.java

@@ -18,8 +18,8 @@
 
 import org.commonjava.cdi.util.weft.config.DefaultWeftConfig;
 
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
 
 public class ProxyWeftConfig
 {

src/main/java/org/commonjava/indy/service/httprox/config/ServiceProxyConfig.java

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

src/main/java/org/commonjava/indy/service/httprox/handler/ProxyAcceptHandler.java

@@ -24,6 +24,7 @@
 import org.commonjava.indy.service.httprox.util.CacheProducer;
 import org.commonjava.indy.service.httprox.util.OtelAdapter;
 import org.commonjava.indy.service.httprox.util.RepoCreator;
+import org.eclipse.microprofile.context.ManagedExecutor;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,9 +34,9 @@
 import org.xnio.conduits.ConduitStreamSinkChannel;
 import org.xnio.conduits.ConduitStreamSourceChannel;
 
-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.IOException;
 
 import static org.commonjava.indy.pkg.PackageTypeConstants.PKG_TYPE_GENERIC_HTTP;
@@ -60,7 +61,7 @@ public class ProxyAcceptHandler implements ChannelListener<AcceptingChannel<Stre
     KeycloakProxyAuthenticator proxyAuthenticator;
 
     @Inject
-    ProxyTransfersExecutor proxyExecutor;
+    ManagedExecutor proxyExecutor;
 
     @Inject
     OtelAdapter otel;
@@ -116,7 +117,7 @@ public void handleEvent(AcceptingChannel<StreamConnection> channel) {
         ProxyRepositoryCreator repoCreator = new RepoCreator( config );
 
         final ProxyResponseWriter writer =
-                new ProxyResponseWriter( config, repoCreator, accepted, repositoryService, contentRetrievalService, proxyExecutor.getExecutor(), proxyAuthenticator, objectMapper, cacheProducer, start, otel );
+                new ProxyResponseWriter( config, repoCreator, accepted, repositoryService, contentRetrievalService, proxyExecutor, proxyAuthenticator, objectMapper, cacheProducer, start, otel );
 
         logger.debug("Setting writer: {}", writer);
         sink.getWriteSetter().set(writer);

src/main/java/org/commonjava/indy/service/httprox/handler/ProxyMITMSSLServer.java

@@ -39,8 +39,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static javax.ws.rs.HttpMethod.GET;
-import static javax.ws.rs.HttpMethod.HEAD;
+import static jakarta.ws.rs.HttpMethod.GET;
+import static jakarta.ws.rs.HttpMethod.HEAD;
 import static org.commonjava.indy.service.httprox.util.CertUtils.*;
 import static org.commonjava.indy.service.httprox.util.HttpProxyConstants.GET_METHOD;
 import static org.commonjava.indy.service.httprox.util.PortFinder.findOpenPort;

src/main/java/org/commonjava/indy/service/httprox/handler/ProxyResponseWriter.java

@@ -28,6 +28,7 @@
 import org.commonjava.indy.service.httprox.model.TrackingKey;
 import org.commonjava.indy.service.httprox.model.TrackingType;
 import org.commonjava.indy.service.httprox.util.*;
+import org.eclipse.microprofile.context.ManagedExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xnio.ChannelListener;
@@ -68,7 +69,7 @@ public final class ProxyResponseWriter
     private boolean directed = false;
 
     private ProxyRequestReader proxyRequestReader;
-    private final WeftExecutorService tunnelAndMITMExecutor;
+    private final ManagedExecutor tunnelAndMITMExecutor;
 
     private KeycloakProxyAuthenticator proxyAuthenticator;
 
@@ -82,7 +83,7 @@ public final class ProxyResponseWriter
 
     public ProxyResponseWriter(final ProxyConfiguration config, final ProxyRepositoryCreator repoCreator,
                                final StreamConnection accepted, final RepositoryService repositoryService,
-                               final ContentRetrievalService contentRetrievalService, final WeftExecutorService executor,
+                               final ContentRetrievalService contentRetrievalService, final ManagedExecutor executor,
                                final KeycloakProxyAuthenticator proxyAuthenticator, final IndyObjectMapper indyObjectMapper,
                                final CacheProducer cacheProducer, final long start, final OtelAdapter otel)
     {

src/main/java/org/commonjava/indy/service/httprox/handler/ProxyTransfersExecutor.java

@@ -15,34 +15,29 @@
  */
 package org.commonjava.indy.service.httprox.handler;
 
+import jakarta.inject.Named;
+import jakarta.ws.rs.Produces;
 import org.commonjava.cdi.util.weft.ExecutorConfig;
 import org.commonjava.cdi.util.weft.WeftExecutorService;
 import org.commonjava.cdi.util.weft.WeftManaged;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import org.eclipse.microprofile.context.ManagedExecutor;
 
 import static org.commonjava.cdi.util.weft.ExecutorConfig.BooleanLiteral.FALSE;
 
-@ApplicationScoped
-public class ProxyTransfersExecutor {
-
-    @Inject
-    @WeftManaged
-    @ExecutorConfig( named = "mitm-transfers", threads = 0, priority = 5, loadSensitive = FALSE )
-    WeftExecutorService executor;
 
-    protected ProxyTransfersExecutor()
-    {
-    }
+public class ProxyTransfersExecutor {
 
-    public ProxyTransfersExecutor(WeftExecutorService exec)
+    @Named("mitm-transfers")
+    @ApplicationScoped
+    @Produces
+    public ManagedExecutor getExecutor()
     {
-        this.executor = exec;
-    }
 
-    public WeftExecutorService getExecutor()
-    {
-        return executor;
+        return ManagedExecutor.builder().maxAsync(100)
+            .maxQueued(200)
+            .build();
     }
 }

src/main/java/org/commonjava/indy/service/httprox/handler/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/indy/service/httprox/keycloak/KeycloakProxyAuthenticator.java

@@ -32,8 +32,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.io.FileInputStream;
 import java.io.IOException;

src/main/java/org/commonjava/indy/service/httprox/stats/StatsHandler.java

@@ -15,13 +15,13 @@
  */
 package org.commonjava.indy.service.httprox.stats;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-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.Response;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
 @Path( "/api/stats" )
 public class StatsHandler

src/main/java/org/commonjava/indy/service/httprox/stats/Versioning.java

@@ -18,8 +18,8 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import javax.enterprise.inject.Alternative;
-import javax.inject.Named;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.inject.Named;
 
 @Alternative
 @Named

src/main/java/org/commonjava/indy/service/httprox/stats/VersioningProvider.java

@@ -18,9 +18,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;

src/main/java/org/commonjava/indy/service/httprox/util/CacheProducer.java

@@ -20,8 +20,8 @@
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

src/main/java/org/commonjava/indy/service/httprox/util/CustomClientRequestFilter.java

@@ -18,13 +18,13 @@
 
 import io.quarkus.oidc.client.OidcClient;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.ws.rs.Priorities;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.ext.Provider;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 @Priority(Priorities.AUTHENTICATION)

src/main/java/org/commonjava/indy/service/httprox/util/OtelAdapter.java

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

src/main/java/org/commonjava/indy/service/httprox/util/ProxyResponseHelper.java

@@ -37,8 +37,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

src/main/java/org/commonjava/indy/service/httprox/util/WebClientAdapter.java

@@ -40,7 +40,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static javax.ws.rs.core.HttpHeaders.HOST;
+import static jakarta.ws.rs.core.HttpHeaders.HOST;
 
 public class WebClientAdapter
 {

src/test/java/org/commonjava/service/httprox/HttpProxyTest.java

@@ -34,8 +34,8 @@
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Inject;
-import javax.ws.rs.WebApplicationException;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.WebApplicationException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;