Merge pull request #72 from Apicurio/quarkus3

Upgrade to quarkus 3
Apicurio · Aug 8, 2023 · 6a166e5 · 6a166e5
2 parents 2609bdf + cb4fe76
commit 6a166e5
Show file tree

Hide file tree

Showing 61 changed files with 195 additions and 192 deletions.
diff --git a/auth/pom.xml b/auth/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apicurio-common-app-components</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/auth/src/main/java/io/apicurio/common/apps/auth/authn/AppAuthenticationMechanism.java b/auth/src/main/java/io/apicurio/common/apps/auth/authn/AppAuthenticationMechanism.java
@@ -43,16 +43,16 @@
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.RoutingContext;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.faulttolerance.Retry;
 import org.slf4j.Logger;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
-import javax.inject.Inject;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;

diff --git a/config-index/deployment/pom.xml b/config-index/deployment/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.apicurio</groupId>
         <artifactId>apicurio-common-app-components</artifactId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>apicurio-common-app-components-config-index-deployment</artifactId>

diff --git a/config-index/integration-tests/pom.xml b/config-index/integration-tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.apicurio</groupId>
         <artifactId>apicurio-common-app-components</artifactId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>apicurio-common-app-components-config-index-integration-tests</artifactId>

diff --git a/...sts/src/main/java/apicurio/common/app/components/config/index/it/ConfigIndexResource.java b/...sts/src/main/java/apicurio/common/app/components/config/index/it/ConfigIndexResource.java
@@ -20,13 +20,13 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.inject.ConfigProperty;

diff --git a/...ain/java/apicurio/common/app/components/config/index/it/InMemoryDynamicConfigStorage.java b/...ain/java/apicurio/common/app/components/config/index/it/InMemoryDynamicConfigStorage.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import io.apicurio.common.apps.config.DynamicConfigPropertyDto;
 import io.apicurio.common.apps.config.DynamicConfigStorage;

diff --git a/.../apicurio/common/app/components/config/index/it/InMemoryDynamicConfigStorageAccessor.java b/.../apicurio/common/app/components/config/index/it/InMemoryDynamicConfigStorageAccessor.java
@@ -16,8 +16,8 @@
 
 package apicurio.common.app.components.config.index.it;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import io.apicurio.common.apps.config.DynamicConfigStorage;
 import io.apicurio.common.apps.config.DynamicConfigStorageAccessor;

diff --git a/config-index/runtime/pom.xml b/config-index/runtime/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.apicurio</groupId>
         <artifactId>apicurio-common-app-components</artifactId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>apicurio-common-app-components-config-index</artifactId>
@@ -28,7 +28,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${quarkus.version}</version>
                 <executions>
                     <execution>

diff --git a/config/all/pom.xml b/config/all/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apicurio-common-app-components</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/config/definitions/pom.xml b/config/definitions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apicurio-common-app-components</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/config/definitions/src/main/java/io/apicurio/common/apps/config/Dynamic.java b/config/definitions/src/main/java/io/apicurio/common/apps/config/Dynamic.java
@@ -23,8 +23,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
 
 /**
  * @author [email protected]

diff --git a/config/definitions/src/main/java/io/apicurio/common/apps/config/Info.java b/config/definitions/src/main/java/io/apicurio/common/apps/config/Info.java
@@ -23,7 +23,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 
 @Documented
 @Retention(RUNTIME)

diff --git a/config/impl/pom.xml b/config/impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apicurio-common-app-components</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/config/impl/src/main/java/io/apicurio/common/apps/config/impl/DynamicConfigProducer.java b/config/impl/src/main/java/io/apicurio/common/apps/config/impl/DynamicConfigProducer.java
@@ -18,10 +18,10 @@
 
 import java.util.function.Supplier;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 

diff --git a/...mpl/src/main/java/io/apicurio/common/apps/config/impl/DynamicConfigPropertyIndexImpl.java b/...mpl/src/main/java/io/apicurio/common/apps/config/impl/DynamicConfigPropertyIndexImpl.java
@@ -25,9 +25,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-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 org.eclipse.microprofile.config.Config;
 

diff --git a/config/impl/src/main/java/io/apicurio/common/apps/config/impl/DynamicConfigStartup.java b/config/impl/src/main/java/io/apicurio/common/apps/config/impl/DynamicConfigStartup.java
@@ -21,9 +21,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;
 
 /**
  * @author [email protected]
@@ -48,4 +48,4 @@ void onStart() {
         DynamicConfigSource.setConfigurationIndex(configIndex);
         log.debug("Dynamic configuration source initialized in thread {}", Thread.currentThread().getName());
     }
-}
+}
diff --git a/...main/java/io/apicurio/common/apps/config/impl/storage/DynamicConfigPropertyDtoMapper.java b/...main/java/io/apicurio/common/apps/config/impl/storage/DynamicConfigPropertyDtoMapper.java
@@ -21,7 +21,7 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * @author [email protected]

diff --git a/...in/java/io/apicurio/common/apps/config/impl/storage/DynamicConfigSqlStorageComponent.java b/...in/java/io/apicurio/common/apps/config/impl/storage/DynamicConfigSqlStorageComponent.java
@@ -29,7 +29,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import static io.apicurio.common.apps.storage.sql.jdbi.query.Sql.RESOURCE_CONTEXT_KEY;
 import static io.apicurio.common.apps.storage.sql.jdbi.query.Sql.RESOURCE_IDENTIFIER_CONTEXT_KEY;

diff --git a/content/pom.xml b/content/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apicurio-common-app-components</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apicurio-common-app-components</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/src/main/java/io/apicurio/common/apps/core/System.java b/core/src/main/java/io/apicurio/common/apps/core/System.java
@@ -19,8 +19,8 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apicurio-common-app-components</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>0.1.22-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,8 +22,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/logging/src/main/java/io/apicurio/common/apps/logging/Logged.java b/logging/src/main/java/io/apicurio/common/apps/logging/Logged.java
@@ -16,7 +16,7 @@
 
 package io.apicurio.common.apps.logging;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/logging/src/main/java/io/apicurio/common/apps/logging/LoggerProducer.java b/logging/src/main/java/io/apicurio/common/apps/logging/LoggerProducer.java
@@ -19,9 +19,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

diff --git a/logging/src/main/java/io/apicurio/common/apps/logging/LoggingInterceptor.java b/logging/src/main/java/io/apicurio/common/apps/logging/LoggingInterceptor.java
@@ -16,11 +16,11 @@
 
 package io.apicurio.common.apps.logging;
 
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 import org.slf4j.Logger;
 

diff --git a/logging/src/main/java/io/apicurio/common/apps/logging/audit/AuditHttpRequestContext.java b/logging/src/main/java/io/apicurio/common/apps/logging/audit/AuditHttpRequestContext.java
@@ -16,7 +16,7 @@
 
 package io.apicurio.common.apps.logging.audit;
 
-import javax.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.RequestScoped;
 
 @RequestScoped
 public class AuditHttpRequestContext implements AuditHttpRequestInfo {

diff --git a/logging/src/main/java/io/apicurio/common/apps/logging/audit/AuditLogService.java b/logging/src/main/java/io/apicurio/common/apps/logging/audit/AuditLogService.java
@@ -18,9 +18,9 @@
 
 import org.slf4j.Logger;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.control.ActivateRequestContext;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.inject.Inject;
 import java.util.Map;
 
 @ApplicationScoped

diff --git a/logging/src/main/java/io/apicurio/common/apps/logging/audit/Audited.java b/logging/src/main/java/io/apicurio/common/apps/logging/audit/Audited.java
@@ -16,15 +16,18 @@
 
 package io.apicurio.common.apps.logging.audit;
 
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.interceptor.InterceptorBinding;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.interceptor.InterceptorBinding;
 
 /**
  * This annotation is processed by {@link AuditedInterceptor}

diff --git a/logging/src/main/java/io/apicurio/common/apps/logging/audit/AuditedInterceptor.java b/logging/src/main/java/io/apicurio/common/apps/logging/audit/AuditedInterceptor.java
@@ -18,17 +18,18 @@
 
 
 import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 import org.apache.commons.beanutils.BeanUtils;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+
 
 /**
  * Interceptor that executes around methods annotated with {@link Audited}