[pull] main from quarkusio:main

.github/filter-native-tests-json.sh → .github/filter-integration-tests-json.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-# Purpose: Prints a filtered version of native-tests.json, with "test-modules" reduced to the ones passed in as the first argument.
-#          This first argument is expected to the define one module per line.
+# Purpose: Prints a filtered version of a JSON file derived from the first argument,
+#          e.g. "native" => "native-tests.json" or "virtual-threads" => "virtual-threads-tests.json",
+#          with "test-modules" reduced to the ones passed in as the second argument.
+#          This second argument is expected to the define one module per line.
 #          "include" elements that (after filtering) have no "test-modules" anymore are deleted entirely!
 # Note: This script is only for CI and does therefore not aim to be compatible with BSD/macOS.
 
@@ -11,13 +13,15 @@ shopt -s failglob
 # path of this shell script
 PRG_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
-JSON=$(cat ${PRG_PATH}/native-tests.json)
+FILE_BASE_NAME=$1
+shift
+JSON=$(cat ${PRG_PATH}/${FILE_BASE_NAME}-tests.json)
 
-JSON=$( echo "$JSON" | jq '
+JSON=$( echo "$JSON" | jq "$(cat <<EOF
   .include |= map(
     . + {
       tag: (
-        "native-" +
+        "$FILE_BASE_NAME-" +
         (.category
           | ascii_downcase
           | gsub(" "; "-")
@@ -26,7 +30,8 @@ JSON=$( echo "$JSON" | jq '
       )
     }
   )
-')
+EOF
+)")
 
 # Step 0: print unfiltered json and exit in case the parameter is '_all_' (full build) or print nothing if empty (no changes)
 if [ "$1" == '_all_' ]

.github/virtual-threads-tests.json

@@ -3,19 +3,19 @@
         {
             "category": "Main",
             "timeout": 60,
-            "test-modules": "virtual-threads-disabled, grpc-virtual-threads, mailer-virtual-threads, redis-virtual-threads, rest-client-reactive-virtual-threads, resteasy-reactive-virtual-threads, vertx-event-bus-virtual-threads, scheduler-virtual-threads, quartz-virtual-threads, metrics-virtual-threads",
+            "test-modules": "virtual-threads/virtual-threads-disabled, virtual-threads/grpc-virtual-threads, virtual-threads/mailer-virtual-threads, virtual-threads/redis-virtual-threads, virtual-threads/rest-client-reactive-virtual-threads, virtual-threads/resteasy-reactive-virtual-threads, virtual-threads/vertx-event-bus-virtual-threads, virtual-threads/scheduler-virtual-threads, virtual-threads/quartz-virtual-threads, virtual-threads/metrics-virtual-threads",
             "os-name": "ubuntu-latest"
         },
         {
             "category": "Messaging",
             "timeout": 45,
-            "test-modules": "amqp-virtual-threads, jms-virtual-threads, kafka-virtual-threads",
+            "test-modules": "virtual-threads/amqp-virtual-threads, virtual-threads/jms-virtual-threads, virtual-threads/kafka-virtual-threads",
             "os-name": "ubuntu-latest"
         },
         {
             "category": "Security",
             "timeout": 20,
-            "test-modules": "security-webauthn-virtual-threads",
+            "test-modules": "virtual-threads/security-webauthn-virtual-threads",
             "os-name": "ubuntu-latest"
         }
     ]

.github/workflows/ci-actions-incremental.yml

@@ -375,7 +375,7 @@ jobs:
       - name: Verify native-tests.json
         run: ./.github/verify-tests-json.sh native-tests.json integration-tests/
       - name: Verify virtual-threads-tests.json
-        run: ./.github/verify-tests-json.sh virtual-threads-tests.json integration-tests/virtual-threads/
+        run: ./.github/verify-tests-json.sh virtual-threads-tests.json integration-tests/
       - name: Setup Develocity Build Scan capture
         uses: gradle/develocity-actions/setup-maven@v2.1
         with:
@@ -498,7 +498,7 @@ jobs:
         id: calc-native-matrix
         run: |
           echo "GIB_IMPACTED_MODULES: ${GIB_IMPACTED_MODULES}"
-          json=$(.github/filter-native-tests-json.sh "${GIB_IMPACTED_MODULES}" | tr -d '\n')
+          json=$(.github/filter-integration-tests-json.sh native "${GIB_IMPACTED_MODULES}" | tr -d '\n')
           echo "${json}"
           echo "matrix=${json}" >> $GITHUB_OUTPUT
       - name: Calculate matrix from matrix-jvm-tests.json
@@ -511,13 +511,13 @@ jobs:
         id: calc-virtual-threads-matrix
         run: |
           echo "GIB_IMPACTED_MODULES: ${GIB_IMPACTED_MODULES}"
-          json=$(.github/filter-virtual-threads-tests-json.sh "${GIB_IMPACTED_MODULES}" | tr -d '\n')
+          json=$(.github/filter-integration-tests-json.sh virtual-threads "${GIB_IMPACTED_MODULES}" | tr -d '\n')
           echo "${json}"
           echo "matrix=${json}" >> $GITHUB_OUTPUT
       - name: Calculate run flags
         id: calc-run-flags
         run: |
-          run_devtools=true; run_gradle=true; run_maven=true; run_kubernetes=true; run_quickstarts=true; run_tcks=true
+          run_devtools=true; run_gradle=true; run_maven=true; run_kubernetes=true; run_quickstarts=true; run_tcks=true;
           if [ -z "${GIB_IMPACTED_MODULES}" ]
           then
             run_devtools=false; run_gradle=false; run_maven=false; run_kubernetes=false; run_quickstarts=false; run_tcks=false
@@ -1403,14 +1403,14 @@ jobs:
           CONTAINER_BUILD: ${{startsWith(matrix.os-name, 'windows') && 'false' || 'true'}}
           CAPTURE_BUILD_SCAN: true
         run: |
-          export LANG=en_US && ./mvnw $COMMON_MAVEN_ARGS $COMMON_TEST_MAVEN_ARGS $PTS_MAVEN_ARGS -f integration-tests/virtual-threads -pl "$TEST_MODULES" $NATIVE_TEST_MAVEN_ARGS -Dextra-args=--enable-preview -Dquarkus.native.container-build=true
+          export LANG=en_US && ./mvnw $COMMON_MAVEN_ARGS $COMMON_TEST_MAVEN_ARGS $PTS_MAVEN_ARGS -f integration-tests -pl "$TEST_MODULES" $NATIVE_TEST_MAVEN_ARGS -Dextra-args=--enable-preview -Dquarkus.native.container-build=true
       - name: Prepare build reports archive
         if: always()
         run: |
           7z a -tzip build-reports.zip -r \
-              'integration-tests/virtual-threads/**/target/*-reports/TEST-*.xml' \
-              'integration-tests/virtual-threads/target/build-report.json' \
-              'integration-tests/virtual-threads/target/gradle-build-scan-url.txt' \
+              'integration-tests/**/target/*-reports/TEST-*.xml' \
+              'integration-tests/**/target/build-report.json' \
+              'integration-tests/**/target/gradle-build-scan-url.txt' \
               LICENSE
       - name: Upload build reports
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0

.github/workflows/native-it-selected-graalvm.yml

@@ -204,7 +204,7 @@ jobs:
         id: calc-native-matrix
         run: |
           echo "GIB_IMPACTED_MODULES: ${GIB_IMPACTED_MODULES}"
-          json=$(.github/filter-native-tests-json.sh "${GIB_IMPACTED_MODULES}" | tr -d '\n')
+          json=$(.github/filter-integration-tests-json.sh native "${GIB_IMPACTED_MODULES}" | tr -d '\n')
           # Remove Windows from the matrix
           json=$(echo $json | jq 'del(.include[] | select(."os-name" == "windows-latest"))')
           json=$(echo $json | tr -d '\n')
@@ -214,7 +214,7 @@ jobs:
         id: calc-virtual-threads-matrix
         run: |
           echo "GIB_IMPACTED_MODULES: ${GIB_IMPACTED_MODULES}"
-          json=$(.github/filter-virtual-threads-tests-json.sh "${GIB_IMPACTED_MODULES}" | tr -d '\n')
+          json=$(.github/filter-integration-tests-json.sh virtual-threads "${GIB_IMPACTED_MODULES}" | tr -d '\n')
           # Remove Windows from the matrix
           json=$(echo $json | jq 'del(.include[] | select(."os-name" == "windows-latest"))')
           json=$(echo $json | tr -d '\n')

AI_POLICY.md

@@ -9,6 +9,7 @@ However, recent patterns of use have led to increased moderation burden, low-val
 - You may use agents/LLMs to help you **write better**, but not to **post more**.
 - AI may be used to **assist your development** — for example drafting code, writing documentation, or proposing fixes — as long as **you understand, validate**, and **take responsibility for the results**.
 - You should only submit contributions (PRs, comments, discussions, issues) that reflect your **own understanding** and **intent**, not what an agent/LLM "spit out."
+  - This means that when the contribution is scrutinized by a maintainer, you need to be ready to argue about all aspects of it; simply responding that the contribution is what the LLM provided is completely unacceptable   
 
 ## Unacceptable Use of AI
 

bom/application/pom.xml

@@ -46,7 +46,7 @@
         <microprofile-lra.version>2.0.2</microprofile-lra.version>
         <microprofile-openapi.version>4.1.1</microprofile-openapi.version>
         <smallrye-common.version>2.17.0</smallrye-common.version>
-        <smallrye-config.version>3.17.1</smallrye-config.version>
+        <smallrye-config.version>3.17.2</smallrye-config.version>
         <smallrye-health.version>4.3.0</smallrye-health.version>
         <smallrye-open-api.version>4.3.0</smallrye-open-api.version>
         <smallrye-graphql.version>2.18.0</smallrye-graphql.version>
@@ -882,11 +882,26 @@
                 <artifactId>quarkus-cyclonedx-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-cyclonedx-deployment-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-cyclonedx-generator</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-cyclonedx-endpoint</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-cyclonedx-endpoint-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-datasource-common</artifactId>

devtools/bom-descriptor-json/pom.xml

@@ -518,6 +518,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-cyclonedx-endpoint</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-datasource</artifactId>

devtools/gradle/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 plugin-publish = "2.1.1"
 
 kotlin = "2.3.10"
-smallrye-config = "3.17.1"
+smallrye-config = "3.17.2"
 
 junit = "6.0.3"
 assertj = "3.27.7"

devtools/maven/src/main/java/io/quarkus/maven/DependencySbomMojo.java

@@ -82,6 +82,12 @@ public class DependencySbomMojo extends AbstractMojo {
     @Parameter(property = "quarkus.dependency.sbom.schema-version")
     String schemaVersion;
 
+    /**
+     * Whether to pretty-print the generated SBOM output. The default is {@code false}
+     */
+    @Parameter(property = "quarkus.dependency.sbom.pretty-print", defaultValue = "false")
+    boolean prettyPrint;
+
     /**
      * Whether to limit application dependencies to only those that are included in the runtime
      */
@@ -107,6 +113,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 .setEffectiveModelResolver(EffectiveModelResolver.of(getResolver()))
                 .setSchemaVersion(schemaVersion)
                 .setIncludeLicenseText(includeLicenseText)
+                .setPrettyPrint(prettyPrint)
                 .generate();
         getLog().info("The SBOM has been saved in " + outputFilePath);
     }

docs/pom.xml

@@ -482,6 +482,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-cyclonedx-endpoint-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-datasource-deployment</artifactId>