Update Quarkus Platform and Group to v3.21.0

catalog/files/impl/build.gradle.kts

@@ -41,6 +41,9 @@ dependencies {
   implementation("software.amazon.awssdk:apache-client") {
     exclude("commons-logging", "commons-logging")
   }
+  runtimeOnly("software.amazon.awssdk:url-connection-client") {
+    exclude("commons-logging", "commons-logging")
+  }
 
   implementation(platform(libs.google.cloud.storage.bom))
   implementation("com.google.cloud:google-cloud-storage")

catalog/secrets/vault/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
   implementation(libs.guava)
 
   implementation(enforcedPlatform(libs.quarkus.bom))
-  implementation("io.quarkiverse.vault:quarkus-vault")
+  implementation(libs.quarkus.vault)
 
   compileOnly(project(":nessie-immutables"))
   annotationProcessor(project(":nessie-immutables", configuration = "processor"))

events/quarkus/src/main/java/org/projectnessie/events/quarkus/config/QuarkusEventConfig.java

@@ -15,15 +15,13 @@
  */
 package org.projectnessie.events.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
 import java.time.Duration;
 import java.util.Map;
 import org.projectnessie.events.service.EventConfig;
 
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.version.store.events")
 public interface QuarkusEventConfig extends EventConfig {
 

gradle/built-uber-dists/LICENSE-BINARY-DIST

@@ -402,6 +402,7 @@ io.prometheus:simpleclient_common
 io.prometheus:simpleclient_tracer_common
 io.prometheus:simpleclient_tracer_otel
 io.prometheus:simpleclient_tracer_otel_agent
+io.quarkiverse.amazonservices:quarkus-amazon-common-spi
 io.quarkiverse.amazonservices:quarkus-amazon-common
 io.quarkiverse.amazonservices:quarkus-amazon-dynamodb
 io.quarkiverse.amazonservices:quarkus-amazon-secretsmanager
@@ -467,6 +468,7 @@ io.quarkus:quarkus-smallrye-jwt-build
 io.quarkus:quarkus-smallrye-openapi
 io.quarkus:quarkus-swagger-ui
 io.quarkus:quarkus-tls-registry
+io.quarkus:quarkus-tls-registry-spi
 io.quarkus:quarkus-transaction-annotations
 io.quarkus:quarkus-vertx
 io.quarkus:quarkus-vertx-http

gradle/libs.versions.toml

@@ -25,10 +25,10 @@ opentelemetry = "1.48.0"
 opentelemetryAlpha = "1.31.0-alpha"
 picocli = "4.7.6"
 protobuf = "4.30.2"
-quarkusPlatform = "3.19.4"
+quarkusPlatform = "3.21.0"
 quarkusPlugin = "3.21.0"
+quarkusVault = "4.2.1"
 slf4j = "2.0.17"
-smallryeConfig = "3.12.4"
 undertow = "2.3.18.Final"
 
 # Backwards compatibility versions. Not referenced in this file to not let Renovate bump those versions.
@@ -130,6 +130,8 @@ quarkus-bom = { module = "io.quarkus.platform:quarkus-bom", version.ref = "quark
 quarkus-cassandra-bom = { module = "io.quarkus.platform:quarkus-cassandra-bom", version.ref = "quarkusPlatform" }
 quarkus-google-cloud-services-bom = { module = "io.quarkus.platform:quarkus-google-cloud-services-bom", version.ref = "quarkusPlatform" }
 quarkus-logging-sentry = { module = "io.quarkiverse.loggingsentry:quarkus-logging-sentry", version = "2.1.2" }
+quarkus-vault = { module = "io.quarkiverse.vault:quarkus-vault", version.ref = "quarkusVault" }
+quarkus-vault-deployment = { module = "io.quarkiverse.vault:quarkus-vault-deployment", version.ref = "quarkusVault" }
 rest-assured = { module = "io.rest-assured:rest-assured", version = "5.5.1" }
 rocksdb-jni = { module = "org.rocksdb:rocksdbjni", version = "9.10.0" }
 scala-library-v212 = { module = "org.scala-lang:scala-library", version = { strictly = "[2.12, 2.13[", prefer = "2.12.20" }}
@@ -138,7 +140,7 @@ slf4j-api = {  module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" }
 slf4j-log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "slf4j" }
 smallrye-mutiny = { module = "io.smallrye.reactive:mutiny", version = "2.8.0" }
-smallrye-config-core = { module = "io.smallrye.config:smallrye-config-core", version.ref = "smallryeConfig" }
+smallrye-config-core = { module = "io.smallrye.config:smallrye-config-core", version = "3.12.4" }
 snappy-java = { module = "org.xerial.snappy:snappy-java", version = "1.1.10.7" }
 spark-sql-v33-v212 = { module = "org.apache.spark:spark-sql_2_12", version = { strictly = "[3.3, 3.4[", prefer = "3.3.4"}}
 spark-sql-v33-v213 = { module = "org.apache.spark:spark-sql_2_13", version = { strictly = "[3.3, 3.4[", prefer = "3.3.4"}}

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/config/QuarkusBigTableConfig.java

@@ -16,7 +16,6 @@
 package org.projectnessie.quarkus.config;
 
 import com.google.api.gax.core.CredentialsProvider;
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import java.util.Optional;
@@ -26,7 +25,6 @@
  * When setting {@code nessie.version.store.type=BIGTABLE} which enables Google BigTable as the
  * version store used by the Nessie server, the following configurations are applicable.
  */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.version.store.persist.bigtable")
 public interface QuarkusBigTableConfig extends BigTableClientsConfig {
 

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/config/QuarkusCassandraConfig.java

@@ -15,7 +15,6 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import java.time.Duration;
@@ -25,7 +24,6 @@
  * When setting {@code nessie.version.store.type=CASSANDRA} which enables Apache Cassandra as the
  * version store used by the Nessie server, the following configurations are applicable.
  */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.version.store.cassandra")
 public interface QuarkusCassandraConfig extends Cassandra2Config {
   @Override

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/config/QuarkusDynamoDBConfig.java

@@ -15,15 +15,13 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import java.util.Optional;
 
 /**
  * When setting {@code nessie.version.store.type=DYNAMODB} which enables DynamoDB as the version
  * store used by the Nessie server, the following configurations are applicable.
  */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.version.store.persist.dynamodb")
 public interface QuarkusDynamoDBConfig {
   /** Prefix for tables, default is no prefix. */

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/config/QuarkusJdbcConfig.java

@@ -15,7 +15,6 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithName;
 import java.util.Optional;
@@ -79,7 +78,6 @@
  * <p>A complete set of JDBC configuration options can be found on <a
  * href="https://quarkus.io/guides/datasource">quarkus.io</a>.
  */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.version.store.persist.jdbc")
 public interface QuarkusJdbcConfig extends Jdbc2BackendBaseConfig {
 

servers/quarkus-common/src/main/java/org/projectnessie/quarkus/config/QuarkusRocksConfig.java

@@ -15,7 +15,6 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
@@ -26,7 +25,6 @@
  * When setting {@code nessie.version.store.type=ROCKSDB} which enables RocksDB as the version store
  * used by the Nessie server, the following configurations are applicable.
  */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.version.store.persist.rocks")
 public interface QuarkusRocksConfig extends RocksDBBackendBaseConfig {
 

servers/quarkus-config/src/main/java/org/projectnessie/quarkus/config/QuarkusNessieAuthenticationConfig.java

@@ -15,15 +15,13 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
 import java.util.Optional;
 import java.util.Set;
 
 /** Configuration for Nessie authentication settings. */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.server.authentication")
 public interface QuarkusNessieAuthenticationConfig {
 

servers/quarkus-config/src/main/java/org/projectnessie/quarkus/config/QuarkusNessieAuthorizationConfig.java

@@ -15,14 +15,12 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
 import java.util.Map;
 
 /** Configuration for Nessie authorization settings. */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.server.authorization")
 public interface QuarkusNessieAuthorizationConfig {
 

servers/quarkus-config/src/main/java/org/projectnessie/quarkus/config/QuarkusServerConfig.java

@@ -15,13 +15,11 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
 import org.projectnessie.services.config.ServerConfig;
 
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.server")
 public interface QuarkusServerConfig extends ServerConfig {
 

servers/quarkus-config/src/main/java/org/projectnessie/quarkus/config/QuarkusStoreConfig.java

@@ -15,7 +15,6 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithConverter;
 import io.smallrye.config.WithDefault;
@@ -27,7 +26,6 @@
 import java.util.OptionalInt;
 import org.projectnessie.versioned.storage.common.config.StoreConfig;
 
-@StaticInitSafe
 @ConfigMapping(prefix = QuarkusStoreConfig.NESSIE_VERSION_STORE_PERSIST)
 public interface QuarkusStoreConfig extends StoreConfig {
 

servers/quarkus-config/src/main/java/org/projectnessie/quarkus/config/VersionStoreConfig.java

@@ -15,13 +15,11 @@
  */
 package org.projectnessie.quarkus.config;
 
-import io.quarkus.runtime.annotations.StaticInitSafe;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
 
 /** Version store configuration. */
-@StaticInitSafe
 @ConfigMapping(prefix = "nessie.version.store")
 public interface VersionStoreConfig {
 

servers/quarkus-secrets/build.gradle.kts

@@ -54,7 +54,7 @@ dependencies {
   implementation(enforcedPlatform(libs.quarkus.google.cloud.services.bom))
   implementation("io.quarkiverse.googlecloudservices:quarkus-google-cloud-secret-manager")
 
-  implementation("io.quarkiverse.vault:quarkus-vault")
+  implementation(libs.quarkus.vault)
 
   implementation(enforcedPlatform(libs.quarkus.azure.services.bom))
   implementation("io.quarkiverse.azureservices:quarkus-azure-keyvault")

servers/quarkus-server/build.gradle.kts

@@ -164,7 +164,7 @@ dependencies {
 
   testFixturesApi(platform(libs.awssdk.bom))
   testFixturesApi("software.amazon.awssdk:secretsmanager")
-  testFixturesApi("io.quarkiverse.vault:quarkus-vault-deployment")
+  testFixturesApi(libs.quarkus.vault.deployment)
 
   testFixturesApi(enforcedPlatform(libs.quarkus.azure.services.bom))
   testFixturesApi("io.quarkiverse.azureservices:quarkus-azure-keyvault")

servers/quarkus-server/src/main/resources/application.properties

@@ -475,7 +475,7 @@ quarkus.micrometer.binder.http-server.match-patterns=\
   /iceberg/v1/.*/views/rename=/iceberg/v1/{prefix}/views/rename, \
   /iceberg/v1/.*/transactions/commit=/iceberg/v1/{prefix}/transactions/commit
 
-%test.quarkus.devservices.enabled=false
+quarkus.devservices.enabled=false
 
 # Disable Micrometer JVM-Metrics for tests.
 #

tools/server-admin/src/main/resources/application.properties

@@ -181,7 +181,7 @@ quarkus.http.test-port=0
 # Disable a "lot of things" that are not needed for integration testing. Disabled in an effort to get hold
 # of the class-loader OOM leak described in https://github.com/projectnessie/nessie/issues/8571
 # Many of these settings are probably unnecessary, but otoh don't hurt.
-%test.quarkus.devservices.enabled=false
+quarkus.devservices.enabled=false
 %test.quarkus.micrometer.enabled=false
 %test.quarkus.micrometer.registry-enabled-default=false
 %test.quarkus.mongodb.metrics.enabled=false