Merge branch 'main' into patch-1

quarkusio · Sep 12, 2024 · 16f09c2 · 16f09c2
2 parents f1edf8a + 4636861
commit 16f09c2
Show file tree

Hide file tree

Showing 73 changed files with 1,812 additions and 932 deletions.
diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
@@ -435,6 +435,16 @@ jobs:
           path: |
             build-reports.zip
           retention-days: 7
+      - name: Upload test-produced debug dumps
+        uses: actions/upload-artifact@v4
+        # We need this as soon as there's a matching file
+        # -- even in case of success, as some flaky tests won't fail the build
+        if: always()
+        with:
+          name: "debug-${{ github.run_attempt }}-JVM Tests - JDK ${{matrix.java.name}}"
+          path: "**/target/debug/**"
+          if-no-files-found: ignore # If we're not currently debugging any test, it's fine.
+          retention-days: 28 # We don't get notified for flaky tests, so let's give maintainers time to get back to it
       - name: Upload build.log (if build failed)
         uses: actions/upload-artifact@v4
         if: ${{ failure() || cancelled() }}

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,7 +2,7 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>develocity-maven-extension</artifactId>
-        <version>1.22</version>
+        <version>1.22.1</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -211,7 +211,7 @@
         <jgit.version>6.10.0.202406032230-r</jgit.version>
         <!-- these two artifacts needs to be compatible together -->
         <strimzi-oauth.version>0.15.0</strimzi-oauth.version>
-        <strimzi-oauth.nimbus.version>9.40</strimzi-oauth.nimbus.version>
+        <strimzi-oauth.nimbus.version>9.41</strimzi-oauth.nimbus.version>
         <jose4j.version>0.9.6</jose4j.version>
         <java-buildpack-client.version>0.0.6</java-buildpack-client.version>
         <org-crac.version>0.1.3</org-crac.version>

diff --git a/bom/dev-ui/pom.xml b/bom/dev-ui/pom.xml
@@ -13,7 +13,7 @@
     <description>Dependency management for dev-ui. Importable by third party extension developers.</description>
 
     <properties>
-        <vaadin.version>24.4.7</vaadin.version>
+        <vaadin.version>24.4.8</vaadin.version>
         <lit.version>3.2.0</lit.version>
         <lit-element.version>4.1.0</lit-element.version>
         <lit-html.version>3.2.0</lit-html.version>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java b/core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java
@@ -32,7 +32,7 @@ public GeneratedClassGizmoAdaptor(BuildProducer<GeneratedClassBuildItem> generat
             Predicate<String> applicationClassPredicate) {
         this.generatedClasses = generatedClasses;
         this.applicationClassPredicate = applicationClassPredicate;
-        this.sources = BootstrapDebug.DEBUG_SOURCES_DIR != null ? new ConcurrentHashMap<>() : null;
+        this.sources = BootstrapDebug.debugSourcesDir() != null ? new ConcurrentHashMap<>() : null;
     }
 
     public GeneratedClassGizmoAdaptor(BuildProducer<GeneratedClassBuildItem> generatedClasses,
@@ -44,7 +44,7 @@ public boolean test(String s) {
                 return isApplicationClass(generatedToBaseNameFunction.apply(s));
             }
         };
-        this.sources = BootstrapDebug.DEBUG_SOURCES_DIR != null ? new ConcurrentHashMap<>() : null;
+        this.sources = BootstrapDebug.debugSourcesDir() != null ? new ConcurrentHashMap<>() : null;
     }
 
     @Override

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java
@@ -46,6 +46,7 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.TestTag;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -258,8 +259,9 @@ public void executionSkipped(TestIdentifier testIdentifier, String reason) {
                                 if (testClass != null) {
                                     Map<UniqueId, TestResult> results = resultsByClass.computeIfAbsent(testClass.getName(),
                                             s -> new HashMap<>());
-                                    TestResult result = new TestResult(displayName, testClass.getName(), id,
-                                            TestExecutionResult.aborted(null),
+                                    TestResult result = new TestResult(displayName, testClass.getName(),
+                                            toTagList(testIdentifier),
+                                            id, TestExecutionResult.aborted(null),
                                             logHandler.captureOutput(), testIdentifier.isTest(), runId, 0, true);
                                     results.put(id, result);
                                     if (result.isTest()) {
@@ -312,8 +314,9 @@ public void executionFinished(TestIdentifier testIdentifier,
                                 }
                                 Map<UniqueId, TestResult> results = resultsByClass.computeIfAbsent(testClassName,
                                         s -> new HashMap<>());
-                                TestResult result = new TestResult(displayName, testClassName, id,
-                                        testExecutionResult,
+                                TestResult result = new TestResult(displayName, testClassName,
+                                        toTagList(testIdentifier),
+                                        id, testExecutionResult,
                                         logHandler.captureOutput(), testIdentifier.isTest(), runId,
                                         System.currentTimeMillis() - startTimes.get(testIdentifier), true);
                                 if (!results.containsKey(id)) {
@@ -332,6 +335,7 @@ public void executionFinished(TestIdentifier testIdentifier,
                                         results.put(id,
                                                 new TestResult(currentNonDynamicTest.get().getDisplayName(),
                                                         result.getTestClass(),
+                                                        toTagList(testIdentifier),
                                                         currentNonDynamicTest.get().getUniqueIdObject(),
                                                         TestExecutionResult.failed(failure), List.of(), false, runId, 0,
                                                         false));
@@ -349,6 +353,7 @@ public void executionFinished(TestIdentifier testIdentifier,
                                     for (TestIdentifier child : children) {
                                         UniqueId childId = UniqueId.parse(child.getUniqueId());
                                         result = new TestResult(child.getDisplayName(), testClassName,
+                                                toTagList(testIdentifier),
                                                 childId,
                                                 testExecutionResult,
                                                 logHandler.captureOutput(), child.isTest(), runId,
@@ -419,6 +424,15 @@ public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry e
         }
     }
 
+    private static List<String> toTagList(TestIdentifier testIdentifier) {
+        return testIdentifier
+                .getTags()
+                .stream()
+                .map(TestTag::getName)
+                .sorted()
+                .toList();
+    }
+
     private Class<?> getTestClassFromSource(Optional<TestSource> optionalTestSource) {
         if (optionalTestSource.isPresent()) {
             var testSource = optionalTestSource.get();

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java
@@ -11,6 +11,7 @@ public class TestResult {
 
     final String displayName;
     final String testClass;
+    final List<String> tags;
     final UniqueId uniqueId;
     final TestExecutionResult testExecutionResult;
     final List<String> logOutput;
@@ -20,10 +21,12 @@ public class TestResult {
     final List<Throwable> problems;
     final boolean reportable;
 
-    public TestResult(String displayName, String testClass, UniqueId uniqueId, TestExecutionResult testExecutionResult,
+    public TestResult(String displayName, String testClass, List<String> tags, UniqueId uniqueId,
+            TestExecutionResult testExecutionResult,
             List<String> logOutput, boolean test, long runId, long time, boolean reportable) {
         this.displayName = displayName;
         this.testClass = testClass;
+        this.tags = tags;
         this.uniqueId = uniqueId;
         this.testExecutionResult = testExecutionResult;
         this.logOutput = logOutput;
@@ -58,6 +61,10 @@ public String getTestClass() {
         return testClass;
     }
 
+    public List<String> getTags() {
+        return tags;
+    }
+
     public UniqueId getUniqueId() {
         return uniqueId;
     }

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java
@@ -369,8 +369,9 @@ private byte[] transformClass(String className, List<BiFunction<String, ClassVis
         } else {
             data = classData;
         }
-        if (BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR != null) {
-            File debugPath = new File(BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR);
+        var debugTransformedClassesDir = BootstrapDebug.transformedClassesDir();
+        if (debugTransformedClassesDir != null) {
+            File debugPath = new File(debugTransformedClassesDir);
             if (!debugPath.exists()) {
                 debugPath.mkdir();
             }

diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java
@@ -217,7 +217,7 @@ private Map<Path, List<SbomResult>> getSboms(List<SbomBuildItem> sbomBuildItems)
     }
 
     private void writeDebugSourceFile(BuildResult result) {
-        String debugSourcesDir = BootstrapDebug.DEBUG_SOURCES_DIR;
+        String debugSourcesDir = BootstrapDebug.debugSourcesDir();
         if (debugSourcesDir != null) {
             for (GeneratedClassBuildItem i : result.consumeMulti(GeneratedClassBuildItem.class)) {
                 try {

diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java
@@ -392,9 +392,10 @@ private static Map<String, byte[]> extractGeneratedResources(BuildResult buildRe
         for (GeneratedClassBuildItem i : buildResult.consumeMulti(GeneratedClassBuildItem.class)) {
             if (i.isApplicationClass() == applicationClasses) {
                 data.put(fromClassNameToResourceName(i.getName()), i.getClassData());
-                if (BootstrapDebug.DEBUG_CLASSES_DIR != null) {
+                var debugClassesDir = BootstrapDebug.debugClassesDir();
+                if (debugClassesDir != null) {
                     try {
-                        File debugPath = new File(BootstrapDebug.DEBUG_CLASSES_DIR);
+                        File debugPath = new File(debugClassesDir);
                         if (!debugPath.exists()) {
                             debugPath.mkdir();
                         }
@@ -409,7 +410,7 @@ private static Map<String, byte[]> extractGeneratedResources(BuildResult buildRe
                     }
                 }
 
-                String debugSourcesDir = BootstrapDebug.DEBUG_SOURCES_DIR;
+                String debugSourcesDir = BootstrapDebug.debugSourcesDir();
                 if (debugSourcesDir != null) {
                     try {
                         if (i.getSource() != null) {

diff --git a/...ava/io/quarkus/annotation/processor/documentation/config/ConfigDocExtensionProcessor.java b/...ava/io/quarkus/annotation/processor/documentation/config/ConfigDocExtensionProcessor.java
@@ -71,7 +71,12 @@ public void finalizeProcessing() {
 
         Properties javadocProperties = new Properties();
         for (Entry<String, JavadocElement> javadocElementEntry : configCollector.getJavadocElements().entrySet()) {
-            javadocProperties.put(javadocElementEntry.getKey(), javadocElementEntry.getValue().rawJavadoc());
+            if (javadocElementEntry.getValue().description() == null
+                    || javadocElementEntry.getValue().description().isBlank()) {
+                continue;
+            }
+
+            javadocProperties.put(javadocElementEntry.getKey(), javadocElementEntry.getValue().description());
         }
         utils.filer().write(Outputs.META_INF_QUARKUS_JAVADOC, javadocProperties);
 

diff --git a/...in/java/io/quarkus/annotation/processor/documentation/config/discovery/JavadocFormat.java b/...in/java/io/quarkus/annotation/processor/documentation/config/discovery/JavadocFormat.java
diff --git a/...in/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadoc.java b/...in/java/io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadoc.java
@@ -1,6 +1,8 @@
 package io.quarkus.annotation.processor.documentation.config.discovery;
 
-public record ParsedJavadoc(String description, String since, String deprecated, JavadocFormat originalFormat) {
+import io.quarkus.annotation.processor.documentation.config.model.JavadocFormat;
+
+public record ParsedJavadoc(String description, JavadocFormat format, String since, String deprecated) {
 
     public static ParsedJavadoc empty() {
         return new ParsedJavadoc(null, null, null, null);

diff --git a/.../io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadocSection.java b/.../io/quarkus/annotation/processor/documentation/config/discovery/ParsedJavadocSection.java
@@ -1,8 +1,10 @@
 package io.quarkus.annotation.processor.documentation.config.discovery;
 
-public record ParsedJavadocSection(String title, String details, String deprecated) {
+import io.quarkus.annotation.processor.documentation.config.model.JavadocFormat;
+
+public record ParsedJavadocSection(String title, String details, JavadocFormat format, String deprecated) {
 
     public static ParsedJavadocSection empty() {
-        return new ParsedJavadocSection(null, null, null);
+        return new ParsedJavadocSection(null, null, null, null);
     }
 }
diff --git a/...ain/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java b/...ain/java/io/quarkus/annotation/processor/documentation/config/discovery/ResolvedType.java
@@ -70,7 +70,7 @@ public static ResolvedType makeMap(TypeMirror type, ResolvedType unwrappedResolv
         return new ResolvedType(type, unwrappedResolvedType.unwrappedType,
                 unwrappedResolvedType.binaryName, unwrappedResolvedType.qualifiedName, unwrappedResolvedType.simplifiedName,
                 unwrappedResolvedType.isPrimitive,
-                true, unwrappedResolvedType.isList,
+                true, false,
                 unwrappedResolvedType.isOptional,
                 unwrappedResolvedType.isDeclared, unwrappedResolvedType.isInterface, unwrappedResolvedType.isClass,
                 unwrappedResolvedType.isEnum, unwrappedResolvedType.isDuration, unwrappedResolvedType.isConfigGroup);