diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9a87d1ebb0c..60767e86f73 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/BaseCommand.java b/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/BaseCommand.java index e744c36d17b..d4b1dc081c6 100644 --- a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/BaseCommand.java +++ b/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; diff --git a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/CheckContentEntry.java b/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/CheckContentEntry.java index 0a9eee6bd08..1d4fcc3786c 100644 --- a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/CheckContentEntry.java +++ b/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; diff --git a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ContentInfoEntry.java b/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ContentInfoEntry.java index c72456c81c1..5aabaa095ab 100644 --- a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ContentInfoEntry.java +++ b/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; diff --git a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ExportRepository.java b/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ExportRepository.java index e7f7cc296ef..42e6ce35b07 100644 --- a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ExportRepository.java +++ b/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; diff --git a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ImportRepository.java b/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ImportRepository.java index 2a970b0b84b..e042915a29f 100644 --- a/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ImportRepository.java +++ b/servers/quarkus-cli/src/main/java/org/projectnessie/quarkus/cli/ImportRepository.java @@ -17,6 +17,7 @@ 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; @@ -24,7 +25,6 @@ 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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/CassandraBackendBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/CassandraBackendBuilder.java index e3980ab4f77..b691e760132 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/CassandraBackendBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/ConfigurableVersionStoreFactory.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/ConfigurableVersionStoreFactory.java index 9ab0e4946b6..6e47cd7270e 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/ConfigurableVersionStoreFactory.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DatabaseAdapterProvider.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DatabaseAdapterProvider.java index 289b6528b79..8f4c0a8d214 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DatabaseAdapterProvider.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDBBackendBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDBBackendBuilder.java index bd8c8e0f747..96863436fcd 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDBBackendBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDatabaseAdapterBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDatabaseAdapterBuilder.java index 2fceab64017..8744d3b51db 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/DynamoDatabaseAdapterBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryBackendBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryBackendBuilder.java index 4e7c4d86e8e..9dd8d98fc28 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryBackendBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryDatabaseAdapterBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryDatabaseAdapterBuilder.java index 18412169cac..30383b27069 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryDatabaseAdapterBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryStoreProvider.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryStoreProvider.java index 99858c521ee..3b10b03e553 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/InmemoryStoreProvider.java +++ b/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 diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/JdbcBackendBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/JdbcBackendBuilder.java index 5fad9a87279..640cd68b49b 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/JdbcBackendBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDBBackendBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDBBackendBuilder.java index 774bd615e9c..5348da12912 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDBBackendBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDatabaseAdapterBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDatabaseAdapterBuilder.java index b6e8e7c6b4a..ab7dca6948b 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/MongoDatabaseAdapterBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/PersistProvider.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/PersistProvider.java index 5c7f09191f5..70c6667d1c5 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/PersistProvider.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDBBackendBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDBBackendBuilder.java index 330534cbd3a..a08bb5cfd88 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDBBackendBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDatabaseAdapterBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDatabaseAdapterBuilder.java index ed7e66a0090..c6d059d26af 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDatabaseAdapterBuilder.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDbSource.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDbSource.java index 79105cc0394..aa60d99cca0 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/RocksDbSource.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/StoreType.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/StoreType.java index 5dfb5ab8d1d..8c951f43bcb 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/StoreType.java +++ b/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. */ diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalConnectionProvider.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalConnectionProvider.java index cb0f9c0eec9..4b1a8b0e61e 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalConnectionProvider.java +++ b/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; diff --git a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalDatabaseAdapterBuilder.java b/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalDatabaseAdapterBuilder.java index 43ea22d7e9c..ac64bd95192 100644 --- a/servers/quarkus-common/src/main/java/org/projectnessie/quarkus/providers/TransactionalDatabaseAdapterBuilder.java +++ b/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; diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/authn/NessieHttpAuthenticator.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/authn/NessieHttpAuthenticator.java index c150d060e3c..9af7b3e5195 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/authn/NessieHttpAuthenticator.java +++ b/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; /** diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/authn/QuarkusPrincipalSupplier.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/authn/QuarkusPrincipalSupplier.java index 19153f62003..21082a21cf0 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/authn/QuarkusPrincipalSupplier.java +++ b/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 diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CelAuthorizer.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CelAuthorizer.java index 70fc2dc17dc..03a83d43759 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CelAuthorizer.java +++ b/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; diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CompiledAuthorizationRules.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CompiledAuthorizationRules.java index 8ff67856ecd..95187cf9443 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/authz/CompiledAuthorizationRules.java +++ b/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; diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/MicrometerSupport.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/MicrometerSupport.java index bfc9d2571a3..b9dd78aa5bb 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/MicrometerSupport.java +++ b/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 { diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/OpenTracingSupport.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/OpenTracingSupport.java index fd01211d5fd..194141cf642 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/OpenTracingSupport.java +++ b/servers/quarkus-server/src/main/java/org/projectnessie/server/opentelemetry/OpenTracingSupport.java @@ -20,10 +20,10 @@ import io.opentracing.Tracer; import io.opentracing.util.GlobalTracer; 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 OpenTracingSupport { diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/RegisterObjectMapper.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/RegisterObjectMapper.java index f4899ac1958..4dcfc0c8945 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/RegisterObjectMapper.java +++ b/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/RegisterObjectMapper.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import io.quarkus.jackson.ObjectMapperCustomizer; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class RegisterObjectMapper implements ObjectMapperCustomizer { diff --git a/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/ResteasyExceptionMapper.java b/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/ResteasyExceptionMapper.java index 0b3d65a8527..31d0d0ce4c7 100644 --- a/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/ResteasyExceptionMapper.java +++ b/servers/quarkus-server/src/main/java/org/projectnessie/server/rest/ResteasyExceptionMapper.java @@ -15,17 +15,17 @@ */ package org.projectnessie.server.rest; -import javax.inject.Inject; -import javax.validation.ValidationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.validation.ValidationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.api.validation.ResteasyViolationException; import org.jboss.resteasy.api.validation.Validation; import org.projectnessie.error.ErrorCode; import org.projectnessie.services.config.ServerConfig; -import org.projectnessie.services.restjavax.BaseExceptionMapper; -import org.projectnessie.services.restjavax.NessieExceptionMapper; +import org.projectnessie.services.restjakarta.BaseExceptionMapper; +import org.projectnessie.services.restjakarta.NessieExceptionMapper; /** * "Special" implementation for exceptions that extend {@link ValidationException}, as those do not diff --git a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/ErrorTestService.java b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/ErrorTestService.java index 7533df6e2c2..83cae3e24f8 100644 --- a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/ErrorTestService.java +++ b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/ErrorTestService.java @@ -15,23 +15,23 @@ */ package org.projectnessie.server.error; -import javax.enterprise.context.RequestScoped; -import javax.validation.ConstraintDeclarationException; -import javax.validation.ConstraintDefinitionException; -import javax.validation.GroupDefinitionException; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.validation.ConstraintDeclarationException; +import jakarta.validation.ConstraintDefinitionException; +import jakarta.validation.GroupDefinitionException; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.mockito.Mockito; import org.projectnessie.error.NessieNotFoundException; import org.projectnessie.error.NessieReferenceNotFoundException; diff --git a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/OtherEntity.java b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/OtherEntity.java index 59466cc52a5..95c0ed8c825 100644 --- a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/OtherEntity.java +++ b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/OtherEntity.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** Just a dummy entity. */ public class OtherEntity { diff --git a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/SomeEntity.java b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/SomeEntity.java index 9f97018d923..a842db70177 100644 --- a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/SomeEntity.java +++ b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/SomeEntity.java @@ -17,9 +17,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; /** Just a dummy entity. */ public class SomeEntity { diff --git a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/TestNessieError.java b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/TestNessieError.java index 1a0fefb650a..11f029f3f69 100644 --- a/servers/quarkus-server/src/test/java/org/projectnessie/server/error/TestNessieError.java +++ b/servers/quarkus-server/src/test/java/org/projectnessie/server/error/TestNessieError.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.SerializationFeature; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; +import jakarta.ws.rs.core.Response; import java.net.URI; -import javax.ws.rs.core.Response; import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.AfterEach; @@ -176,17 +176,17 @@ void nonConstraintValidationExceptions() { () -> unwrap(() -> client.newRequest().path("constraintDefinitionException").get())) .isInstanceOf(NessieInternalServerException.class) .hasMessage( - "Internal Server Error (HTTP/500): javax.validation.ConstraintDefinitionException: meep"); + "Internal Server Error (HTTP/500): jakarta.validation.ConstraintDefinitionException: meep"); soft.assertThatThrownBy( () -> unwrap(() -> client.newRequest().path("constraintDeclarationException").get())) .isInstanceOf(NessieInternalServerException.class) .hasMessage( - "Internal Server Error (HTTP/500): javax.validation.ConstraintDeclarationException: meep"); + "Internal Server Error (HTTP/500): jakarta.validation.ConstraintDeclarationException: meep"); soft.assertThatThrownBy( () -> unwrap(() -> client.newRequest().path("groupDefinitionException").get())) .isInstanceOf(NessieInternalServerException.class) .hasMessage( - "Internal Server Error (HTTP/500): javax.validation.GroupDefinitionException: meep"); + "Internal Server Error (HTTP/500): jakarta.validation.GroupDefinitionException: meep"); } @Test diff --git a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusRest.java b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusRest.java index 069f0c03dce..a63f52239b6 100644 --- a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusRest.java +++ b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusRest.java @@ -17,8 +17,8 @@ import static org.projectnessie.versioned.storage.common.logic.Logics.repositoryLogic; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.extension.ExtendWith; import org.projectnessie.jaxrs.tests.BaseTestNessieRest; diff --git a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusSmoke.java b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusSmoke.java index 6cbd7526ed3..4d2cd6bef4a 100644 --- a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusSmoke.java +++ b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/AbstractQuarkusSmoke.java @@ -19,8 +19,8 @@ import com.google.common.hash.Hashing; import io.quarkus.test.junit.QuarkusIntegrationTest; +import jakarta.validation.constraints.NotNull; import java.util.Locale; -import javax.validation.constraints.NotNull; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach;