From f37f4e31b7985c86b637cf28c44afd291709d33a Mon Sep 17 00:00:00 2001
From: Maximilian Rehberger <maximilian.rehberger@tech11.com>
Date: Fri, 30 Aug 2024 14:11:16 +0200
Subject: [PATCH] issue-42851: port resteasy fix for sub-resources from
 resteasy/resteasy-microprofile PR #241

---
 .mvn/maven.config                             |   1 -
 bom/application/pom.xml                       |   6 +-
 .../logging/LoggingResourceProcessor.java     |   1 +
 .../NativeImageBuildContainerRunner.java      |   2 +-
 .../pkg/steps/NativeImageBuildStep.java       |   2 +-
 .../pkg/steps/UpxCompressionBuildStep.java    |   2 +-
 .../steps/CompiledJavaVersionBuildStep.java   |  82 +++++++-------
 .../discovery/DiscoveryConfigProperty.java    |  43 ++++---
 .../config/discovery/ParsedJavadoc.java       |   4 +-
 .../discovery/ParsedJavadocSection.java       |   6 +-
 .../config/discovery/ResolvedType.java        |   6 +-
 .../JavadocToAsciidocTransformer.java         |  22 +++-
 .../config/model/AbstractConfigItem.java      |  20 +++-
 .../config/model/ConfigProperty.java          |   6 +-
 .../config/model/ConfigRoot.java              |   4 +-
 .../config/model/ConfigSection.java           |  14 +--
 .../config/model/Deprecation.java             |   5 +
 .../config/model/JavadocElements.java         |   2 +-
 .../config/model/SourceType.java              |   7 ++
 .../config/resolver/ConfigResolver.java       |  37 +++---
 .../scanner/AbstractConfigListener.java       |   7 ++
 .../AbstractJavadocConfigListener.java        |   3 +-
 .../scanner/ConfigAnnotationScanner.java      |   7 +-
 .../config/scanner/ConfigMappingListener.java |  11 +-
 .../scanner/JavadocConfigMappingListener.java |   6 +-
 .../JavadocLegacyConfigRootListener.java      |   6 +-
 .../scanner/LegacyConfigRootListener.java     |  11 +-
 .../config/util/JavadocUtil.java              |   2 +-
 .../processor/util/ElementUtil.java           |  28 +++++
 .../io/quarkus/gradle/tasks/QuarkusDev.java   |   2 +-
 .../gradle/tasks/QuarkusGradleUtils.java      |  63 +++++------
 .../io/quarkus/maven/CreateProjectMojo.java   |   2 +-
 .../src/main/asciidoc/writing-extensions.adoc |  12 +-
 .../runtime/CodeAuthenticationMechanism.java  |  17 ++-
 .../io/quarkus/oidc/runtime/OidcUtils.java    |   3 +-
 .../deployment/tracing/TracerProcessor.java   |  23 +++-
 .../runtime/tracing/TracerRecorder.java       |  33 +++---
 .../runtime/tracing/cdi/TracerProducer.java   |   6 -
 .../QuarkusProxyInvocationHandler.java        | 107 +++++++++++++++++-
 .../runtime/QuarkusRestClientBuilder.java     |  16 +--
 .../processor/JacksonSerializerFactory.java   |  37 +++++-
 .../reactive/jackson/deployment/test/Cat.java |   4 +
 .../jackson/deployment/test/ContainerDTO.java |   4 +
 .../deployment/test/NestedInterface.java      |  28 +++++
 .../deployment/test/SimpleJsonResource.java   |   6 +
 .../deployment/test/SimpleJsonTest.java       |  17 ++-
 ...JsonWithReflectionFreeSerializersTest.java |   3 +-
 .../deployment/HttpRootPathBuildItem.java     |   5 +-
 .../deployment/HttpRootPathBuildItemTest.java |   2 +
 independent-projects/bootstrap/pom.xml        |   4 +-
 .../resteasy-reactive/pom.xml                 |   2 +-
 .../src/main/resources/application.properties |   2 +-
 .../io/quarkus/it/keycloak/CodeFlowTest.java  |  39 ++++++-
 .../RabbitMQConnectorDynCredsTest.java        |   2 +-
 pom.xml                                       |   4 +-
 .../DefaultDockerContainerLauncher.java       |   2 +-
 .../test/junit/IntegrationTestUtil.java       |   2 +-
 57 files changed, 548 insertions(+), 252 deletions(-)
 delete mode 100644 .mvn/maven.config
 create mode 100644 core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/Deprecation.java
 create mode 100644 core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/SourceType.java
 create mode 100644 extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContainerDTO.java
 create mode 100644 extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NestedInterface.java

diff --git a/.mvn/maven.config b/.mvn/maven.config
deleted file mode 100644
index 0f4fa3c8a6eaee..00000000000000
--- a/.mvn/maven.config
+++ /dev/null
@@ -1 +0,0 @@
--Dmaven.multiModuleProjectDirectory=${session.rootDirectory}
\ No newline at end of file
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 870611dbc73347..9f4508ab51cf37 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -51,7 +51,7 @@
         <microprofile-jwt.version>2.1</microprofile-jwt.version>
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>3.1.1</microprofile-openapi.version>
-        <smallrye-common.version>2.5.0</smallrye-common.version>
+        <smallrye-common.version>2.6.0</smallrye-common.version>
         <smallrye-config.version>3.9.1</smallrye-config.version>
         <smallrye-health.version>4.1.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
@@ -95,7 +95,7 @@
         <gizmo.version>1.8.0</gizmo.version>
         <jackson-bom.version>2.17.2</jackson-bom.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
-        <commons-lang3.version>3.14.0</commons-lang3.version>
+        <commons-lang3.version>3.17.0</commons-lang3.version>
         <commons-codec.version>1.17.1</commons-codec.version>
         <classmate.version>1.7.0</classmate.version>
         <!-- See root POM for hibernate-orm.version, hibernate-reactive.version, hibernate-validator.version,
@@ -174,7 +174,7 @@
         <javaparser.version>3.26.1</javaparser.version>
         <hibernate-quarkus-local-cache.version>0.3.0</hibernate-quarkus-local-cache.version>
         <flapdoodle.mongo.version>4.17.0</flapdoodle.mongo.version>
-        <quarkus-spring-api.version>6.1.SP2</quarkus-spring-api.version>
+        <quarkus-spring-api.version>6.1.SP3</quarkus-spring-api.version>
         <quarkus-spring-data-api.version>3.2.SP2</quarkus-spring-data-api.version>
         <quarkus-spring-security-api.version>6.2</quarkus-spring-security-api.version>
         <quarkus-spring-boot-api.version>3.2</quarkus-spring-boot-api.version>
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java
index af6a515f7be176..12cba0cd98dffb 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java
@@ -223,6 +223,7 @@ void miscSetup(
             Consumer<ServiceProviderBuildItem> provider) {
         runtimeInit.accept(new RuntimeReinitializedClassBuildItem(ConsoleHandler.class.getName()));
         runtimeInit.accept(new RuntimeReinitializedClassBuildItem("io.smallrye.common.ref.References$ReaperThread"));
+        runtimeInit.accept(new RuntimeReinitializedClassBuildItem("io.smallrye.common.os.Process"));
         systemProp
                 .accept(new NativeImageSystemPropertyBuildItem("java.util.logging.manager", "org.jboss.logmanager.LogManager"));
         provider.accept(
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java
index 6b5425c16078f1..9f04816dc62444 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java
@@ -32,7 +32,7 @@ protected NativeImageBuildContainerRunner(NativeConfig nativeConfig) {
 
         this.baseContainerRuntimeArgs = new String[] { "--env", "LANG=C", "--rm" };
 
-        containerName = "build-native-" + RandomStringUtils.random(5, true, false);
+        containerName = "build-native-" + RandomStringUtils.insecure().next(5, true, false);
     }
 
     @Override
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
index 937f5285edf8e3..d0c07388df7143 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -355,7 +355,7 @@ public NativeImageRunnerBuildItem resolveNativeImageBuildRunner(NativeConfig nat
             }
             String executableName = getNativeImageExecutableName();
             String errorMessage = "Cannot find the `" + executableName
-                    + "` in the GRAALVM_HOME, JAVA_HOME and System PATH. Install it using `gu install native-image`";
+                    + "` in the GRAALVM_HOME, JAVA_HOME and System PATH. Install it using `gu install native-image`.";
             if (!SystemUtils.IS_OS_LINUX) {
                 // Delay the error: if we're just building native sources, we may not need the build runner at all.
                 return new NativeImageRunnerBuildItem(new NativeImageBuildRunnerError(errorMessage));
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java
index 16132697aa767a..8e2ca4272772b3 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java
@@ -124,7 +124,7 @@ private boolean runUpxInContainer(NativeImageBuildItem nativeImage, NativeConfig
         commandLine.add("--rm");
         commandLine.add("--entrypoint=upx");
 
-        String containerName = "upx-" + RandomStringUtils.random(5, true, false);
+        String containerName = "upx-" + RandomStringUtils.insecure().next(5, true, false);
         commandLine.add("--name");
         commandLine.add(containerName);
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/CompiledJavaVersionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/CompiledJavaVersionBuildStep.java
index 3131b4243e08d5..33b00c930f6a85 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/CompiledJavaVersionBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/CompiledJavaVersionBuildStep.java
@@ -1,21 +1,18 @@
 package io.quarkus.deployment.steps;
 
 import java.io.DataInputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.jboss.logging.Logger;
 
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.CompiledJavaVersionBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.maven.dependency.DependencyFlags;
+import io.quarkus.maven.dependency.ResolvedDependency;
 
 public class CompiledJavaVersionBuildStep {
 
@@ -26,44 +23,49 @@ public class CompiledJavaVersionBuildStep {
      * application .class file that is found
      */
     @BuildStep
-    public CompiledJavaVersionBuildItem compiledJavaVersion(BuildSystemTargetBuildItem buildSystemTarget) {
-        if ((buildSystemTarget.getOutputDirectory() == null) || (!Files.exists(buildSystemTarget.getOutputDirectory()))) {
-            log.debug("Skipping because output directory does not exist");
-            // needed for Arquillian TCK tests
-            return CompiledJavaVersionBuildItem.unknown();
-        }
-        AtomicReference<Integer> majorVersion = new AtomicReference<>(null);
-        try {
-            log.debugf("Walking directory '%s'", buildSystemTarget.getOutputDirectory().toAbsolutePath().toString());
-            Files.walkFileTree(buildSystemTarget.getOutputDirectory(), new SimpleFileVisitor<>() {
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-                    if (file.getFileName().toString().endsWith(".class")) {
-                        log.debugf("Checking file '%s'", file.toAbsolutePath().toString());
-                        try (InputStream in = new FileInputStream(file.toFile())) {
-                            DataInputStream data = new DataInputStream(in);
-                            if (0xCAFEBABE == data.readInt()) {
-                                data.readUnsignedShort(); // minor version -> we don't care about it
-                                int v = data.readUnsignedShort();
-                                majorVersion.set(v);
-                                log.debugf("Determined compile java version to be %d", v);
-                                return FileVisitResult.TERMINATE;
-                            }
-                        } catch (IOException e) {
-                            log.debugf(e, "Encountered exception while processing file '%s'", file.toAbsolutePath().toString());
-                        }
-                    }
-                    // if this was not .class file or there was an error parsing its contents, we continue on to the next file
-                    return FileVisitResult.CONTINUE;
+    public CompiledJavaVersionBuildItem compiledJavaVersion(CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        final ResolvedDependency appArtifact = curateOutcomeBuildItem.getApplicationModel().getAppArtifact();
+        Integer majorVersion = getMajorJavaVersion(appArtifact);
+        if (majorVersion == null) {
+            // workspace info isn't available in prod builds though
+            for (ResolvedDependency module : curateOutcomeBuildItem.getApplicationModel()
+                    .getDependencies(DependencyFlags.WORKSPACE_MODULE)) {
+                majorVersion = getMajorJavaVersion(module);
+                if (majorVersion != null) {
+                    break;
                 }
-            });
-        } catch (IOException ignored) {
-
+            }
         }
-        if (majorVersion.get() == null) {
+        if (majorVersion == null) {
             log.debug("No .class files located");
             return CompiledJavaVersionBuildItem.unknown();
         }
-        return CompiledJavaVersionBuildItem.fromMajorJavaVersion(majorVersion.get());
+        return CompiledJavaVersionBuildItem.fromMajorJavaVersion(majorVersion);
+    }
+
+    private static Integer getMajorJavaVersion(ResolvedDependency artifact) {
+        final AtomicReference<Integer> majorVersion = new AtomicReference<>(null);
+        artifact.getContentTree().walk(visit -> {
+            final Path file = visit.getPath();
+            if (file.getFileName() == null) {
+                // this can happen if it's the root of a JAR
+                return;
+            }
+            if (file.getFileName().toString().endsWith(".class") && !Files.isDirectory(file)) {
+                log.debugf("Checking file '%s'", file.toAbsolutePath().toString());
+                try (DataInputStream data = new DataInputStream(Files.newInputStream(file))) {
+                    if (0xCAFEBABE == data.readInt()) {
+                        data.readUnsignedShort(); // minor version -> we don't care about it
+                        int v = data.readUnsignedShort();
+                        majorVersion.set(v);
+                        log.debugf("Determined compile java version to be %d", v);
+                        visit.stopWalking();
+                    }
+                } catch (IOException e) {
+                    log.debugf(e, "Encountered exception while processing file '%s'", file.toAbsolutePath().toString());
+                }
+            }
+        });
+        return majorVersion.get();
     }
 }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/DiscoveryConfigProperty.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/DiscoveryConfigProperty.java
index 5f1c49fa11902c..cbff969922b77d 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/DiscoveryConfigProperty.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/DiscoveryConfigProperty.java
@@ -1,5 +1,7 @@
 package io.quarkus.annotation.processor.documentation.config.discovery;
 
+import io.quarkus.annotation.processor.documentation.config.model.Deprecation;
+import io.quarkus.annotation.processor.documentation.config.model.SourceType;
 import io.quarkus.annotation.processor.documentation.config.util.TypeUtil;
 import io.quarkus.annotation.processor.util.Strings;
 
@@ -8,9 +10,10 @@ public class DiscoveryConfigProperty {
     private final String path;
     private final String sourceClass;
     private final String sourceName;
+    private final SourceType sourceType;
     private final String defaultValue;
     private final String defaultValueForDoc;
-    private final boolean deprecated;
+    private final Deprecation deprecation;
     private final String mapKey;
     private final boolean unnamedMapKey;
     private final ResolvedType type;
@@ -19,16 +22,18 @@ public class DiscoveryConfigProperty {
     private final boolean section;
     private final boolean sectionGenerated;
 
-    public DiscoveryConfigProperty(String path, String sourceClass, String sourceName, String defaultValue,
-            String defaultValueForDoc, boolean deprecated, String mapKey, boolean unnamedMapKey,
+    public DiscoveryConfigProperty(String path, String sourceClass, String sourceName, SourceType sourceType,
+            String defaultValue,
+            String defaultValueForDoc, Deprecation deprecation, String mapKey, boolean unnamedMapKey,
             ResolvedType type, boolean converted, boolean enforceHyphenateEnumValue,
             boolean section, boolean sectionGenerated) {
         this.path = path;
         this.sourceClass = sourceClass;
         this.sourceName = sourceName;
+        this.sourceType = sourceType;
         this.defaultValue = defaultValue;
         this.defaultValueForDoc = defaultValueForDoc;
-        this.deprecated = deprecated;
+        this.deprecation = deprecation;
         this.mapKey = mapKey;
         this.unnamedMapKey = unnamedMapKey;
         this.type = type;
@@ -50,6 +55,10 @@ public String getSourceName() {
         return sourceName;
     }
 
+    public SourceType getSourceType() {
+        return sourceType;
+    }
+
     public String getDefaultValue() {
         return defaultValue;
     }
@@ -58,8 +67,12 @@ public String getDefaultValueForDoc() {
         return defaultValueForDoc;
     }
 
+    public Deprecation getDeprecation() {
+        return deprecation;
+    }
+
     public boolean isDeprecated() {
-        return deprecated;
+        return deprecation != null;
     }
 
     public String getMapKey() {
@@ -106,7 +119,7 @@ public String toString(String prefix) {
         if (defaultValueForDoc != null) {
             sb.append(prefix + "defaultValueForDoc = " + defaultValueForDoc + "\n");
         }
-        if (deprecated) {
+        if (deprecation != null) {
             sb.append(prefix + "deprecated = true\n");
         }
         if (mapKey != null) {
@@ -122,8 +135,8 @@ public String toString(String prefix) {
         return sb.toString();
     }
 
-    public static Builder builder(String sourceClass, String sourceName, ResolvedType type) {
-        return new Builder(sourceClass, sourceName, type);
+    public static Builder builder(String sourceClass, String sourceName, SourceType sourceType, ResolvedType type) {
+        return new Builder(sourceClass, sourceName, sourceType, type);
     }
 
     public static class Builder {
@@ -131,10 +144,11 @@ public static class Builder {
         private String name;
         private final String sourceClass;
         private final String sourceName;
+        private final SourceType sourceType;
         private final ResolvedType type;
         private String defaultValue;
         private String defaultValueForDoc;
-        private boolean deprecated = false;
+        private Deprecation deprecation;
         private String mapKey;
         private boolean unnamedMapKey = false;
         private boolean converted = false;
@@ -142,9 +156,10 @@ public static class Builder {
         private boolean section = false;
         private boolean sectionGenerated = false;
 
-        public Builder(String sourceClass, String sourceName, ResolvedType type) {
+        public Builder(String sourceClass, String sourceName, SourceType sourceType, ResolvedType type) {
             this.sourceClass = sourceClass;
             this.sourceName = sourceName;
+            this.sourceType = sourceType;
             this.type = type;
         }
 
@@ -163,8 +178,8 @@ public Builder defaultValueForDoc(String defaultValueForDoc) {
             return this;
         }
 
-        public Builder deprecated() {
-            this.deprecated = true;
+        public Builder deprecated(String since, String replacement, String reason) {
+            this.deprecation = new Deprecation(since, replacement, reason);
             return this;
         }
 
@@ -202,8 +217,8 @@ public DiscoveryConfigProperty build() {
                 defaultValue = TypeUtil.normalizeDurationValue(defaultValue);
             }
 
-            return new DiscoveryConfigProperty(name, sourceClass, sourceName, defaultValue, defaultValueForDoc, deprecated,
-                    mapKey, unnamedMapKey, type, converted, enforceHyphenateEnumValue, section, sectionGenerated);
+            return new DiscoveryConfigProperty(name, sourceClass, sourceName, sourceType, defaultValue, defaultValueForDoc,
+                    deprecation, mapKey, unnamedMapKey, type, converted, enforceHyphenateEnumValue, section, sectionGenerated);
         }
     }
 }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadoc.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadoc.java
index 45a13153619c12..287be0b9639f4e 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadoc.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadoc.java
@@ -1,9 +1,9 @@
 package io.quarkus.annotation.processor.documentation.config.discovery;
 
-public record ParsedJavadoc(String description, String since, JavadocFormat originalFormat) {
+public record ParsedJavadoc(String description, String since, String deprecated, JavadocFormat originalFormat) {
 
     public static ParsedJavadoc empty() {
-        return new ParsedJavadoc(null, null, null);
+        return new ParsedJavadoc(null, null, null, null);
     }
 
     public boolean isEmpty() {
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadocSection.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadocSection.java
index e93fce5e7b400f..5f56acacb9cb3a 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadocSection.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadocSection.java
@@ -1,4 +1,8 @@
 package io.quarkus.annotation.processor.documentation.config.discovery;
 
-public record ParsedJavadocSection(String title, String details) {
+public record ParsedJavadocSection(String title, String details, String deprecated) {
+
+    public static ParsedJavadocSection empty() {
+        return new ParsedJavadocSection(null, null, null);
+    }
 }
\ No newline at end of file
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java
index f10b93b94fa687..01d845e500a40d 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java
@@ -34,10 +34,8 @@ public final String toString() {
         return unwrappedType.toString();
     }
 
-    public static ResolvedType ofPrimitive(TypeMirror unwrappedType) {
-        String primitiveName = unwrappedType.toString();
-
-        return new ResolvedType(unwrappedType, unwrappedType, primitiveName, primitiveName, primitiveName, true, false, false,
+    public static ResolvedType ofPrimitive(TypeMirror unwrappedType, String typeName) {
+        return new ResolvedType(unwrappedType, unwrappedType, typeName, typeName, typeName, true, false, false,
                 false, false, false, false, false, false, false);
     }
 
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToAsciidocTransformer.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToAsciidocTransformer.java
index 2775f2360a6cf3..fd5a67640d0b36 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToAsciidocTransformer.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/formatter/JavadocToAsciidocTransformer.java
@@ -111,16 +111,22 @@ public ParsedJavadoc parseConfigItemJavadoc(String rawJavadoc) {
                 .map(JavadocDescription::toText)
                 .findFirst();
 
+        Optional<String> deprecated = javadoc.getBlockTags().stream()
+                .filter(t -> t.getType() == Type.DEPRECATED)
+                .map(JavadocBlockTag::getContent)
+                .map(JavadocDescription::toText)
+                .findFirst();
+
         if (description != null && description.isBlank()) {
             description = null;
         }
 
-        return new ParsedJavadoc(description, since.isPresent() ? since.get() : null, originalFormat);
+        return new ParsedJavadoc(description, since.orElse(null), deprecated.orElse(null), originalFormat);
     }
 
     public ParsedJavadocSection parseConfigSectionJavadoc(String javadocComment) {
         if (javadocComment == null || javadocComment.trim().isEmpty()) {
-            return new ParsedJavadocSection(null, null);
+            return ParsedJavadocSection.empty();
         }
 
         // the parser expects all the lines to start with "* "
@@ -128,6 +134,12 @@ public ParsedJavadocSection parseConfigSectionJavadoc(String javadocComment) {
         javadocComment = START_OF_LINE.matcher(javadocComment).replaceAll("* ");
         Javadoc javadoc = StaticJavaParser.parseJavadoc(javadocComment);
 
+        Optional<String> deprecated = javadoc.getBlockTags().stream()
+                .filter(t -> t.getType() == Type.DEPRECATED)
+                .map(JavadocBlockTag::getContent)
+                .map(JavadocDescription::toText)
+                .findFirst();
+
         String asciidoc;
         if (isAsciidoc(javadoc)) {
             asciidoc = handleEolInAsciidoc(javadoc);
@@ -136,7 +148,7 @@ public ParsedJavadocSection parseConfigSectionJavadoc(String javadocComment) {
         }
 
         if (asciidoc == null || asciidoc.isBlank()) {
-            return new ParsedJavadocSection(null, null);
+            return ParsedJavadocSection.empty();
         }
 
         final int newLineIndex = asciidoc.indexOf(NEW_LINE);
@@ -152,12 +164,12 @@ public ParsedJavadocSection parseConfigSectionJavadoc(String javadocComment) {
         if (endOfTitleIndex == -1) {
             final String title = asciidoc.replaceAll("^([^\\w])+", "").trim();
 
-            return new ParsedJavadocSection(title, null);
+            return new ParsedJavadocSection(title, null, deprecated.orElse(null));
         } else {
             final String title = asciidoc.substring(0, endOfTitleIndex).replaceAll("^([^\\w])+", "").trim();
             final String details = asciidoc.substring(endOfTitleIndex + 1).trim();
 
-            return new ParsedJavadocSection(title, details.isBlank() ? null : details);
+            return new ParsedJavadocSection(title, details.isBlank() ? null : details, deprecated.orElse(null));
         }
     }
 
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/AbstractConfigItem.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/AbstractConfigItem.java
index b6095aa69c73c5..643ed96d286208 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/AbstractConfigItem.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/AbstractConfigItem.java
@@ -9,18 +9,21 @@ public sealed abstract class AbstractConfigItem implements Comparable<AbstractCo
 
     protected final String sourceClass;
     protected final String sourceName;
+    protected final SourceType sourceType;
     protected final Path path;
 
     protected final String type;
 
-    protected boolean deprecated;
+    protected Deprecation deprecation;
 
-    public AbstractConfigItem(String sourceClass, String sourceName, Path path, String type, boolean deprecated) {
+    public AbstractConfigItem(String sourceClass, String sourceName, SourceType sourceType, Path path, String type,
+            Deprecation deprecation) {
         this.sourceClass = sourceClass;
         this.sourceName = sourceName;
+        this.sourceType = sourceType;
         this.path = path;
         this.type = type;
-        this.deprecated = deprecated;
+        this.deprecation = deprecation;
     }
 
     public String getSourceClass() {
@@ -31,6 +34,10 @@ public String getSourceName() {
         return sourceName;
     }
 
+    public SourceType getSourceType() {
+        return sourceType;
+    }
+
     public Path getPath() {
         return path;
     }
@@ -45,8 +52,13 @@ public String getType() {
         return type;
     }
 
+    @JsonIgnore
     public boolean isDeprecated() {
-        return deprecated;
+        return deprecation != null;
+    }
+
+    public Deprecation getDeprecation() {
+        return deprecation;
     }
 
     @JsonIgnore
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigProperty.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigProperty.java
index ce5ae1261363bb..1be3576d4e27dd 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigProperty.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigProperty.java
@@ -29,14 +29,14 @@ public final class ConfigProperty extends AbstractConfigItem {
 
     private final String javadocSiteLink;
 
-    public ConfigProperty(ConfigPhase phase, String sourceClass, String sourceName, PropertyPath path,
+    public ConfigProperty(ConfigPhase phase, String sourceClass, String sourceName, SourceType sourceType, PropertyPath path,
             List<PropertyPath> additionalPaths, String type, String typeDescription, boolean map, boolean list,
             boolean optional,
             String mapKey, boolean unnamedMapKey, boolean withinMap, boolean converted, @JsonProperty("enum") boolean isEnum,
             EnumAcceptedValues enumAcceptedValues,
             String defaultValue, String javadocSiteLink,
-            boolean deprecated) {
-        super(sourceClass, sourceName, path, type, deprecated);
+            Deprecation deprecation) {
+        super(sourceClass, sourceName, sourceType, path, type, deprecation);
         this.phase = phase;
         this.additionalPaths = additionalPaths != null ? Collections.unmodifiableList(additionalPaths) : List.of();
         this.typeDescription = typeDescription;
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigRoot.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigRoot.java
index 886f387ca4b204..c4d6096d475b56 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigRoot.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigRoot.java
@@ -106,7 +106,7 @@ private void collectConfigSections(Map<String, ConfigSection> configSections, Co
 
     public boolean hasDurationType() {
         for (AbstractConfigItem item : items) {
-            if (item.hasDurationType() && !item.deprecated) {
+            if (item.hasDurationType() && !item.isDeprecated()) {
                 return true;
             }
         }
@@ -115,7 +115,7 @@ public boolean hasDurationType() {
 
     public boolean hasMemorySizeType() {
         for (AbstractConfigItem item : items) {
-            if (item.hasMemorySizeType() && !item.deprecated) {
+            if (item.hasMemorySizeType() && !item.isDeprecated()) {
                 return true;
             }
         }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigSection.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigSection.java
index 1cbacbae649980..da33958996e84e 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigSection.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/ConfigSection.java
@@ -11,9 +11,9 @@ public final class ConfigSection extends AbstractConfigItem implements ConfigIte
     private final List<AbstractConfigItem> items = new ArrayList<>();
     private final int level;
 
-    public ConfigSection(String sourceClass, String sourceName, SectionPath path, String type, int level,
-            boolean generated, boolean deprecated) {
-        super(sourceClass, sourceName, path, type, deprecated);
+    public ConfigSection(String sourceClass, String sourceName, SourceType sourceType, SectionPath path, String type, int level,
+            boolean generated, Deprecation deprecation) {
+        super(sourceClass, sourceName, sourceType, path, type, deprecation);
         this.generated = generated;
         this.level = level;
     }
@@ -58,13 +58,13 @@ public int getLevel() {
      * It can happen when for instance a path is both used at a given level and in an unnamed map.
      * For instance in: HibernateOrmConfig.
      */
-    public void appendState(boolean generated, boolean deprecated) {
+    public void appendState(boolean generated, Deprecation deprecation) {
         // we generate the section if at least one of the sections should be generated
         // (the output will contain all the items of the section)
         this.generated = this.generated || generated;
         // we unmark the section as deprecated if one of the merged section is not deprecated
         // as we will have to generate the section
-        this.deprecated = this.deprecated && deprecated;
+        this.deprecation = this.deprecation != null && deprecation != null ? this.deprecation : null;
     }
 
     /**
@@ -94,7 +94,7 @@ public void merge(ConfigSection other, Map<String, ConfigSection> existingConfig
     @Override
     public boolean hasDurationType() {
         for (AbstractConfigItem item : items) {
-            if (item.hasDurationType() && !item.deprecated) {
+            if (item.hasDurationType() && !item.isDeprecated()) {
                 return true;
             }
         }
@@ -104,7 +104,7 @@ public boolean hasDurationType() {
     @Override
     public boolean hasMemorySizeType() {
         for (AbstractConfigItem item : items) {
-            if (item.hasMemorySizeType() && !item.deprecated) {
+            if (item.hasMemorySizeType() && !item.isDeprecated()) {
                 return true;
             }
         }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/Deprecation.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/Deprecation.java
new file mode 100644
index 00000000000000..2f8b4e18fee302
--- /dev/null
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/Deprecation.java
@@ -0,0 +1,5 @@
+package io.quarkus.annotation.processor.documentation.config.model;
+
+public record Deprecation(String since, String replacement, String reason) {
+
+}
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/JavadocElements.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/JavadocElements.java
index 0ba9cd41526a59..9ef41190a32689 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/JavadocElements.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/JavadocElements.java
@@ -6,7 +6,7 @@
 
 public record JavadocElements(Extension extension, Map<String, JavadocElement> elements) {
 
-    public record JavadocElement(String description, String since, @JsonIgnore String rawJavadoc) {
+    public record JavadocElement(String description, String since, String deprecated, @JsonIgnore String rawJavadoc) {
     }
 
     public boolean isEmpty() {
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/SourceType.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/SourceType.java
new file mode 100644
index 00000000000000..6da161b75714e2
--- /dev/null
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/model/SourceType.java
@@ -0,0 +1,7 @@
+package io.quarkus.annotation.processor.documentation.config.model;
+
+public enum SourceType {
+
+    METHOD,
+    FIELD;
+}
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/resolver/ConfigResolver.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/resolver/ConfigResolver.java
index 9e79083966110b..d6fa963d6dd12a 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/resolver/ConfigResolver.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/resolver/ConfigResolver.java
@@ -26,6 +26,7 @@
 import io.quarkus.annotation.processor.documentation.config.model.ConfigRoot;
 import io.quarkus.annotation.processor.documentation.config.model.ConfigSection;
 import io.quarkus.annotation.processor.documentation.config.model.ConfigSection.SectionPath;
+import io.quarkus.annotation.processor.documentation.config.model.Deprecation;
 import io.quarkus.annotation.processor.documentation.config.model.EnumAcceptedValues;
 import io.quarkus.annotation.processor.documentation.config.model.EnumAcceptedValues.EnumAcceptedValue;
 import io.quarkus.annotation.processor.documentation.config.model.JavadocElements;
@@ -76,7 +77,7 @@ public ResolvedModel resolveModel() {
             configRoot.addQualifiedName(discoveryConfigRoot.getQualifiedName());
 
             ResolutionContext context = new ResolutionContext(configRoot.getPrefix(), new ArrayList<>(), discoveryConfigRoot,
-                    configRoot, 0, false, false, false);
+                    configRoot, 0, false, false, null);
             for (DiscoveryConfigProperty discoveryConfigProperty : discoveryConfigRoot.getProperties().values()) {
                 resolveProperty(configRoot, existingRootConfigSections, discoveryConfigRoot.getPhase(), context,
                         discoveryConfigProperty);
@@ -95,7 +96,8 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
         List<String> additionalPaths = context.getAdditionalPaths().stream()
                 .map(p -> appendPath(p, discoveryConfigProperty.getPath()))
                 .collect(Collectors.toCollection(ArrayList::new));
-        boolean deprecated = context.isDeprecated() || discoveryConfigProperty.isDeprecated();
+        Deprecation deprecation = discoveryConfigProperty.getDeprecation() != null ? discoveryConfigProperty.getDeprecation()
+                : context.getDeprecation();
 
         String typeQualifiedName = discoveryConfigProperty.getType().qualifiedName();
 
@@ -130,21 +132,22 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
                 ConfigSection configSection = existingRootConfigSections.get(path);
 
                 if (configSection != null) {
-                    configSection.appendState(discoveryConfigProperty.isSectionGenerated(), deprecated);
+                    configSection.appendState(discoveryConfigProperty.isSectionGenerated(), deprecation);
                 } else {
                     configSection = new ConfigSection(discoveryConfigProperty.getSourceClass(),
-                            discoveryConfigProperty.getSourceName(), new SectionPath(path), typeQualifiedName,
-                            context.getSectionLevel(), discoveryConfigProperty.isSectionGenerated(), deprecated);
+                            discoveryConfigProperty.getSourceName(), discoveryConfigProperty.getSourceType(),
+                            new SectionPath(path), typeQualifiedName,
+                            context.getSectionLevel(), discoveryConfigProperty.isSectionGenerated(), deprecation);
                     context.getItemCollection().addItem(configSection);
                     existingRootConfigSections.put(path, configSection);
                 }
 
                 configGroupContext = new ResolutionContext(potentiallyMappedPath, additionalPaths, discoveryConfigGroup,
-                        configSection, context.getSectionLevel() + 1, isWithinMap, isWithMapWithUnnamedKey, deprecated);
+                        configSection, context.getSectionLevel() + 1, isWithinMap, isWithMapWithUnnamedKey, deprecation);
             } else {
                 configGroupContext = new ResolutionContext(potentiallyMappedPath, additionalPaths, discoveryConfigGroup,
                         context.getItemCollection(), context.getSectionLevel(), isWithinMap, isWithMapWithUnnamedKey,
-                        deprecated);
+                        deprecation);
             }
 
             for (DiscoveryConfigProperty configGroupProperty : discoveryConfigGroup.getProperties().values()) {
@@ -180,7 +183,7 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
             if (discoveryConfigProperty.getType().isMap()) {
                 // it is a leaf pass through map, it is always optional
                 optional = true;
-                typeQualifiedName = discoveryConfigProperty.getType().wrapperType().toString();
+                typeQualifiedName = utils.element().getQualifiedName(discoveryConfigProperty.getType().wrapperType());
                 typeSimplifiedName = utils.element().simplifyGenericType(discoveryConfigProperty.getType().wrapperType());
 
                 potentiallyMappedPath += ConfigNamingUtil.getMapKey(discoveryConfigProperty.getMapKey());
@@ -188,7 +191,7 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
                         .map(p -> p + ConfigNamingUtil.getMapKey(discoveryConfigProperty.getMapKey()))
                         .collect(Collectors.toCollection(ArrayList::new));
             } else if (discoveryConfigProperty.getType().isList()) {
-                typeQualifiedName = discoveryConfigProperty.getType().wrapperType().toString();
+                typeQualifiedName = utils.element().getQualifiedName(discoveryConfigProperty.getType().wrapperType());
             }
 
             PropertyPath propertyPath = new PropertyPath(potentiallyMappedPath,
@@ -200,7 +203,9 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
             // this is a standard property
             ConfigProperty configProperty = new ConfigProperty(phase,
                     discoveryConfigProperty.getSourceClass(),
-                    discoveryConfigProperty.getSourceName(), propertyPath, additionalPropertyPaths,
+                    discoveryConfigProperty.getSourceName(),
+                    discoveryConfigProperty.getSourceType(),
+                    propertyPath, additionalPropertyPaths,
                     typeQualifiedName, typeSimplifiedName,
                     discoveryConfigProperty.getType().isMap(), discoveryConfigProperty.getType().isList(),
                     optional, discoveryConfigProperty.getMapKey(),
@@ -209,7 +214,7 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
                     discoveryConfigProperty.getType().isEnum(),
                     enumAcceptedValues, defaultValue,
                     JavadocUtil.getJavadocSiteLink(typeBinaryName),
-                    deprecated);
+                    deprecation);
             context.getItemCollection().addItem(configProperty);
         }
     }
@@ -259,18 +264,18 @@ private static class ResolutionContext {
         private final int sectionLevel;
         private final boolean withinMap;
         private final boolean withinMapWithUnnamedKey;
-        private final boolean deprecated;
+        private final Deprecation deprecation;
 
         private ResolutionContext(String path, List<String> additionalPaths, DiscoveryRootElement discoveryRootElement,
                 ConfigItemCollection itemCollection,
-                int sectionLevel, boolean withinMap, boolean withinMapWithUnnamedKey, boolean deprecated) {
+                int sectionLevel, boolean withinMap, boolean withinMapWithUnnamedKey, Deprecation deprecation) {
             this.path = path;
             this.additionalPaths = additionalPaths;
             this.discoveryRootElement = discoveryRootElement;
             this.itemCollection = itemCollection;
             this.withinMap = withinMap;
             this.withinMapWithUnnamedKey = withinMapWithUnnamedKey;
-            this.deprecated = deprecated;
+            this.deprecation = deprecation;
             this.sectionLevel = sectionLevel;
         }
 
@@ -302,8 +307,8 @@ public boolean isWithinMapWithUnnamedKey() {
             return withinMapWithUnnamedKey;
         }
 
-        public boolean isDeprecated() {
-            return deprecated;
+        public Deprecation getDeprecation() {
+            return deprecation;
         }
     }
 }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractConfigListener.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractConfigListener.java
index 54ce54500882f3..4ab20e4ee24e33 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractConfigListener.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractConfigListener.java
@@ -69,6 +69,13 @@ public void onResolvedEnum(TypeElement enumTypeElement) {
     protected void handleCommonPropertyAnnotations(DiscoveryConfigProperty.Builder builder,
             Map<String, AnnotationMirror> propertyAnnotations, ResolvedType resolvedType, String sourceName) {
 
+        AnnotationMirror deprecatedAnnotation = propertyAnnotations.get(Deprecated.class.getName());
+        if (deprecatedAnnotation != null) {
+            String since = (String) utils.element().getAnnotationValues(deprecatedAnnotation).get("since");
+            // TODO add more information about the deprecation, typically the reason and a replacement
+            builder.deprecated(since, null, null);
+        }
+
         AnnotationMirror configDocSectionAnnotation = propertyAnnotations.get(Types.ANNOTATION_CONFIG_DOC_SECTION);
         if (configDocSectionAnnotation != null) {
             Boolean sectionGenerated = (Boolean) utils.element().getAnnotationValues(configDocSectionAnnotation)
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractJavadocConfigListener.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractJavadocConfigListener.java
index 65dacda0e95b30..1300d0b9b7e676 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractJavadocConfigListener.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/AbstractJavadocConfigListener.java
@@ -47,7 +47,8 @@ public void onResolvedEnum(TypeElement enumTypeElement) {
             configCollector.addJavadocElement(
                     enumTypeElement.getQualifiedName().toString() + Markers.DOT + enumElement.getSimpleName()
                             .toString(),
-                    new JavadocElement(parsedJavadoc.description(), parsedJavadoc.since(), rawJavadoc.get()));
+                    new JavadocElement(parsedJavadoc.description(), parsedJavadoc.since(), parsedJavadoc.deprecated(),
+                            rawJavadoc.get()));
         }
     }
 }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigAnnotationScanner.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigAnnotationScanner.java
index 5ae2110b70d557..0ee2a08b30455e 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigAnnotationScanner.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigAnnotationScanner.java
@@ -197,7 +197,8 @@ private void scanElement(List<ConfigAnnotationListener> listeners, DiscoveryRoot
             }
         } else {
             TypeMirror superclass = clazz.getSuperclass();
-            if (superclass.getKind() != TypeKind.NONE && !superclass.toString().equals(Object.class.getName())) {
+            if (superclass.getKind() != TypeKind.NONE
+                    && !utils.element().getQualifiedName(superclass).equals(Object.class.getName())) {
                 TypeElement superclassTypeElement = (TypeElement) ((DeclaredType) superclass).asElement();
 
                 debug("Detected superclass: " + superclassTypeElement, clazz);
@@ -324,7 +325,7 @@ private boolean isEnumAlreadyHandled(TypeElement clazz) {
 
     private ResolvedType resolveType(TypeMirror typeMirror) {
         if (typeMirror.getKind().isPrimitive()) {
-            return ResolvedType.ofPrimitive(typeMirror);
+            return ResolvedType.ofPrimitive(typeMirror, utils.element().getQualifiedName(typeMirror));
         }
         if (typeMirror.getKind() == TypeKind.ARRAY) {
             ResolvedType resolvedType = resolveType(((ArrayType) typeMirror).getComponentType());
@@ -369,7 +370,7 @@ private ResolvedType resolveType(TypeMirror typeMirror) {
             isConfigGroup = utils.element().isAnnotationPresent(typeElement, Types.ANNOTATION_CONFIG_GROUP);
         } else if (typeElement.getKind() == ElementKind.CLASS) {
             isClass = true;
-            isDuration = typeMirror.toString().equals(Duration.class.getName());
+            isDuration = utils.element().getQualifiedName(typeMirror).equals(Duration.class.getName());
             isConfigGroup = utils.element().isAnnotationPresent(typeElement, Types.ANNOTATION_CONFIG_GROUP);
         }
 
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigMappingListener.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigMappingListener.java
index 988805d7f532d4..1847c8e2035039 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigMappingListener.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/ConfigMappingListener.java
@@ -15,6 +15,7 @@
 import io.quarkus.annotation.processor.documentation.config.discovery.DiscoveryRootElement;
 import io.quarkus.annotation.processor.documentation.config.discovery.ResolvedType;
 import io.quarkus.annotation.processor.documentation.config.model.ConfigPhase;
+import io.quarkus.annotation.processor.documentation.config.model.SourceType;
 import io.quarkus.annotation.processor.documentation.config.util.ConfigNamingUtil;
 import io.quarkus.annotation.processor.documentation.config.util.Markers;
 import io.quarkus.annotation.processor.documentation.config.util.Types;
@@ -42,7 +43,7 @@ public Optional<DiscoveryConfigRoot> onConfigRoot(TypeElement configRoot) {
         AnnotationMirror configDocFileNameAnnotation = null;
 
         for (AnnotationMirror annotationMirror : configRoot.getAnnotationMirrors()) {
-            String annotationName = annotationMirror.getAnnotationType().toString();
+            String annotationName = utils.element().getQualifiedName(annotationMirror.getAnnotationType());
 
             if (annotationName.equals(Types.ANNOTATION_CONFIG_ROOT)) {
                 configRootAnnotation = annotationMirror;
@@ -126,13 +127,7 @@ public void onEnclosedMethod(DiscoveryRootElement discoveryRootElement, TypeElem
 
         String sourceName = method.getSimpleName().toString();
         DiscoveryConfigProperty.Builder builder = DiscoveryConfigProperty.builder(clazz.getQualifiedName().toString(),
-                sourceName, resolvedType);
-
-        AnnotationMirror deprecatedAnnotation = methodAnnotations.get(Deprecated.class.getName());
-        if (deprecatedAnnotation != null) {
-            builder.deprecated();
-            // TODO add more information about the deprecated forRemoval/since/comment
-        }
+                sourceName, SourceType.METHOD, resolvedType);
 
         String name = ConfigNamingUtil.hyphenate(sourceName);
         AnnotationMirror withNameAnnotation = methodAnnotations.get(Types.ANNOTATION_CONFIG_WITH_NAME);
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocConfigMappingListener.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocConfigMappingListener.java
index 385fbf401fbe1a..121a4affbab369 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocConfigMappingListener.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocConfigMappingListener.java
@@ -56,13 +56,15 @@ public void onEnclosedMethod(DiscoveryRootElement discoveryRootElement, TypeElem
 
             configCollector.addJavadocElement(
                     clazz.getQualifiedName().toString() + Markers.DOT + method.getSimpleName().toString(),
-                    new JavadocElement(parsedJavadocSection.title(), null, rawJavadoc.get()));
+                    new JavadocElement(parsedJavadocSection.title(), null, parsedJavadocSection.deprecated(),
+                            rawJavadoc.get()));
         } else {
             ParsedJavadoc parsedJavadoc = JavadocToAsciidocTransformer.INSTANCE.parseConfigItemJavadoc(rawJavadoc.get());
 
             configCollector.addJavadocElement(
                     clazz.getQualifiedName().toString() + Markers.DOT + method.getSimpleName().toString(),
-                    new JavadocElement(parsedJavadoc.description(), parsedJavadoc.since(), rawJavadoc.get()));
+                    new JavadocElement(parsedJavadoc.description(), parsedJavadoc.since(), parsedJavadoc.deprecated(),
+                            rawJavadoc.get()));
         }
     }
 }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocLegacyConfigRootListener.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocLegacyConfigRootListener.java
index 8b08f37a6fac40..bfbc991d0ff28d 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocLegacyConfigRootListener.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/JavadocLegacyConfigRootListener.java
@@ -56,13 +56,15 @@ public void onEnclosedField(DiscoveryRootElement discoveryRootElement, TypeEleme
 
             configCollector.addJavadocElement(
                     clazz.getQualifiedName().toString() + Markers.DOT + field.getSimpleName().toString(),
-                    new JavadocElement(parsedJavadocSection.title(), null, rawJavadoc.get()));
+                    new JavadocElement(parsedJavadocSection.title(), null, parsedJavadocSection.deprecated(),
+                            rawJavadoc.get()));
         } else {
             ParsedJavadoc parsedJavadoc = JavadocToAsciidocTransformer.INSTANCE.parseConfigItemJavadoc(rawJavadoc.get());
 
             configCollector.addJavadocElement(
                     clazz.getQualifiedName().toString() + Markers.DOT + field.getSimpleName().toString(),
-                    new JavadocElement(parsedJavadoc.description(), parsedJavadoc.since(), rawJavadoc.get()));
+                    new JavadocElement(parsedJavadoc.description(), parsedJavadoc.since(), parsedJavadoc.deprecated(),
+                            rawJavadoc.get()));
         }
     }
 }
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/LegacyConfigRootListener.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/LegacyConfigRootListener.java
index bc7aadb4dc150f..6a1ca922d3da31 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/LegacyConfigRootListener.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/scanner/LegacyConfigRootListener.java
@@ -16,6 +16,7 @@
 import io.quarkus.annotation.processor.documentation.config.discovery.DiscoveryRootElement;
 import io.quarkus.annotation.processor.documentation.config.discovery.ResolvedType;
 import io.quarkus.annotation.processor.documentation.config.model.ConfigPhase;
+import io.quarkus.annotation.processor.documentation.config.model.SourceType;
 import io.quarkus.annotation.processor.documentation.config.util.ConfigNamingUtil;
 import io.quarkus.annotation.processor.documentation.config.util.Markers;
 import io.quarkus.annotation.processor.documentation.config.util.Types;
@@ -43,7 +44,7 @@ public Optional<DiscoveryConfigRoot> onConfigRoot(TypeElement configRoot) {
         AnnotationMirror configDocFileNameAnnotation = null;
 
         for (AnnotationMirror annotationMirror : configRoot.getAnnotationMirrors()) {
-            String annotationName = annotationMirror.getAnnotationType().toString();
+            String annotationName = utils.element().getQualifiedName(annotationMirror.getAnnotationType());
 
             if (annotationName.equals(Types.ANNOTATION_CONFIG_ROOT)) {
                 configRootAnnotation = annotationMirror;
@@ -126,13 +127,7 @@ public void onEnclosedField(DiscoveryRootElement discoveryRootElement, TypeEleme
         String name = ConfigNamingUtil.hyphenate(sourceName);
 
         DiscoveryConfigProperty.Builder builder = DiscoveryConfigProperty.builder(clazz.getQualifiedName().toString(),
-                sourceName, resolvedType);
-
-        AnnotationMirror deprecatedAnnotation = fieldAnnotations.get(Deprecated.class.getName());
-        if (deprecatedAnnotation != null) {
-            builder.deprecated();
-            // TODO add more information about the deprecated forRemoval/since/comment
-        }
+                sourceName, SourceType.FIELD, resolvedType);
 
         AnnotationMirror configItemAnnotation = fieldAnnotations.get(Types.ANNOTATION_CONFIG_ITEM);
         if (configItemAnnotation != null) {
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/util/JavadocUtil.java b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/util/JavadocUtil.java
index 0e4115d278b863..8ca9e307b0ca09 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/util/JavadocUtil.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/util/JavadocUtil.java
@@ -9,7 +9,7 @@
 public final class JavadocUtil {
 
     static final String VERTX_JAVA_DOC_SITE = "https://vertx.io/docs/apidocs/";
-    static final String OFFICIAL_JAVA_DOC_BASE_LINK = "https://docs.oracle.com/en/java/javase/17/docs/api/";
+    static final String OFFICIAL_JAVA_DOC_BASE_LINK = "https://docs.oracle.com/en/java/javase/17/docs/api/java.base/";
     static final String AGROAL_API_JAVA_DOC_SITE = "https://javadoc.io/doc/io.agroal/agroal-api/latest/";
     static final String LOG_LEVEL_REDIRECT_URL = "https://javadoc.io/doc/org.jboss.logmanager/jboss-logmanager/latest/org/jboss/logmanager/Level.html";
 
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/util/ElementUtil.java b/core/processor/src/main/java/io/quarkus/annotation/processor/util/ElementUtil.java
index a62011274c905a..eaf41d1ec52a57 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/util/ElementUtil.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/util/ElementUtil.java
@@ -29,6 +29,34 @@ public class ElementUtil {
         this.processingEnv = processingEnv;
     }
 
+    public String getQualifiedName(TypeMirror type) {
+        switch (type.getKind()) {
+            case BOOLEAN:
+                return "boolean";
+            case BYTE:
+                return "byte";
+            case CHAR:
+                return "char";
+            case DOUBLE:
+                return "double";
+            case FLOAT:
+                return "float";
+            case INT:
+                return "int";
+            case LONG:
+                return "long";
+            case SHORT:
+                return "short";
+            case DECLARED:
+                return ((TypeElement) ((DeclaredType) type).asElement()).getQualifiedName().toString();
+            default:
+                // note that it includes annotations, which is something we don't want
+                // thus why all this additional work above...
+                // this default should never be triggered AFAIK, it's there to be extra safe
+                return type.toString();
+        }
+    }
+
     public String getBinaryName(TypeElement clazz) {
         return processingEnv.getElementUtils().getBinaryName(clazz).toString();
     }
diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
index 8ffbba22d9ef9d..d748b2d1e078b3 100644
--- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
+++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
@@ -633,7 +633,7 @@ private void addLocalProject(ResolvedDependency project, GradleDevModeLauncher.B
             }
         }
         Path classesDir = classesDirs.isEmpty() ? null
-                : QuarkusGradleUtils.mergeClassesDirs(classesDirs, project.getWorkspaceModule().getBuildDir(), root, false);
+                : QuarkusGradleUtils.mergeClassesDirs(classesDirs, project.getWorkspaceModule().getBuildDir(), true, false);
         Path generatedSourcesPath = sources.getSourceDirs().isEmpty() ? null
                 : sources.getSourceDirs().iterator().next().getAptSourcesDir();
 
diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGradleUtils.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGradleUtils.java
index fc38292cf7498a..d5e924f6dd27c3 100644
--- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGradleUtils.java
+++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusGradleUtils.java
@@ -7,7 +7,7 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 import org.gradle.api.Project;
@@ -46,44 +46,35 @@ public static String getClassesDir(SourceSet sourceSet, File tmpDir, boolean pop
     }
 
     public static Path mergeClassesDirs(Collection<Path> classesDirs, File tmpDir, boolean populated, boolean test) {
-        Path classesDir = null;
-        final Iterator<Path> i = classesDirs.iterator();
-        int dirCount = 0;
-        while (i.hasNext()) {
-            final Path next = i.next();
-            if (!Files.exists(next)) {
-                continue;
+        List<Path> existingClassesDirs = classesDirs.stream().filter(p -> Files.exists(p)).toList();
+
+        if (existingClassesDirs.size() == 0) {
+            return null;
+        }
+
+        if (existingClassesDirs.size() == 1) {
+            return existingClassesDirs.get(0);
+        }
+
+        try {
+            Path mergedClassesDir = tmpDir.toPath().resolve("quarkus-app-classes" + (test ? "-test" : ""));
+
+            if (!populated) {
+                return mergedClassesDir;
             }
-            try {
-                switch (dirCount++) {
-                    case 0:
-                        classesDir = next;
-                        break;
-                    case 1:
-                        //there does not seem to be any sane way of dealing with multiple output dirs, as there does not seem
-                        //to be a way to map them. We will need to address this at some point, but for now we just stick them
-                        //all in a temp dir
-                        final Path tmpClassesDir = tmpDir.toPath().resolve("quarkus-app-classes" + (test ? "-test" : ""));
-                        if (!populated) {
-                            return tmpClassesDir;
-                        }
-                        if (Files.exists(tmpClassesDir)) {
-                            IoUtils.recursiveDelete(tmpClassesDir);
-                        }
-                        IoUtils.copy(classesDir, tmpClassesDir);
-                        classesDir = tmpClassesDir;
-                    default:
-                        IoUtils.copy(next, classesDir);
-
-                }
-            } catch (IOException e) {
-                throw new UncheckedIOException(ERROR_COLLECTING_PROJECT_CLASSES, e);
+
+            if (Files.exists(mergedClassesDir)) {
+                IoUtils.recursiveDelete(mergedClassesDir);
             }
+
+            for (Path classesDir : existingClassesDirs) {
+                IoUtils.copy(classesDir, mergedClassesDir);
+            }
+
+            return mergedClassesDir;
+        } catch (IOException e) {
+            throw new UncheckedIOException(ERROR_COLLECTING_PROJECT_CLASSES, e);
         }
-        if (classesDir == null) {
-            return null;
-        }
-        return classesDir;
     }
 
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
index 55baff707f8c63..c39bff63a8052a 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
@@ -63,7 +63,7 @@ public class CreateProjectMojo extends AbstractMojo {
     private static final String DEFAULT_GROUP_ID = "org.acme";
     private static final String DEFAULT_ARTIFACT_ID = "code-with-quarkus";
     private static final String DEFAULT_VERSION = "1.0.0-SNAPSHOT";
-    private static final String DEFAULT_EXTENSIONS = "resteasy";
+    private static final String DEFAULT_EXTENSIONS = "rest";
 
     @Parameter(defaultValue = "${project}")
     protected MavenProject project;
diff --git a/docs/src/main/asciidoc/writing-extensions.adoc b/docs/src/main/asciidoc/writing-extensions.adoc
index b2490d1c9c1687..bac8aab0544353 100644
--- a/docs/src/main/asciidoc/writing-extensions.adoc
+++ b/docs/src/main/asciidoc/writing-extensions.adoc
@@ -1090,13 +1090,6 @@ configuration, and when they are available to applications. The phases defined b
 | ✗
 | Appropriate for things which affect build and must be visible for run time code.  Not read from config at run time.
 
-| BOOTSTRAP
-| ✗
-| ✓
-| ✗
-| ✓
-| Used when runtime configuration needs to be obtained from an external system (like `Consul`), but details of that system need to be configurable (for example Consul's URL). The high level way this works is by using the standard Quarkus config sources (such as properties files, system properties, etc.) and producing `ConfigSourceProvider` objects which are subsequently taken into account by Quarkus when creating the final runtime `Config` object.
-
 | RUN_TIME
 | ✗
 | ✓
@@ -1108,8 +1101,6 @@ configuration, and when they are available to applications. The phases defined b
 
 For all cases other than the `BUILD_TIME` case, the configuration mapping interface and all the configuration groups and types contained therein must be located in, or reachable from, the extension's run time artifact. Configuration mappings of phase `BUILD_TIME` may be located in or reachable from either of the extension's run time or deployment artifacts.
 
-IMPORTANT: _Bootstrap_ configuration steps are executed during runtime-init *before* any of other runtime steps. This means that code executed as part of this step cannot access anything that gets initialized in runtime init steps (runtime synthetic CDI beans being one such example).
-
 ==== Configuration Example
 
 [source%nowrap,java]
@@ -1203,8 +1194,7 @@ Since `format` is not defined in these properties, the default value from `@With
 A configuration mapping name can contain an extra suffix segment for the case where there are configuration
 mappings for multiple <<config-phases>>. Classes which correspond to the `BUILD_TIME` and `BUILD_AND_RUN_TIME_FIXED`
 may end with `BuildTimeConfig` or `BuildTimeConfiguration`, classes which correspond to the `RUN_TIME` phase
-may end with `RuntimeConfig`, `RunTimeConfig`, `RuntimeConfiguration` or `RunTimeConfiguration` while classes which
-correspond to the `BOOTSTRAP` configuration may end with `BootstrapConfig` or `BootstrapConfiguration`.
+may end with `RuntimeConfig`, `RunTimeConfig`, `RuntimeConfiguration` or `RunTimeConfiguration`.
 
 ==== Configuration Reference Documentation
 
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
index 8ef9891a04f093..ffaaf4922561f6 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
@@ -70,7 +70,6 @@ public class CodeAuthenticationMechanism extends AbstractOidcAuthenticationMecha
     static final String EQ = "=";
     static final String COOKIE_DELIM = "|";
     static final Pattern COOKIE_PATTERN = Pattern.compile("\\" + COOKIE_DELIM);
-    static final String STATE_COOKIE_RESTORE_PATH = "restore-path";
     static final Uni<Void> VOID_UNI = Uni.createFrom().voidItem();
     static final String NO_OIDC_COOKIES_AVAILABLE = "no_oidc_cookies";
     static final String HTTP_SCHEME = "http";
@@ -940,13 +939,16 @@ private CodeAuthenticationStateBean getCodeAuthenticationBean(String[] parsedSta
         if (parsedStateCookieValue.length == 2) {
             CodeAuthenticationStateBean bean = new CodeAuthenticationStateBean();
             Authentication authentication = configContext.oidcConfig.authentication;
+
             boolean pkceRequired = authentication.pkceRequired.orElse(false);
             if (!pkceRequired && !authentication.nonceRequired) {
-                bean.setRestorePath(parsedStateCookieValue[1]);
+                JsonObject json = new JsonObject(OidcUtils.base64UrlDecode(parsedStateCookieValue[1]));
+                bean.setRestorePath(json.getString(OidcUtils.STATE_COOKIE_RESTORE_PATH));
                 return bean;
             }
 
             JsonObject json = null;
+
             try {
                 json = OidcUtils.decryptJson(parsedStateCookieValue[1], configContext.getStateEncryptionKey());
             } catch (Exception ex) {
@@ -954,7 +956,7 @@ private CodeAuthenticationStateBean getCodeAuthenticationBean(String[] parsedSta
                         configContext.oidcConfig.tenantId.get());
                 throw new AuthenticationCompletionException(ex);
             }
-            bean.setRestorePath(json.getString(STATE_COOKIE_RESTORE_PATH));
+            bean.setRestorePath(json.getString(OidcUtils.STATE_COOKIE_RESTORE_PATH));
             bean.setCodeVerifier(json.getString(OidcConstants.PKCE_CODE_VERIFIER));
             bean.setNonce(json.getString(OidcConstants.NONCE));
             return bean;
@@ -1161,8 +1163,9 @@ private boolean isRestorePath(Authentication auth) {
     }
 
     private String encodeExtraStateValue(CodeAuthenticationStateBean extraStateValue, TenantConfigContext configContext) {
+        JsonObject json = new JsonObject();
+
         if (extraStateValue.getCodeVerifier() != null || extraStateValue.getNonce() != null) {
-            JsonObject json = new JsonObject();
             if (extraStateValue.getCodeVerifier() != null) {
                 json.put(OidcConstants.PKCE_CODE_VERIFIER, extraStateValue.getCodeVerifier());
             }
@@ -1170,7 +1173,7 @@ private String encodeExtraStateValue(CodeAuthenticationStateBean extraStateValue
                 json.put(OidcConstants.NONCE, extraStateValue.getNonce());
             }
             if (extraStateValue.getRestorePath() != null) {
-                json.put(STATE_COOKIE_RESTORE_PATH, extraStateValue.getRestorePath());
+                json.put(OidcUtils.STATE_COOKIE_RESTORE_PATH, extraStateValue.getRestorePath());
             }
             try {
                 return OidcUtils.encryptJson(json, configContext.getStateEncryptionKey());
@@ -1179,7 +1182,9 @@ private String encodeExtraStateValue(CodeAuthenticationStateBean extraStateValue
                 throw new AuthenticationCompletionException(ex);
             }
         } else {
-            return extraStateValue.getRestorePath();
+            json.put(OidcUtils.STATE_COOKIE_RESTORE_PATH, extraStateValue.getRestorePath());
+
+            return Base64.getUrlEncoder().withoutPadding().encodeToString(json.encode().getBytes(StandardCharsets.UTF_8));
         }
 
     }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java
index db3b03456ab6fc..6773643e284e80 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java
@@ -75,6 +75,7 @@
 public final class OidcUtils {
     private static final Logger LOG = Logger.getLogger(OidcUtils.class);
 
+    public static final String STATE_COOKIE_RESTORE_PATH = "restore-path";
     public static final String CONFIG_METADATA_ATTRIBUTE = "configuration-metadata";
     public static final String USER_INFO_ATTRIBUTE = "userinfo";
     public static final String INTROSPECTION_ATTRIBUTE = "introspection";
@@ -252,7 +253,7 @@ private static JsonObject decodeAsJsonObject(String encodedContent) {
         }
     }
 
-    private static String base64UrlDecode(String encodedContent) {
+    public static String base64UrlDecode(String encodedContent) {
         return new String(Base64.getUrlDecoder().decode(encodedContent), StandardCharsets.UTF_8);
     }
 
diff --git a/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/TracerProcessor.java b/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/TracerProcessor.java
index 4f67ed23eacdc3..557749f5c104a4 100644
--- a/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/TracerProcessor.java
+++ b/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/TracerProcessor.java
@@ -15,6 +15,7 @@
 import java.util.function.BooleanSupplier;
 
 import jakarta.enterprise.inject.spi.EventContext;
+import jakarta.inject.Singleton;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
@@ -24,6 +25,7 @@
 import org.jboss.jandex.MethodInfo;
 import org.jboss.logging.Logger;
 
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.IdGenerator;
@@ -31,9 +33,9 @@
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.arc.deployment.ObserverRegistrationPhaseBuildItem;
 import io.quarkus.arc.deployment.ObserverRegistrationPhaseBuildItem.ObserverConfiguratorBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.builder.Version;
@@ -50,6 +52,7 @@
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.opentelemetry.runtime.config.build.OTelBuildConfig;
 import io.quarkus.opentelemetry.runtime.config.build.OTelBuildConfig.SecurityEvents.SecurityEventType;
+import io.quarkus.opentelemetry.runtime.tracing.DelayedAttributes;
 import io.quarkus.opentelemetry.runtime.tracing.TracerRecorder;
 import io.quarkus.opentelemetry.runtime.tracing.cdi.TracerProducer;
 import io.quarkus.opentelemetry.runtime.tracing.security.EndUserSpanProcessor;
@@ -169,14 +172,22 @@ void dropNames(
 
     @BuildStep
     @Record(ExecutionTime.STATIC_INIT)
-    void staticInitSetup(
+    SyntheticBeanBuildItem setupDelayedAttribute(TracerRecorder recorder, ApplicationInfoBuildItem appInfo) {
+        return SyntheticBeanBuildItem.configure(DelayedAttributes.class).types(Attributes.class)
+                .supplier(recorder.delayedAttributes(Version.getVersion(),
+                        appInfo.getName(), appInfo.getVersion()))
+                .scope(Singleton.class)
+                .setRuntimeInit()
+                .done();
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void setupSampler(
             TracerRecorder recorder,
-            ApplicationInfoBuildItem appInfo,
-            BeanContainerBuildItem beanContainerBuildItem,
             DropNonApplicationUrisBuildItem dropNonApplicationUris,
             DropStaticResourcesBuildItem dropStaticResources) {
-        recorder.setAttributes(beanContainerBuildItem.getValue(), Version.getVersion(),
-                appInfo.getName(), appInfo.getVersion());
+
         recorder.setupSampler(
                 dropNonApplicationUris.getDropNames(),
                 dropStaticResources.getDropNames());
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java
index 393aa22568fb1c..a2c082ead70ecb 100644
--- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java
+++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java
@@ -3,11 +3,11 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.semconv.ResourceAttributes;
-import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.runtime.annotations.StaticInit;
 
@@ -18,22 +18,24 @@ public class TracerRecorder {
     public static final Set<String> dropStaticResourceTargets = new HashSet<>();
 
     @StaticInit
-    public void setAttributes(
-            BeanContainer beanContainer,
-            String quarkusVersion,
+    public Supplier<DelayedAttributes> delayedAttributes(String quarkusVersion,
             String serviceName,
             String serviceVersion) {
-
-        DelayedAttributes delayedAttributes = beanContainer.beanInstance(DelayedAttributes.class);
-
-        delayedAttributes.setAttributesDelegate(Resource.getDefault()
-                .merge(Resource.create(
-                        Attributes.of(
-                                ResourceAttributes.SERVICE_NAME, serviceName,
-                                ResourceAttributes.SERVICE_VERSION, serviceVersion,
-                                ResourceAttributes.WEBENGINE_NAME, "Quarkus",
-                                ResourceAttributes.WEBENGINE_VERSION, quarkusVersion)))
-                .getAttributes());
+        return new Supplier<>() {
+            @Override
+            public DelayedAttributes get() {
+                var result = new DelayedAttributes();
+                result.setAttributesDelegate(Resource.getDefault()
+                        .merge(Resource.create(
+                                Attributes.of(
+                                        ResourceAttributes.SERVICE_NAME, serviceName,
+                                        ResourceAttributes.SERVICE_VERSION, serviceVersion,
+                                        ResourceAttributes.WEBENGINE_NAME, "Quarkus",
+                                        ResourceAttributes.WEBENGINE_VERSION, quarkusVersion)))
+                        .getAttributes());
+                return result;
+            }
+        };
     }
 
     @StaticInit
@@ -43,4 +45,5 @@ public void setupSampler(
         dropNonApplicationUriTargets.addAll(dropNonApplicationUris);
         dropStaticResourceTargets.addAll(dropStaticResources);
     }
+
 }
diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java
index 6c44fb6edbca36..057110bdd43336 100644
--- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java
+++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java
@@ -22,15 +22,9 @@
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
 import io.quarkus.arc.DefaultBean;
-import io.quarkus.opentelemetry.runtime.tracing.DelayedAttributes;
 
 @Singleton
 public class TracerProducer {
-    @Produces
-    @Singleton
-    public DelayedAttributes getDelayedAttributes() {
-        return new DelayedAttributes();
-    }
 
     @Produces
     @ApplicationScoped
diff --git a/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java b/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java
index 022f4b53305b3a..081d4f9575bbed 100644
--- a/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java
+++ b/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusProxyInvocationHandler.java
@@ -1,12 +1,16 @@
 package io.quarkus.restclient.runtime;
 
+import java.io.Closeable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -22,6 +26,8 @@
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.enterprise.inject.spi.InterceptionType;
 import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.Path;
 import jakarta.ws.rs.ProcessingException;
 import jakarta.ws.rs.client.ResponseProcessingException;
 import jakarta.ws.rs.ext.ParamConverter;
@@ -30,8 +36,10 @@
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.microprofile.client.ExceptionMapping;
+import org.jboss.resteasy.microprofile.client.ProxyInvocationHandler;
 import org.jboss.resteasy.microprofile.client.RestClientProxy;
 import org.jboss.resteasy.microprofile.client.header.ClientHeaderFillingException;
+import org.jboss.resteasy.microprofile.client.header.ClientHeaderProviders;
 
 /**
  * Quarkus version of {@link org.jboss.resteasy.microprofile.client.ProxyInvocationHandler} retaining the ability to
@@ -84,14 +92,17 @@ public QuarkusProxyInvocationHandler(final Class<?> restClientInterface,
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if (RestClientProxy.class.equals(method.getDeclaringClass())) {
-            return invokeRestClientProxyMethod(proxy, method, args);
+            return invokeRestClientProxyMethod(method);
         }
         // Autocloseable/Closeable
         if (method.getName().equals("close") && (args == null || args.length == 0)) {
             close();
             return null;
         }
-        if (closed.get()) {
+        // Check if this proxy is closed or the client itself is closed. The client may be closed if this proxy was a
+        // sub-resource and the resource client itself was closed.
+        if (closed.get() || client.isClosed()) {
+            closed.set(true);
             throw new IllegalStateException("RestClientProxy is closed");
         }
 
@@ -162,7 +173,30 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
             return new QuarkusInvocationContextImpl(target, method, args, chain, interceptorBindingsMap.get(method)).proceed();
         } else {
             try {
-                return method.invoke(target, args);
+                final Object result = method.invoke(target, args);
+                final Class<?> returnType = method.getReturnType();
+                // Check if this is a sub-resource. A sub-resource must be an interface.
+                if (returnType.isInterface()) {
+                    final Annotation[] annotations = method.getDeclaredAnnotations();
+                    boolean hasPath = false;
+                    boolean hasHttpMethod = false;
+                    // Check the annotations. If the method has one of the @HttpMethod annotations, we will just use the
+                    // current method. If it only has a @Path, then we need to create a proxy for the return type.
+                    for (Annotation annotation : annotations) {
+                        final Class<?> type = annotation.annotationType();
+                        if (type.equals(Path.class)) {
+                            hasPath = true;
+                        } else if (type.getDeclaredAnnotation(HttpMethod.class) != null) {
+                            hasHttpMethod = true;
+                        }
+                    }
+                    if (!hasHttpMethod && hasPath) {
+                        // Create a proxy of the return type re-using the providers and client, but do not add the required
+                        // interfaces for the sub-resource.
+                        return createProxy(returnType, result, false, providerInstances, client, getBeanManager());
+                    }
+                }
+                return result;
             } catch (InvocationTargetException e) {
                 Throwable cause = e.getCause();
                 if (cause instanceof CompletionException) {
@@ -193,7 +227,56 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
         }
     }
 
-    private Object invokeRestClientProxyMethod(Object proxy, Method method, Object[] args) {
+    /**
+     * Creates a proxy for the interface. The proxy will implement the interfaces {@link RestClientProxy} and
+     * {@link Closeable}.
+     *
+     * @param resourceInterface the resource interface to create the proxy for
+     * @param target the target object for the proxy
+     * @param providers the providers for the client
+     * @param client the client to use
+     * @param beanManager the bean manager used to register {@linkplain ClientHeaderProviders client header providers}
+     * @return the new proxy
+     */
+    static Object createProxy(final Class<?> resourceInterface, final Object target, final Set<Object> providers,
+            final ResteasyClient client, final BeanManager beanManager) {
+        return createProxy(resourceInterface, target, true, providers, client, beanManager);
+    }
+
+    /**
+     * Creates a proxy for the interface.
+     * <p>
+     * If {@code addExtendedInterfaces} is set to {@code true}, the proxy will implement the interfaces
+     * {@link RestClientProxy} and {@link Closeable}.
+     * </p>
+     *
+     * @param resourceInterface the resource interface to create the proxy for
+     * @param target the target object for the proxy
+     * @param addExtendedInterfaces {@code true} if the proxy should also implement {@link RestClientProxy} and
+     *        {@link Closeable}
+     * @param providers the providers for the client
+     * @param client the client to use
+     * @param beanManager the bean manager used to register {@linkplain ClientHeaderProviders client header providers}
+     * @return the new proxy
+     */
+    static Object createProxy(final Class<?> resourceInterface, final Object target, final boolean addExtendedInterfaces,
+            final Set<Object> providers, final ResteasyClient client, final BeanManager beanManager) {
+        final Class<?>[] interfaces;
+        if (addExtendedInterfaces) {
+            interfaces = new Class<?>[3];
+            interfaces[1] = RestClientProxy.class;
+            interfaces[2] = Closeable.class;
+        } else {
+            interfaces = new Class[1];
+        }
+        interfaces[0] = resourceInterface;
+        final Object proxy = Proxy.newProxyInstance(getClassLoader(resourceInterface), interfaces,
+                new ProxyInvocationHandler(resourceInterface, target, Set.copyOf(providers), client));
+        ClientHeaderProviders.registerForClass(resourceInterface, proxy, beanManager);
+        return proxy;
+    }
+
+    private Object invokeRestClientProxyMethod(final Method method) {
         switch (method.getName()) {
             case "getClient":
                 return client;
@@ -299,4 +382,20 @@ private static Annotation[] merge(List<Annotation> methodLevelBindings, List<Ann
         return merged.toArray(new Annotation[] {});
     }
 
+    private static ClassLoader getClassLoader(final Class<?> type) {
+        if (System.getSecurityManager() == null) {
+            return type.getClassLoader();
+        }
+        return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) type::getClassLoader);
+    }
+
+    private static BeanManager getBeanManager() {
+        try {
+            CDI<Object> current = CDI.current();
+            return current != null ? current.getBeanManager() : null;
+        } catch (IllegalStateException e) {
+            LOGGER.debug("CDI container is not available", e);
+            return null;
+        }
+    }
 }
diff --git a/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java b/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java
index 7ecc462c52d120..ea7b36569c0cc1 100644
--- a/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java
+++ b/extensions/resteasy-classic/resteasy-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java
@@ -4,14 +4,12 @@
 import static org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder.PROPERTY_PROXY_PORT;
 import static org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder.PROPERTY_PROXY_SCHEME;
 
-import java.io.Closeable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.lang.reflect.Proxy;
 import java.net.InetSocketAddress;
 import java.net.ProxySelector;
 import java.net.URI;
@@ -72,10 +70,8 @@
 import org.jboss.resteasy.microprofile.client.ExceptionMapping;
 import org.jboss.resteasy.microprofile.client.MethodInjectionFilter;
 import org.jboss.resteasy.microprofile.client.RestClientListeners;
-import org.jboss.resteasy.microprofile.client.RestClientProxy;
 import org.jboss.resteasy.microprofile.client.async.AsyncInterceptorRxInvokerProvider;
 import org.jboss.resteasy.microprofile.client.async.AsyncInvocationInterceptorThreadContext;
-import org.jboss.resteasy.microprofile.client.header.ClientHeaderProviders;
 import org.jboss.resteasy.microprofile.client.header.ClientHeadersRequestFilter;
 import org.jboss.resteasy.microprofile.client.impl.MpClient;
 import org.jboss.resteasy.microprofile.client.impl.MpClientBuilderImpl;
@@ -353,16 +349,10 @@ public <T> T build(Class<T> aClass, ClientHttpEngine httpEngine)
                 .defaultConsumes(MediaType.APPLICATION_JSON)
                 .defaultProduces(MediaType.APPLICATION_JSON).build();
 
-        Class<?>[] interfaces = new Class<?>[3];
-        interfaces[0] = aClass;
-        interfaces[1] = RestClientProxy.class;
-        interfaces[2] = Closeable.class;
-
         final BeanManager beanManager = getBeanManager();
-        T proxy = (T) Proxy.newProxyInstance(classLoader, interfaces,
-                new QuarkusProxyInvocationHandler(aClass, actualClient, getLocalProviderInstances(), client, beanManager));
-        ClientHeaderProviders.registerForClass(aClass, proxy, beanManager);
-        return proxy;
+        return aClass.cast(
+                QuarkusProxyInvocationHandler.createProxy(aClass, actualClient, getLocalProviderInstances(), client,
+                        beanManager));
     }
 
     private void configureTrustAll(ResteasyClientBuilder clientBuilder) {
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/JacksonSerializerFactory.java b/extensions/resteasy-reactive/rest-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/JacksonSerializerFactory.java
index 7ebd7ae9b40a44..691d102c35ddfe 100644
--- a/extensions/resteasy-reactive/rest-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/JacksonSerializerFactory.java
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/JacksonSerializerFactory.java
@@ -318,7 +318,7 @@ private void writeField(ClassInfo classInfo, FieldSpecs fieldSpecs, BytecodeCrea
 
         if (primitiveMethodName != null) {
             MethodDescriptor primitiveWriter = MethodDescriptor.ofMethod(JSON_GEN_CLASS_NAME, primitiveMethodName, "void",
-                    typeName);
+                    fieldSpecs.writtenType());
             bytecode.invokeVirtualMethod(primitiveWriter, jsonGenerator, arg);
             return;
         }
@@ -372,7 +372,7 @@ private void registerTypeToBeGenerated(String typeName) {
 
     private String writeMethodForPrimitiveFields(String typeName) {
         return switch (typeName) {
-            case "java.lang.String" -> "writeString";
+            case "java.lang.String", "char", "java.lang.Character" -> "writeString";
             case "short", "java.lang.Short", "int", "java.lang.Integer", "long", "java.lang.Long", "float",
                     "java.lang.Float", "double", "java.lang.Double" ->
                 "writeNumber";
@@ -590,8 +590,37 @@ boolean hasUnknownAnnotation() {
         }
 
         ResultHandle toValueReaderHandle(BytecodeCreator bytecode, ResultHandle valueHandle) {
-            return methodInfo != null ? bytecode.invokeVirtualMethod(MethodDescriptor.of(methodInfo), valueHandle)
-                    : bytecode.readInstanceField(FieldDescriptor.of(fieldInfo), valueHandle);
+            ResultHandle handle = accessorHandle(bytecode, valueHandle);
+
+            handle = switch (fieldType.name().toString()) {
+                case "char", "java.lang.Character" -> bytecode.invokeStaticMethod(
+                        MethodDescriptor.ofMethod(Character.class, "toString", String.class, char.class), handle);
+                default -> handle;
+            };
+
+            return handle;
+        }
+
+        private ResultHandle accessorHandle(BytecodeCreator bytecode, ResultHandle valueHandle) {
+            if (methodInfo != null) {
+                if (methodInfo.declaringClass().isInterface()) {
+                    return bytecode.invokeInterfaceMethod(MethodDescriptor.of(methodInfo), valueHandle);
+                }
+                return bytecode.invokeVirtualMethod(MethodDescriptor.of(methodInfo), valueHandle);
+            }
+            return bytecode.readInstanceField(FieldDescriptor.of(fieldInfo), valueHandle);
+        }
+
+        String writtenType() {
+            return switch (fieldType.name().toString()) {
+                case "char", "java.lang.Character" -> "java.lang.String";
+                case "java.lang.Integer" -> "int";
+                case "java.lang.Short" -> "short";
+                case "java.lang.Long" -> "long";
+                case "java.lang.Double" -> "double";
+                case "java.lang.Float" -> "float";
+                default -> fieldType.name().toString();
+            };
         }
 
         private String[] rolesAllowed() {
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Cat.java b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Cat.java
index e2aa7a01955cc3..ab57f3ea4d3c44 100644
--- a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Cat.java
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Cat.java
@@ -14,4 +14,8 @@ public int getPrivateAge() {
     public void setPrivateAge(int privateAge) {
         this.privateAge = privateAge;
     }
+
+    public char getInitial() {
+        return getPublicName().charAt(0);
+    }
 }
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContainerDTO.java b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContainerDTO.java
new file mode 100644
index 00000000000000..7638012b16f012
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContainerDTO.java
@@ -0,0 +1,4 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+public record ContainerDTO(NestedInterface nestedInterface) {
+}
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NestedInterface.java b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NestedInterface.java
new file mode 100644
index 00000000000000..aae283c86bafe2
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NestedInterface.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+public interface NestedInterface {
+
+    NestedInterface INSTANCE = new NestedInterface() {
+        @Override
+        public String getString() {
+            return "response";
+        }
+
+        @Override
+        public Integer getInt() {
+            return 42;
+        }
+
+        @Override
+        public char getCharacter() {
+            return 'a';
+        }
+    };
+
+    String getString();
+
+    Integer getInt();
+
+    char getCharacter();
+
+}
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java
index a7da6fb8286264..6a485841647601 100644
--- a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java
@@ -442,6 +442,12 @@ public String genericInputTest(DataItem<Item> item) {
         return item.getContent().getName();
     }
 
+    @GET
+    @Path("/interface")
+    public ContainerDTO interfaceTest() {
+        return new ContainerDTO(NestedInterface.INSTANCE);
+    }
+
     public static class UnquotedFieldsPersonSerialization implements BiFunction<ObjectMapper, Type, ObjectWriter> {
 
         public static final AtomicInteger count = new AtomicInteger();
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonTest.java b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonTest.java
index 0c9cdff2a766d5..3db48396587fa4 100644
--- a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonTest.java
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonTest.java
@@ -34,7 +34,8 @@ public JavaArchive get() {
                                     NoopReaderInterceptor.class, TestIdentityProvider.class, TestIdentityController.class,
                                     AbstractPet.class, Dog.class, Cat.class, Veterinarian.class, AbstractNamedPet.class,
                                     AbstractUnsecuredPet.class, UnsecuredPet.class, SecuredPersonInterface.class, Frog.class,
-                                    Pond.class, FrogBodyParts.class, FrogBodyParts.BodyPart.class)
+                                    Pond.class, FrogBodyParts.class, FrogBodyParts.BodyPart.class, ContainerDTO.class,
+                                    NestedInterface.class)
                             .addAsResource(new StringAsset("admin-expression=admin\n" +
                                     "user-expression=user\n" +
                                     "birth-date-roles=alice,bob\n"), "application.properties");
@@ -506,6 +507,18 @@ public void testGenericInput() {
                 .body(is("foo"));
     }
 
+    @Test
+    public void testInterface() {
+        RestAssured
+                .with()
+                .get("/simple/interface")
+                .then()
+                .statusCode(200)
+                .body("nestedInterface.int", Matchers.is(42))
+                .body("nestedInterface.character", Matchers.is("a"))
+                .body("nestedInterface.string", Matchers.is("response"));
+    }
+
     @Test
     public void testSecureFieldOnAbstractClass() {
         // implementor with / without @SecureField returned
@@ -602,6 +615,7 @@ private static void testSecuredFieldOnAbstractClass(String catPath, String dogPa
                 .then()
                 .statusCode(200)
                 .body("publicName", Matchers.is("Garfield"))
+                .body("initial", Matchers.is("G"))
                 .body("privateName", Matchers.nullValue())
                 .body("veterinarian.name", Matchers.is("Dolittle"))
                 .body("veterinarian.title", Matchers.nullValue())
@@ -625,6 +639,7 @@ private static void testSecuredFieldOnAbstractClass(String catPath, String dogPa
                 .then()
                 .statusCode(200)
                 .body("publicName", Matchers.is("Garfield"))
+                .body("initial", Matchers.is("G"))
                 .body("privateName", Matchers.is("Monday"))
                 .body("privateAge", Matchers.is(4))
                 .body("veterinarian.name", Matchers.is("Dolittle"))
diff --git a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonWithReflectionFreeSerializersTest.java b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonWithReflectionFreeSerializersTest.java
index 24fa1af4fb106a..0254e48598fe8b 100644
--- a/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonWithReflectionFreeSerializersTest.java
+++ b/extensions/resteasy-reactive/rest-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonWithReflectionFreeSerializersTest.java
@@ -24,7 +24,8 @@ public JavaArchive get() {
                                     NoopReaderInterceptor.class, TestIdentityProvider.class, TestIdentityController.class,
                                     AbstractPet.class, Dog.class, Cat.class, Veterinarian.class, AbstractNamedPet.class,
                                     AbstractUnsecuredPet.class, UnsecuredPet.class, SecuredPersonInterface.class, Frog.class,
-                                    Pond.class, FrogBodyParts.class, FrogBodyParts.BodyPart.class)
+                                    Pond.class, FrogBodyParts.class, FrogBodyParts.BodyPart.class, ContainerDTO.class,
+                                    NestedInterface.class)
                             .addAsResource(new StringAsset("admin-expression=admin\n" +
                                     "user-expression=user\n" +
                                     "birth-date-roles=alice,bob\n" +
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java
index b09a57db097b5f..68078f8b88191f 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java
@@ -50,11 +50,13 @@ public String getRootPath() {
      * <ul>
      * <li>{@code resolvePath("foo")} will return {@literal /foo}</li>
      * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * <li>{@code resolvePath("/")} will return {@literal /}</li>
      * </ul>
      * Given {@literal quarkus.http.root-path=/app}
      * <ul>
      * <li>{@code resolvePath("foo")} will return {@literal /app/foo}</li>
      * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * <li>{@code resolvePath("/")} will return {@literal /}</li>
      * </ul>
      * <p>
      * The returned path will not end with a slash.
@@ -64,7 +66,8 @@ public String getRootPath() {
      * @see UriNormalizationUtil#normalizeWithBase(URI, String, boolean)
      */
     public String resolvePath(String path) {
-        return UriNormalizationUtil.normalizeWithBase(rootPath, path, false).getPath();
+        var isSlashAbsolutePath = "/".equals(path);
+        return UriNormalizationUtil.normalizeWithBase(rootPath, path, isSlashAbsolutePath).getPath();
     }
 
     /**
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItemTest.java
index 1e98718b35c87a..9a7f4120556eff 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItemTest.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItemTest.java
@@ -9,6 +9,7 @@ void testResolvePathWithSlash() {
         HttpRootPathBuildItem buildItem = new HttpRootPathBuildItem("/");
 
         Assertions.assertEquals("/", buildItem.resolvePath(""));
+        Assertions.assertEquals("/", buildItem.resolvePath("/"));
         Assertions.assertEquals("/foo", buildItem.resolvePath("foo"));
         Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
         Assertions.assertThrows(IllegalArgumentException.class, () -> buildItem.resolvePath("../foo"));
@@ -19,6 +20,7 @@ void testResolvePathWithSlashApp() {
         HttpRootPathBuildItem buildItem = new HttpRootPathBuildItem("/app");
 
         Assertions.assertEquals("/app", buildItem.resolvePath(""));
+        Assertions.assertEquals("/", buildItem.resolvePath("/"));
         Assertions.assertEquals("/app/foo", buildItem.resolvePath("foo"));
         Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
     }
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index 810a5fb80b3b94..9e10e40b5f590e 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -56,7 +56,7 @@
         <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
         <commons-codec.version>1.17.1</commons-codec.version>
         <commons-io.version>2.16.1</commons-io.version>
-        <commons-lang.version>3.16.0</commons-lang.version>
+        <commons-lang.version>3.17.0</commons-lang.version>
         <guava.version>33.3.0-jre</guava.version>
         <guava.failureaccess.version>1.0.1</guava.failureaccess.version><!-- keep in sync with guava.version -->
         <j2objc.annotations.version>2.8</j2objc.annotations.version><!-- keep in sync with guava.version -->
@@ -70,7 +70,7 @@
         <plexus-interpolation.version>1.26</plexus-interpolation.version>
         <plexus-sec-dispatcher.version>2.0</plexus-sec-dispatcher.version>
         <plexus-utils.version>3.5.1</plexus-utils.version>
-        <smallrye-common.version>2.5.0</smallrye-common.version>
+        <smallrye-common.version>2.6.0</smallrye-common.version>
         <smallrye-beanbag.version>1.5.2</smallrye-beanbag.version>
         <gradle-tooling.version>8.9</gradle-tooling.version>
         <quarkus-fs-util.version>0.0.10</quarkus-fs-util.version>
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 36c412d48459c1..f953417f1f0b8c 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -57,7 +57,7 @@
         <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
 
         <mutiny.version>2.6.2</mutiny.version>
-        <smallrye-common.version>2.5.0</smallrye-common.version>
+        <smallrye-common.version>2.6.0</smallrye-common.version>
         <vertx.version>4.5.9</vertx.version>
         <rest-assured.version>5.5.0</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
diff --git a/integration-tests/oidc-code-flow/src/main/resources/application.properties b/integration-tests/oidc-code-flow/src/main/resources/application.properties
index 41372ae76857a7..273e767de65836 100644
--- a/integration-tests/oidc-code-flow/src/main/resources/application.properties
+++ b/integration-tests/oidc-code-flow/src/main/resources/application.properties
@@ -173,7 +173,7 @@ quarkus.oidc.tenant-split-tokens.token-state-manager.encryption-secret=eUk1p7UB3
 quarkus.oidc.tenant-split-tokens.application-type=web-app
 quarkus.oidc.tenant-split-tokens.authentication.cookie-same-site=strict
 
-quarkus.http.auth.permission.roles1.paths=/index.html
+quarkus.http.auth.permission.roles1.paths=/index.html,/index.html;/checktterer
 quarkus.http.auth.permission.roles1.policy=authenticated
 
 quarkus.http.auth.permission.logout.paths=/tenant-logout
diff --git a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java
index 9629c61ce5dab8..a2f28e11d8593c 100644
--- a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java
+++ b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java
@@ -1081,6 +1081,29 @@ public void testAccessTokenInjection() throws IOException {
         }
     }
 
+    @Test
+    public void testInvalidPath() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/index.html;/checktterer");
+            assertEquals("/index.html;/checktterer", getStateCookieSavedPath(webClient, null));
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+
+            HtmlForm loginForm = page.getForms().get(0);
+
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            try {
+                page = loginForm.getInputByName("login").click();
+            } catch (FailingHttpStatusCodeException ex) {
+                assertEquals(404, ex.getStatusCode());
+            }
+
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
     @Test
     public void testAccessAndRefreshTokenInjection() throws IOException {
         try (final WebClient webClient = createWebClient()) {
@@ -1386,8 +1409,8 @@ public void testAccessAndRefreshTokenInjectionWithoutIndexHtmlAndListenerMultiTa
     @Test
     public void testAccessAndRefreshTokenInjectionWithQuery() throws Exception {
         try (final WebClient webClient = createWebClient()) {
-            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/refresh-query?a=aValue");
-            assertEquals("/web-app/refresh-query?a=aValue", getStateCookieSavedPath(webClient, null));
+            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/refresh-query?a=aValue%");
+            assertEquals("/web-app/refresh-query?a=aValue%25", getStateCookieSavedPath(webClient, null));
 
             assertEquals("Sign in to quarkus", page.getTitleText());
 
@@ -1398,7 +1421,8 @@ public void testAccessAndRefreshTokenInjectionWithQuery() throws Exception {
 
             page = loginForm.getInputByName("login").click();
 
-            assertEquals("RT injected:aValue", page.getBody().asNormalizedText());
+            // Query parameters are decoded by the time they reach the JAX-RS endpoint
+            assertEquals("RT injected:aValue%", page.getBody().asNormalizedText());
             webClient.getCookieManager().clearCookies();
         }
     }
@@ -1561,12 +1585,17 @@ private String getStateCookieStateParam(Cookie stateCookie) {
 
     private String getStateCookieSavedPath(WebClient webClient, String tenantId) {
         String[] parts = getStateCookie(webClient, tenantId).getValue().split("\\|");
-        return parts.length == 2 ? parts[1] : null;
+        return parts.length == 2 ? getSavedPathFromJson(parts[1]) : null;
     }
 
     private String getStateCookieSavedPath(Cookie stateCookie) {
         String[] parts = stateCookie.getValue().split("\\|");
-        return parts.length == 2 ? parts[1] : null;
+        return parts.length == 2 ? getSavedPathFromJson(parts[1]) : null;
+    }
+
+    private String getSavedPathFromJson(String value) {
+        JsonObject json = new JsonObject(OidcUtils.base64UrlDecode(value));
+        return json.getString(OidcUtils.STATE_COOKIE_RESTORE_PATH);
     }
 
     private Cookie getSessionCookie(WebClient webClient, String tenantId) {
diff --git a/integration-tests/reactive-messaging-rabbitmq-dyn/src/test/java/io/quarkus/it/rabbitmq/RabbitMQConnectorDynCredsTest.java b/integration-tests/reactive-messaging-rabbitmq-dyn/src/test/java/io/quarkus/it/rabbitmq/RabbitMQConnectorDynCredsTest.java
index eab9ad69c8765b..c05c6304c1242d 100644
--- a/integration-tests/reactive-messaging-rabbitmq-dyn/src/test/java/io/quarkus/it/rabbitmq/RabbitMQConnectorDynCredsTest.java
+++ b/integration-tests/reactive-messaging-rabbitmq-dyn/src/test/java/io/quarkus/it/rabbitmq/RabbitMQConnectorDynCredsTest.java
@@ -31,7 +31,7 @@ public static class RabbitMQResource implements QuarkusTestResourceLifecycleMana
         @Override
         public Map<String, String> start() {
             String username = "tester";
-            String password = RandomStringUtils.random(10);
+            String password = RandomStringUtils.insecure().next(10);
 
             rabbit = new RabbitMQContainer(DockerImageName.parse("rabbitmq:3.12-management"))
                     .withNetwork(Network.SHARED)
diff --git a/pom.xml b/pom.xml
index 45f8b17982219e..1bdde83985a03e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <hibernate-commons-annotations.version>7.0.1.Final</hibernate-commons-annotations.version> <!-- version controlled by Hibernate ORM's needs -->
         <hibernate-reactive.version>2.4.0.Final</hibernate-reactive.version> <!-- highly sensitive to Hibernate ORM upgrades -->
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
-        <hibernate-search.version>7.2.0.Final</hibernate-search.version>
+        <hibernate-search.version>7.2.1.Final</hibernate-search.version>
 
         <!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
         <grpc.version>1.65.1</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
@@ -183,7 +183,7 @@
             <extension>
                 <groupId>io.quarkus.bot</groupId>
                 <artifactId>build-reporter-maven-extension</artifactId>
-                <version>3.9.1</version>
+                <version>3.9.2</version>
             </extension>
         </extensions>
     </build>
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java
index 533048d7959349..50295407fa505c 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java
@@ -50,7 +50,7 @@ public class DefaultDockerContainerLauncher implements DockerContainerArtifactLa
     private Map<String, String> labels;
     private final Map<String, String> systemProps = new HashMap<>();
     private boolean isSsl;
-    private final String containerName = "quarkus-integration-test-" + RandomStringUtils.random(5, true, false);
+    private final String containerName = "quarkus-integration-test-" + RandomStringUtils.insecure().next(5, true, false);
     private String containerRuntimeBinaryName;
     private final ExecutorService executorService = Executors.newSingleThreadExecutor();
     private Optional<String> entryPoint;
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
index a29edfc4a04883..b44f78c962cf55 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
@@ -319,7 +319,7 @@ public void accept(String s, String s2) {
                 if (networkIdOpt.isPresent()) {
                     networkId = networkIdOpt.get();
                 } else {
-                    networkId = "quarkus-integration-test-" + RandomStringUtils.random(5, true, false);
+                    networkId = "quarkus-integration-test-" + RandomStringUtils.insecure().next(5, true, false);
                     manageNetwork = true;
                 }
             }