Merge pull request quarkusio#38109 from gsmet/3.6.5-backports-1

3.6.5 backports 1

bom/application/pom.xml

@@ -17,7 +17,7 @@
         <angus-activation.version>2.0.1</angus-activation.version>
         <bouncycastle.version>1.77</bouncycastle.version>
         <bouncycastle.fips.version>1.0.2.4</bouncycastle.fips.version>
-        <bouncycastle.tls.fips.version>1.0.17</bouncycastle.tls.fips.version>
+        <bouncycastle.tls.fips.version>1.0.18</bouncycastle.tls.fips.version>
         <expressly.version>5.0.0</expressly.version>
         <findbugs.version>3.0.2</findbugs.version>
         <jandex.version>3.1.6</jandex.version>
@@ -157,14 +157,14 @@
         <aws-xray.version>2.14.0</aws-xray.version>
         <azure-functions-java-library.version>2.2.0</azure-functions-java-library.version>
         <azure-functions-java-spi.version>1.0.0</azure-functions-java-spi.version>
-        <kotlin.version>1.9.21</kotlin.version>
+        <kotlin.version>1.9.22</kotlin.version>
         <kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
         <azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
         <kotlin-serialization.version>1.6.2</kotlin-serialization.version>
         <dekorate.version>4.0.3</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.2.0</awaitility.version>
-        <jboss-logmanager.version>3.0.2.Final</jboss-logmanager.version>
+        <jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
         <flyway.version>9.22.3</flyway.version>
         <yasson.version>3.0.3</yasson.version>
         <!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->

build-parent/pom.xml

@@ -20,7 +20,7 @@
 
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
-        <kotlin.version>1.9.21</kotlin.version>
+        <kotlin.version>1.9.22</kotlin.version>
         <dokka.version>1.9.10</dokka.version>
         <scala.version>2.13.8</scala.version>
         <scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>

core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java

@@ -619,10 +619,23 @@ private static BiFunction<MethodCreator, FieldDescriptor, BranchResult> generate
     }
 
     private static ResultHandle getLogManagerLevelIntValue(String levelName, BytecodeCreator method) {
-        final ResultHandle infoLevel = method.readStaticField(
-                FieldDescriptor.of(org.jboss.logmanager.Level.class, levelName, org.jboss.logmanager.Level.class));
+        FieldDescriptor fd;
+        switch (levelName) {
+            case "FATAL":
+            case "ERROR":
+            case "WARN":
+            case "INFO":
+            case "DEBUG":
+            case "TRACE":
+                fd = FieldDescriptor.of(org.jboss.logmanager.Level.class, levelName, org.jboss.logmanager.Level.class);
+                break;
+            default:
+                fd = FieldDescriptor.of(Level.class, levelName, Level.class);
+                break;
+        }
+        final ResultHandle levelVal = method.readStaticField(fd);
         return method
-                .invokeVirtualMethod(MethodDescriptor.ofMethod(Level.class, "intValue", int.class), infoLevel);
+                .invokeVirtualMethod(MethodDescriptor.ofMethod(Level.class, "intValue", int.class), levelVal);
     }
 
     private static void generateDefaultLoggingLogger(Level minLevel, ClassOutput output) {

core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java

@@ -1,5 +1,7 @@
 package io.quarkus.deployment.steps;
 
+import static io.quarkus.deployment.steps.KotlinUtil.isKotlinClass;
+
 import java.lang.reflect.Modifier;
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -27,6 +29,8 @@
 import org.jboss.jandex.VoidType;
 import org.jboss.logging.Logger;
 
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -51,7 +55,7 @@ public ReflectiveHierarchyIgnoreWarningBuildItem ignoreJavaClassWarnings() {
     }
 
     @BuildStep
-    public void build(CombinedIndexBuildItem combinedIndexBuildItem,
+    public void build(CombinedIndexBuildItem combinedIndexBuildItem, Capabilities capabilities,
             List<ReflectiveHierarchyBuildItem> hierarchy,
             List<ReflectiveHierarchyIgnoreWarningBuildItem> ignored,
             List<ReflectiveClassFinalFieldsWritablePredicateBuildItem> finalFieldsWritablePredicates,
@@ -73,7 +77,7 @@ public void build(CombinedIndexBuildItem combinedIndexBuildItem,
         final Deque<ReflectiveHierarchyVisitor> visits = new ArrayDeque<>();
 
         for (ReflectiveHierarchyBuildItem i : hierarchy) {
-            addReflectiveHierarchy(combinedIndexBuildItem,
+            addReflectiveHierarchy(combinedIndexBuildItem, capabilities,
                     i,
                     i.hasSource() ? i.getSource() : i.getType().name().toString(),
                     i.getType(),
@@ -128,7 +132,7 @@ private void removeIgnored(Map<DotName, Set<String>> unindexedClasses,
     }
 
     private void addReflectiveHierarchy(CombinedIndexBuildItem combinedIndexBuildItem,
-            ReflectiveHierarchyBuildItem reflectiveHierarchyBuildItem, String source, Type type,
+            Capabilities capabilities, ReflectiveHierarchyBuildItem reflectiveHierarchyBuildItem, String source, Type type,
             Set<DotName> processedReflectiveHierarchies, Map<DotName, Set<String>> unindexedClasses,
             Predicate<ClassInfo> finalFieldsWritable, BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             Deque<ReflectiveHierarchyVisitor> visits) {
@@ -142,45 +146,50 @@ private void addReflectiveHierarchy(CombinedIndexBuildItem combinedIndexBuildIte
                 return;
             }
 
-            addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, type.name(), type.name(),
+            addClassTypeHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source, type.name(),
+                    type.name(),
                     processedReflectiveHierarchies, unindexedClasses,
                     finalFieldsWritable, reflectiveClass, visits);
 
             for (ClassInfo subclass : combinedIndexBuildItem.getIndex().getAllKnownSubclasses(type.name())) {
-                addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, subclass.name(),
+                addClassTypeHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source,
+                        subclass.name(),
                         subclass.name(),
                         processedReflectiveHierarchies,
                         unindexedClasses, finalFieldsWritable, reflectiveClass, visits);
             }
             for (ClassInfo subclass : combinedIndexBuildItem.getIndex().getAllKnownImplementors(type.name())) {
-                addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, subclass.name(),
+                addClassTypeHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source,
+                        subclass.name(),
                         subclass.name(),
                         processedReflectiveHierarchies,
                         unindexedClasses, finalFieldsWritable, reflectiveClass, visits);
             }
         } else if (type instanceof ArrayType) {
-            visits.addLast(() -> addReflectiveHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source,
+            visits.addLast(() -> addReflectiveHierarchy(combinedIndexBuildItem, capabilities,
+                    reflectiveHierarchyBuildItem, source,
                     type.asArrayType().constituent(),
                     processedReflectiveHierarchies,
                     unindexedClasses, finalFieldsWritable, reflectiveClass, visits));
         } else if (type instanceof ParameterizedType) {
             if (!reflectiveHierarchyBuildItem.getIgnoreTypePredicate().test(type.name())) {
-                addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, type.name(),
+                addClassTypeHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source, type.name(),
                         type.name(),
                         processedReflectiveHierarchies,
                         unindexedClasses, finalFieldsWritable, reflectiveClass, visits);
             }
             final ParameterizedType parameterizedType = (ParameterizedType) type;
             for (Type typeArgument : parameterizedType.arguments()) {
                 visits.addLast(
-                        () -> addReflectiveHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, typeArgument,
+                        () -> addReflectiveHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source,
+                                typeArgument,
                                 processedReflectiveHierarchies,
                                 unindexedClasses, finalFieldsWritable, reflectiveClass, visits));
             }
         }
     }
 
-    private void addClassTypeHierarchy(CombinedIndexBuildItem combinedIndexBuildItem,
+    private void addClassTypeHierarchy(CombinedIndexBuildItem combinedIndexBuildItem, Capabilities capabilities,
             ReflectiveHierarchyBuildItem reflectiveHierarchyBuildItem,
             String source,
             DotName name,
@@ -223,7 +232,7 @@ private void addClassTypeHierarchy(CombinedIndexBuildItem combinedIndexBuildItem
             return;
         }
 
-        visits.addLast(() -> addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source,
+        visits.addLast(() -> addClassTypeHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source,
                 info.superName(), initialName,
                 processedReflectiveHierarchies,
                 unindexedClasses, finalFieldsWritable, reflectiveClass, visits));
@@ -237,7 +246,8 @@ private void addClassTypeHierarchy(CombinedIndexBuildItem combinedIndexBuildItem
             }
             final Type fieldType = getFieldType(combinedIndexBuildItem, initialName, info, field);
             visits.addLast(
-                    () -> addReflectiveHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, fieldType,
+                    () -> addReflectiveHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source,
+                            fieldType,
                             processedReflectiveHierarchies,
                             unindexedClasses, finalFieldsWritable, reflectiveClass, visits));
         }
@@ -249,11 +259,30 @@ private void addClassTypeHierarchy(CombinedIndexBuildItem combinedIndexBuildItem
                     method.returnType().kind() == Kind.VOID) {
                 continue;
             }
-            visits.addLast(() -> addReflectiveHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source,
+            visits.addLast(() -> addReflectiveHierarchy(combinedIndexBuildItem, capabilities,
+                    reflectiveHierarchyBuildItem, source,
                     method.returnType(),
                     processedReflectiveHierarchies,
                     unindexedClasses, finalFieldsWritable, reflectiveClass, visits));
         }
+
+        // for Kotlin classes, we need to register the nested classes as well because companion classes are very often necessary at runtime
+        if (capabilities.isPresent(Capability.KOTLIN) && isKotlinClass(info)) {
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            try {
+                Class<?>[] declaredClasses = classLoader.loadClass(info.name().toString()).getDeclaredClasses();
+                for (Class<?> clazz : declaredClasses) {
+                    DotName dotName = DotName.createSimple(clazz.getName());
+                    addClassTypeHierarchy(combinedIndexBuildItem, capabilities, reflectiveHierarchyBuildItem, source,
+                            dotName, dotName,
+                            processedReflectiveHierarchies, unindexedClasses,
+                            finalFieldsWritable, reflectiveClass, visits);
+                }
+            } catch (ClassNotFoundException e) {
+                log.warnf(e, "Failed to load Class %s", info.name().toString());
+            }
+
+        }
     }
 
     private static Type getFieldType(CombinedIndexBuildItem combinedIndexBuildItem, DotName initialName, ClassInfo info,

core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigDiagnostic.java

@@ -6,6 +6,7 @@
 import java.net.URI;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
+import java.nio.file.NotDirectoryException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
@@ -186,6 +187,9 @@ public static Set<String> configFiles(Path configFilesLocation) throws IOExcepti
             for (Path candidate : candidates) {
                 configFiles.add(candidate.toUri().toURL().toString());
             }
+        } catch (NotDirectoryException ignored) {
+            log.debugf("File %s is not a directory", configFilesLocation.toAbsolutePath());
+            return Collections.emptySet();
         }
         return configFiles;
     }

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java

@@ -28,6 +28,7 @@
 import io.quarkus.gradle.QuarkusPlugin;
 import io.quarkus.gradle.tasks.worker.BuildWorker;
 import io.quarkus.maven.dependency.GACTV;
+import io.smallrye.config.Expressions;
 
 /**
  * Base class for the {@link QuarkusBuildDependencies}, {@link QuarkusBuildCacheableAppParts}, {@link QuarkusBuild} tasks
@@ -207,12 +208,14 @@ void generateBuild() {
 
         ApplicationModel appModel = resolveAppModelForBuild();
         Map<String, String> configMap = new HashMap<>();
-        for (Map.Entry<String, String> entry : extension().buildEffectiveConfiguration(appModel.getAppArtifact()).configMap()
-                .entrySet()) {
-            if (entry.getKey().startsWith("quarkus.")) {
-                configMap.put(entry.getKey(), entry.getValue());
+        EffectiveConfig effectiveConfig = extension().buildEffectiveConfiguration(appModel.getAppArtifact());
+        Expressions.withoutExpansion(() -> {
+            for (Map.Entry<String, String> entry : effectiveConfig.configMap().entrySet()) {
+                if (entry.getKey().startsWith("quarkus.")) {
+                    configMap.put(entry.getKey(), effectiveConfig.config().getRawValue(entry.getKey()));
+                }
             }
-        }
+        });
 
         getLogger().info("Starting Quarkus application build for package type {}", packageType);
 

devtools/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java

@@ -105,7 +105,7 @@ public void shouldReturnMultipleOutputSourceDirectories() {
 
     @Test
     public void shouldNotFailOnProjectDependenciesWithoutMain(@TempDir Path testProjectDir) throws IOException {
-        var kotlinVersion = System.getProperty("kotlin_version", "1.9.21");
+        var kotlinVersion = System.getProperty("kotlin_version", "1.9.22");
         var settingFile = testProjectDir.resolve("settings.gradle.kts");
         var mppProjectDir = testProjectDir.resolve("mpp");
         var quarkusProjectDir = testProjectDir.resolve("quarkus");

devtools/gradle/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 plugin-publish = "1.2.1"
 
 # updating Kotlin here makes QuarkusPluginTest > shouldNotFailOnProjectDependenciesWithoutMain(Path) fail
-kotlin = "1.9.21"
+kotlin = "1.9.22"
 smallrye-config = "3.4.4"
 
 junit5 = "5.10.1"

docs/src/main/asciidoc/cache.adoc

@@ -12,8 +12,6 @@ include::_attributes.adoc[]
 
 In this guide, you will learn how to enable application data caching in any CDI managed bean of your Quarkus application.
 
-include::{includes}/extension-status.adoc[]
-
 == Prerequisites
 
 include::{includes}/prerequisites.adoc[]

docs/src/main/asciidoc/getting-started-testing.adoc

@@ -1088,7 +1088,7 @@ or starting a mock HTTP server using https://wiremock.org/[Wiremock] (an example
 
 
 === Altering the test class
-When creating a custom `QuarkusTestResourceLifecycleManager` that needs to inject the something into the test class, the `inject` methods can be used.
+When creating a custom `QuarkusTestResourceLifecycleManager` that needs to inject something into the test class, the `inject` methods can be used.
 If for example you have a test like the following:
 
 [source,java]

docs/src/main/asciidoc/kafka-dev-services.adoc

@@ -82,7 +82,7 @@ For Strimzi, you can select any image with a Kafka version which has Kraft suppo
 
 [source, properties]
 ----
-quarkus.kafka.devservices.image-name=quay.io/strimzi-test-container/test-container:0.100.0-kafka-3.1.0
+quarkus.kafka.devservices.image-name=quay.io/strimzi-test-container/test-container:0.105.0-kafka-3.6.0
 ----
 
 == Configuring Kafka topics

docs/src/main/asciidoc/kafka-reactive-getting-started.adoc

@@ -407,7 +407,7 @@ version: '3.5'
 services:
 
   zookeeper:
-    image: quay.io/strimzi/kafka:0.23.0-kafka-2.8.0
+    image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
     command: [
       "sh", "-c",
       "bin/zookeeper-server-start.sh config/zookeeper.properties"
@@ -420,7 +420,7 @@ services:
       - kafka-quickstart-network
 
   kafka:
-    image: quay.io/strimzi/kafka:0.23.0-kafka-2.8.0
+    image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
     command: [
       "sh", "-c",
       "bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"

docs/src/main/asciidoc/kafka-schema-registry-avro.adoc

@@ -324,7 +324,7 @@ version: '2'
 services:
 
   zookeeper:
-    image: quay.io/strimzi/kafka:0.22.1-kafka-2.7.0
+    image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
     command: [
         "sh", "-c",
         "bin/zookeeper-server-start.sh config/zookeeper.properties"
@@ -335,7 +335,7 @@ services:
       LOG_DIR: /tmp/logs
 
   kafka:
-    image: quay.io/strimzi/kafka:0.22.1-kafka-2.7.0
+    image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
     command: [
         "sh", "-c",
         "bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"
@@ -545,7 +545,7 @@ If we couldn't use Dev Services and wanted to start a Kafka broker and Apicurio
 <dependency>
     <groupId>io.strimzi</groupId>
     <artifactId>strimzi-test-container</artifactId>
-    <version>0.22.1</version>
+    <version>0.105.0</version>
     <scope>test</scope>
     <exclusions>
         <exclusion>
@@ -559,7 +559,7 @@ If we couldn't use Dev Services and wanted to start a Kafka broker and Apicurio
 [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"]
 .build.gradle
 ----
-testImplementation("io.strimzi:strimzi-test-container:0.22.1") {
+testImplementation("io.strimzi:strimzi-test-container:0.105.0") {
     exclude group: "org.apache.logging.log4j", module: "log4j-core"
 }
 ----

docs/src/main/asciidoc/kafka-streams.adoc

@@ -499,7 +499,7 @@ version: '3.5'
 
 services:
   zookeeper:
-    image: strimzi/kafka:0.19.0-kafka-2.5.0
+    image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
     command: [
       "sh", "-c",
       "bin/zookeeper-server-start.sh config/zookeeper.properties"
@@ -511,7 +511,7 @@ services:
     networks:
       - kafkastreams-network
   kafka:
-    image: strimzi/kafka:0.19.0-kafka-2.5.0
+    image: quay.io/strimzi/kafka:0.39.0-kafka-3.6.1
     command: [
       "sh", "-c",
       "bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT} --override num.partitions=$${KAFKA_NUM_PARTITIONS}"

docs/src/main/asciidoc/kafka.adoc

@@ -2268,7 +2268,7 @@ The configuration of the created Kafka broker can be customized using `@Resource
 [source,java]
 ----
 @QuarkusTestResource(value = KafkaCompanionResource.class, initArgs = {
-        @ResourceArg(name = "strimzi.kafka.image", value = "quay.io/strimzi/kafka:0.28.0-kafka-3.0.0"), // Image name
+        @ResourceArg(name = "strimzi.kafka.image", value = "quay.io/strimzi-test-container/test-container:0.105.0-kafka-3.6.0"), // Image name
         @ResourceArg(name = "kafka.port", value = "9092"), // Fixed port for kafka, by default it will be exposed on a random port
         @ResourceArg(name = "kraft", value = "true"), // Enable Kraft mode
         @ResourceArg(name = "num.partitions", value = "3"), // Other custom broker configurations