Experiment: Bump to Quarkus 3.0.0.CR2

gradle/libs.versions.toml

@@ -30,8 +30,8 @@ parquet = "1.13.0"
 picocli = "4.7.1"
 postgresContainerTag = "14"
 protobuf = "3.22.2"
-quarkus = "2.16.6.Final"
-quarkusAmazon = "2.16.6.Final"
+quarkus = "3.0.0.CR2"
+quarkusAmazon = "3.0.0.CR2"
 quarkusLoggingSentry = "2.0.0"
 quarkusNativeBuilderImage = "quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.3-java17"
 quarkusJibBaseJvmImage = "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.14"

servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/BaseCommand.java

@@ -18,9 +18,9 @@
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.INMEMORY;
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.IN_MEMORY;
 
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 import java.util.concurrent.Callable;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
 import org.projectnessie.quarkus.config.VersionStoreConfig;
 import org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType;
 import org.projectnessie.services.config.ServerConfig;

servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/CheckContentEntry.java

@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 import org.projectnessie.model.Content;
 import org.projectnessie.model.ContentKey;

servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ContentInfoEntry.java

@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.immutables.value.Value;
 import org.projectnessie.model.Content;
 import org.projectnessie.model.ContentKey;

servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ExportRepository.java

@@ -15,12 +15,12 @@
  */
 package org.projectnessie.quarkus.cli;
 
+import jakarta.annotation.Nonnull;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Locale;
 import java.util.function.Consumer;
-import javax.annotation.Nonnull;
 import org.projectnessie.versioned.transfer.ExportImportConstants;
 import org.projectnessie.versioned.transfer.NessieExporter;
 import org.projectnessie.versioned.transfer.ProgressEvent;

servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ImportRepository.java

@@ -17,14 +17,14 @@
 
 import static org.projectnessie.versioned.storage.common.logic.Logics.repositoryLogic;
 
+import jakarta.annotation.Nonnull;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
-import javax.annotation.Nonnull;
 import org.projectnessie.nessie.relocated.protobuf.ByteString;
 import org.projectnessie.versioned.GetNamedRefsParams;
 import org.projectnessie.versioned.Hash;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/CassandraBackendBuilder.java

@@ -18,10 +18,10 @@
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.CASSANDRA;
 
 import com.datastax.oss.quarkus.runtime.api.session.QuarkusCqlSession;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.projectnessie.versioned.storage.cassandra.CassandraBackendConfig;
 import org.projectnessie.versioned.storage.cassandra.CassandraBackendFactory;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/ConfigurableVersionStoreFactory.java

@@ -16,13 +16,13 @@
 package org.projectnessie.quarkus.providers;
 
 import io.quarkus.runtime.Startup;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.IOError;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.quarkus.config.VersionStoreConfig;
 import org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType;
 import org.projectnessie.versioned.MetricsVersionStore;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DatabaseAdapterProvider.java

@@ -16,12 +16,12 @@
 package org.projectnessie.quarkus.providers;
 
 import io.quarkus.runtime.Startup;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.projectnessie.quarkus.config.VersionStoreConfig;
 import org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType;
 import org.projectnessie.quarkus.providers.StoreType.Literal;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDBBackendBuilder.java

@@ -17,8 +17,8 @@
 
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.DYNAMODB;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.projectnessie.versioned.storage.common.persist.Backend;
 import org.projectnessie.versioned.storage.dynamodb.DynamoDBBackendConfig;
 import org.projectnessie.versioned.storage.dynamodb.DynamoDBBackendFactory;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDatabaseAdapterBuilder.java

@@ -17,8 +17,8 @@
 
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.DYNAMO;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
 import org.projectnessie.versioned.persist.dynamodb.DynamoDatabaseAdapterFactory;
 import org.projectnessie.versioned.persist.dynamodb.DynamoDatabaseClient;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryBackendBuilder.java

@@ -17,7 +17,7 @@
 
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.IN_MEMORY;
 
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
 import org.projectnessie.versioned.storage.common.persist.Backend;
 import org.projectnessie.versioned.storage.inmemory.InmemoryBackendConfig;
 import org.projectnessie.versioned.storage.inmemory.InmemoryBackendFactory;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryDatabaseAdapterBuilder.java

@@ -17,8 +17,8 @@
 
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.INMEMORY;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
 import org.projectnessie.versioned.persist.inmem.InmemoryDatabaseAdapterFactory;
 import org.projectnessie.versioned.persist.inmem.InmemoryStore;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryStoreProvider.java

@@ -15,10 +15,10 @@
  */
 package org.projectnessie.quarkus.providers;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.Produces;
 import org.projectnessie.versioned.persist.inmem.InmemoryStore;
 
 @ApplicationScoped

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/JdbcBackendBuilder.java

@@ -19,8 +19,8 @@
 
 import io.agroal.api.AgroalDataSource;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.projectnessie.quarkus.config.QuarkusJdbcConfig;
 import org.projectnessie.versioned.storage.common.persist.Backend;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDBBackendBuilder.java

@@ -21,8 +21,8 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.mongodb.runtime.MongoClientBeanUtil;
 import io.quarkus.mongodb.runtime.MongoClients;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.projectnessie.versioned.storage.common.persist.Backend;
 import org.projectnessie.versioned.storage.mongodb.MongoDBBackendConfig;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDatabaseAdapterBuilder.java

@@ -21,8 +21,8 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.mongodb.runtime.MongoClientBeanUtil;
 import io.quarkus.mongodb.runtime.MongoClients;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
 import org.projectnessie.versioned.persist.mongodb.MongoClientConfig;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/PersistProvider.java

@@ -20,14 +20,14 @@
 import io.opentelemetry.api.trace.Tracer;
 import io.quarkus.runtime.Startup;
 import io.quarkus.runtime.annotations.RegisterForReflection;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.function.BiFunction;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.quarkus.config.QuarkusStoreConfig;
 import org.projectnessie.quarkus.config.VersionStoreConfig;
 import org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDBBackendBuilder.java

@@ -17,8 +17,8 @@
 
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.ROCKSDB;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.projectnessie.quarkus.config.QuarkusRocksConfig;
 import org.projectnessie.versioned.storage.common.persist.Backend;
 import org.projectnessie.versioned.storage.rocksdb.RocksDBBackendConfig;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDatabaseAdapterBuilder.java

@@ -17,8 +17,8 @@
 
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.ROCKS;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
 import org.projectnessie.versioned.persist.nontx.NonTransactionalDatabaseAdapterConfig;
 import org.projectnessie.versioned.persist.rocks.RocksDatabaseAdapterFactory;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDbSource.java

@@ -15,10 +15,10 @@
  */
 package org.projectnessie.quarkus.providers;
 
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import org.projectnessie.quarkus.config.VersionStoreConfig;
 import org.projectnessie.versioned.persist.rocks.ImmutableRocksDbConfig;
 import org.projectnessie.versioned.persist.rocks.RocksDbInstance;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/StoreType.java

@@ -21,11 +21,11 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
 import org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType;
 
 /** Store type qualifier for {@code VersionStoreFactory} classes. */

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalConnectionProvider.java

@@ -16,11 +16,11 @@
 package org.projectnessie.quarkus.providers;
 
 import io.agroal.api.AgroalDataSource;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.sql.Connection;
 import java.sql.SQLException;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.quarkus.config.QuarkusVersionStoreAdvancedConfig;
 import org.projectnessie.versioned.persist.tx.ImmutableDefaultTxConnectionConfig;
 import org.projectnessie.versioned.persist.tx.TxConnectionConfig;

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalDatabaseAdapterBuilder.java

@@ -17,8 +17,8 @@
 
 import static org.projectnessie.quarkus.config.VersionStoreConfig.VersionStoreType.TRANSACTIONAL;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 import org.projectnessie.versioned.persist.adapter.DatabaseAdapter;
 import org.projectnessie.versioned.persist.tx.TxConnectionConfig;
 import org.projectnessie.versioned.persist.tx.TxConnectionProvider;

servers/quarkus-server/src/main/java/org/projectnessie/server/authn/NessieHttpAuthenticator.java

@@ -25,12 +25,12 @@
 import io.quarkus.vertx.http.runtime.security.PathMatchingHttpSecurityPolicy;
 import io.smallrye.mutiny.Uni;
 import io.vertx.ext.web.RoutingContext;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.Set;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.server.config.QuarkusNessieAuthenticationConfig;
 
 /**

servers/quarkus-server/src/main/java/org/projectnessie/server/authn/QuarkusPrincipalSupplier.java

@@ -16,12 +16,12 @@
 package org.projectnessie.server.authn;
 
 import io.quarkus.security.identity.SecurityIdentity;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.inject.Inject;
 import java.security.Principal;
 import java.util.function.Supplier;
-import javax.annotation.Priority;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Alternative;
-import javax.inject.Inject;
 
 @RequestScoped
 @Alternative

servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CelAuthorizer.java

@@ -15,8 +15,8 @@
  */
 package org.projectnessie.server.authz;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.projectnessie.server.config.QuarkusNessieAuthorizationConfig;
 import org.projectnessie.services.authz.AbstractBatchAccessChecker;
 import org.projectnessie.services.authz.AccessContext;

servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CompiledAuthorizationRules.java

@@ -19,10 +19,10 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.quarkus.runtime.Startup;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import org.projectnessie.cel.tools.Script;
 import org.projectnessie.cel.tools.ScriptException;
 import org.projectnessie.server.config.QuarkusNessieAuthorizationConfig;

servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/MicrometerSupport.java

@@ -19,10 +19,10 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
 import io.quarkus.runtime.Startup;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @ApplicationScoped
 public class MicrometerSupport {