Upgrade Quarkus platform to 3.38.0

.github/generate-test-matrix.sh

@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Reads a Scalpel report and emits GitHub Actions matrix + modules outputs.
+# Usage: generate-test-matrix.sh <scalpel-report.json>
+# Output lines are in key=value format suitable for >> $GITHUB_OUTPUT.
+
+set -euo pipefail
+
+REPORT="${1:?Usage: $0 <scalpel-report.json>}"
+MAX_GROUPS=10
+
+# Unique top-level modules (first path component of each affected module path)
+ALL=()
+if [ -f "$REPORT" ]; then
+    while IFS= read -r line; do
+        ALL+=("$line")
+    done < <(jq -r '[.affectedModules[] | select(.path != "") | .path | split("/")[0]] | unique[]' "$REPORT")
+fi
+
+# Fall back to all reactor modules when Scalpel found nothing or wrote no report
+# (no base branch configured, e.g. a plain push with no PR context)
+if [ ${#ALL[@]} -eq 0 ]; then
+    while IFS= read -r line; do
+        ALL+=("$line")
+    done < <(grep '<module>' pom.xml | sed 's|.*<module>\(.*\)</module>.*|\1|' | sort)
+fi
+
+# Separate single-module and multi-module projects.
+# Multi-module projects get a dedicated native test group (they run from their own
+# root directory) and are expanded with sub-modules for the -pl modules list.
+SINGLE=()
+MULTI=()
+for m in "${ALL[@]}"; do
+    if grep -q '<module>' "$m/pom.xml" 2>/dev/null; then
+        MULTI+=("$m")
+    else
+        SINGLE+=("$m")
+    fi
+done
+
+# Round-robin distribution of single-module projects into at most MAX_GROUPS groups
+GROUP_TESTS=()
+for i in "${!SINGLE[@]}"; do
+    gid=$((i % MAX_GROUPS))
+    if [[ -z "${GROUP_TESTS[$gid]+x}" ]]; then
+        GROUP_TESTS[$gid]="${SINGLE[$i]}"
+    else
+        GROUP_TESTS[$gid]="${GROUP_TESTS[$gid]},${SINGLE[$i]}"
+    fi
+done
+
+# Build matrix JSON include array
+INCLUDE="["
+SEP=""
+for gid in $(echo "${!GROUP_TESTS[@]}" | tr ' ' '\n' | sort -n); do
+    INCLUDE+="${SEP}$(printf '{"name":"group-%02d","tests":"%s"}' $((gid + 1)) "${GROUP_TESTS[$gid]}")"
+    SEP=","
+done
+# Multi-module projects each get their own dedicated group at the end
+NUM_GROUPS=${#GROUP_TESTS[@]}
+for i in "${!MULTI[@]}"; do
+    INCLUDE+="${SEP}$(printf '{"name":"group-%02d","tests":"%s"}' $((NUM_GROUPS + i + 1)) "${MULTI[$i]}")"
+    SEP=","
+done
+INCLUDE+="]"
+
+# Build expanded module list for -pl: multi-module projects include their sub-modules
+# so that Maven builds the full project tree rather than just the parent POM.
+EXPANDED=()
+for m in "${ALL[@]}"; do
+    EXPANDED+=("$m")
+    if grep -q '<module>' "$m/pom.xml" 2>/dev/null; then
+        while IFS= read -r submod; do
+            [ -n "$submod" ] && EXPANDED+=("$m/$submod")
+        done < <(grep '<module>' "$m/pom.xml" | sed 's|.*<module>\(.*\)</module>.*|\1|')
+    fi
+done
+
+echo "matrix={\"include\":${INCLUDE}}"
+echo "modules=$(IFS=,; echo "${EXPANDED[*]}")"

.github/workflows/ci-build.yaml

@@ -25,6 +25,7 @@ on:
       - "[0-9]+.[0-9]+.x"
     paths-ignore:
       - '**.adoc'
+      - '**.md'
       - 'Jenkinsfile'
       - 'KEYS'
       - 'LICENSE.txt'
@@ -36,6 +37,7 @@ on:
       - "[0-9]+.[0-9]+.x"
     paths-ignore:
       - '**.adoc'
+      - '**.md'
       - 'Jenkinsfile'
       - 'KEYS'
       - 'LICENSE.txt'
@@ -57,52 +59,79 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-itest-matrix.outputs.matrix }}
+      modules: ${{ steps.set-itest-matrix.outputs.modules }}
     steps:
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
+      - name: Checkout Camel Quarkus
+        id: build-camel-quarkus
+        if: github.ref == 'refs/heads/camel-quarkus-main' || github.base_ref == 'camel-quarkus-main'
+        run: |
+          git clone --depth 1 --branch main https://github.com/apache/camel-quarkus.git ${{ runner.temp }}/camel-quarkus
+          cd ${{ runner.temp }}/camel-quarkus
+          echo "Current Camel Quarkus commit:" $(git rev-parse HEAD)
+          JIRA_VERSION=$(./mvnw help:evaluate -Dexpression=jira-rest-client.version -q -DforceStdout -N)
+          echo "atlassian-version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
+      - name: Restore Atlassian Maven Cache
+        if: github.ref == 'refs/heads/camel-quarkus-main' || github.base_ref == 'camel-quarkus-main'
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: |
+            ~/.m2/repository/com/atlassian
+            ~/.m2/repository/io/atlassian
+          key: atlassian-maven-${{ steps.build-camel-quarkus.outputs.atlassian-version }}
       - name: Build Camel Quarkus
         if: github.ref == 'refs/heads/camel-quarkus-main' || github.base_ref == 'camel-quarkus-main'
         run: |
-          git clone --depth 1 --branch main https://github.com/apache/camel-quarkus.git ${{ runner.temp }}/camel-quarkus \
-            && cd ${{ runner.temp }}/camel-quarkus \
-            && echo "Current Camel Quarkus commit:" $(git rev-parse HEAD) \
-            && ./mvnw ${MAVEN_ARGS} clean install -Dquickly
+          cd ${{ runner.temp }}/camel-quarkus
+          ./mvnw ${MAVEN_ARGS} clean install -Dquickly -T1C
+      - name: Save Atlassian Maven Cache
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        if: github.ref == 'refs/heads/camel-quarkus-main' || github.base_ref == 'camel-quarkus-main'
+        with:
+          path: |
+            ~/.m2/repository/com/atlassian
+            ~/.m2/repository/io/atlassian
+          key: atlassian-maven-${{ steps.build-camel-quarkus.outputs.atlassian-version }}
       - name: mvn cq:examples-check-platform
         run: mvn org.l2x6.cq:cq-maven-plugin:2.10.0:examples-check-platform
       - name: mvn ${MAVEN_ARGS} license:check formatter:validate impsort:check
         run: |
-          ./mvnw-for-each.sh ${MAVEN_ARGS} \
+          ./mvnw ${MAVEN_ARGS} \
             license:check \
             net.revelc.code.formatter:formatter-maven-plugin:validate \
             net.revelc.code:impsort-maven-plugin:check
+      - name: Fetch base branch for Scalpel
+        if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ci/disable-incremental')
+        run: git fetch --unshallow origin ${{ github.base_ref }}
       - name: Build Camel Quarkus Examples
         run: |
-          ./mvnw-for-each.sh ${MAVEN_ARGS} clean install -DskipTests -Dquarkus.build.skip
+          ./mvnw ${MAVEN_ARGS} clean install -DskipTests -Dquarkus.build.skip \
+            -Dscalpel.enabled=true \
+            -Dscalpel.mode=report \
+            -Dscalpel.reportFile=${{ runner.temp }}/scalpel-report.json
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
           [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+      - name: Setup Integration Test Matrix
+        id: set-itest-matrix
+        run: bash .github/generate-test-matrix.sh '${{ runner.temp }}/scalpel-report.json' >> $GITHUB_OUTPUT
       - name: Tar Maven Repo
         shell: bash
         run: |
-          tar -czf ${{ runner.temp }}/maven-repo.tgz -C ~ .m2/repository
+          tar -I 'zstd -T0' -cf ${{ runner.temp }}/maven-repo.tar.zst -C ~ .m2/repository
       - name: Persist Maven Repo
         uses: actions/upload-artifact@v7
         with:
           name: maven-repo
-          path: ${{ runner.temp }}/maven-repo.tgz
+          path: ${{ runner.temp }}/maven-repo.tar.zst
           retention-days: 1
-      - name: Setup Integration Test Matrix
-        id: set-itest-matrix
-        run: |
-          sudo apt install groovy -y --no-install-recommends
-          TEST_GROUPS=$(groovy .github/generate-test-groups.groovy)
-          echo "matrix=${TEST_GROUPS}" >> $GITHUB_OUTPUT
 
   integration-tests:
     name: Integration Tests - ${{matrix.name}}
@@ -113,7 +142,7 @@ jobs:
       matrix: ${{ fromJson(needs.initial-mvn-install.outputs.matrix) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
@@ -127,7 +156,7 @@ jobs:
       - name: Extract Maven Repo
         shell: bash
         run: |
-          tar -xzf ../maven-repo.tgz -C ~
+          tar -I 'zstd -d' -xf ../maven-repo.tar.zst -C ~
       - name: Integration Tests
         env:
           TEST_MODULES: ${{matrix.tests}}
@@ -173,7 +202,7 @@ jobs:
         jdk: ['21']
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Set up JDK {{ matrix.jdk }}
         uses: actions/setup-java@v5
         with:
@@ -187,11 +216,12 @@ jobs:
       - name: Extract Maven Repo
         shell: bash
         run: |
-          tar -xzf ../maven-repo.tgz -C ~
+          tar -I 'zstd -d' -xf ../maven-repo.tar.zst -C ~
       - name: Integration Tests
         shell: bash
         run: |
-          ./mvnw-for-each.sh ${MAVEN_ARGS} clean test
+          ./mvnw ${MAVEN_ARGS} clean test \
+            -pl ${{ needs.initial-mvn-install.outputs.modules }}
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |
@@ -207,7 +237,7 @@ jobs:
         os: ['windows-latest']
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
@@ -221,11 +251,12 @@ jobs:
       - name: Extract Maven Repo
         shell: bash
         run: |
-          tar -xzf ../maven-repo.tgz -C ~
+          tar -I 'zstd -d' -xf ../maven-repo.tar.zst -C ~
       - name: Integration Tests
         shell: bash
         run: |
-          ./mvnw-for-each.sh ${MAVEN_ARGS} -Dskip-testcontainers-tests clean test
+          ./mvnw ${MAVEN_ARGS} -Dskip-testcontainers-tests clean test \
+            -pl ${{ needs.initial-mvn-install.outputs.modules }}
       - name: Fail if there are uncommitted changes
         shell: bash
         run: |

.gitignore

@@ -48,3 +48,9 @@ flight.*
 train.*
 app.*
 
+# Claude
+.claude
+CLAUDE.local.md
+
+# Bob
+.bob

.mvn/extensions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+    <extension>
+        <groupId>eu.maveniverse.maven.scalpel</groupId>
+        <artifactId>extension</artifactId>
+        <version>0.3.4</version>
+    </extension>
+</extensions>

.mvn/maven.config

@@ -0,0 +1 @@
+-Dscalpel.enabled=false

.mvn/wrapper/maven-wrapper.properties

@@ -1,4 +1,4 @@
 wrapperVersion=3.3.4
 distributionType=bin
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar