This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new c73a8a5098 Genericise setup-maven-cache action and cache shibboleth
repository artifacts
c73a8a5098 is described below
commit c73a8a5098c6d0c93c7c81c231ca4e4781bbb76f
Author: James Netherton <[email protected]>
AuthorDate: Wed Jun 17 13:43:02 2026 +0100
Genericise setup-maven-cache action and cache shibboleth repository
artifacts
Co-authored-by: Claude Sonnet 4.6 (1M context) <[email protected]>
---
.github/actions/setup-maven-cache/action.yaml | 73 +++++++++++++++++++---
.github/workflows/alternate-jdk-build.yaml | 44 +++++++------
.github/workflows/camel-master-cron.yaml | 51 ++++++++-------
.github/workflows/check-dependency-convergence.yml | 16 ++---
.github/workflows/ci-build.yaml | 73 ++++++++++------------
.github/workflows/generate-sbom-main.yml | 16 ++---
.github/workflows/pr-validate.yml | 27 +++-----
.github/workflows/quarkus-lts-ci-build.yaml | 44 +++++++------
.github/workflows/quarkus-master-cron.yaml | 47 +++++++-------
9 files changed, 209 insertions(+), 182 deletions(-)
diff --git a/.github/actions/setup-maven-cache/action.yaml
b/.github/actions/setup-maven-cache/action.yaml
index 6fe165f445..9a3318d48b 100644
--- a/.github/actions/setup-maven-cache/action.yaml
+++ b/.github/actions/setup-maven-cache/action.yaml
@@ -16,31 +16,84 @@
#
name: 'Setup Maven Cache'
-description: 'Downloads Maven repository artifact and restores Atlassian
dependencies cache'
+description: 'Manages the third-party Maven dependency cache. Use
action=restore (default) before the build and action=save after.'
inputs:
- atlassian-version:
- description: 'Version of Atlassian dependencies for cache key'
- required: true
+ action:
+ description: 'restore (default) or save'
+ default: 'restore'
+ maven-properties:
+ description: 'Maven property expressions to evaluate for the cache key,
one per line. Ignored when cache-key is provided. Only used for restore.'
+ default: ''
+ pom-path:
+ description: 'Path to the POM file or directory passed to Maven -f.
Defaults to pom.xml. Only used for restore.'
+ default: 'pom.xml'
+ cache-key:
+ description: 'restore: pre-computed key override (skips property
evaluation). save: the key to save under (required).'
+ default: ''
+ download-maven-repo:
+ description: 'Download and extract the maven-repo workflow artifact after
restoring the cache. Only used for restore.'
+ default: 'false'
+ cache-paths:
+ description: 'Paths under ~/.m2/repository to cache, one per line.
Defaults to the known third-party artifact groups.'
+ default: |
+ ~/.m2/repository/com/atlassian
+ ~/.m2/repository/io/atlassian
+ ~/.m2/repository/org/opensaml
+ ~/.m2/repository/net/shibboleth
+
+outputs:
+ cache-key:
+ description: 'The resolved cache key (only set for action=restore)'
+ value: ${{ steps.resolve-key.outputs.key }}
runs:
using: "composite"
steps:
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 #
v4.4.0
+ - name: Resolve cache key
+ id: resolve-key
+ if: ${{ inputs.action == 'restore' }}
+ shell: bash
+ env:
+ PROVIDED_KEY: ${{ inputs.cache-key }}
+ MAVEN_PROPERTIES: ${{ inputs.maven-properties }}
+ POM_PATH: ${{ inputs.pom-path }}
+ run: |
+ if [[ -n "${PROVIDED_KEY}" ]]; then
+ echo "key=${PROVIDED_KEY}" >> $GITHUB_OUTPUT
+ else
+ VALS=""
+ while IFS= read -r PROP; do
+ PROP="${PROP//[[:space:]]/}"
+ [[ -z "${PROP}" ]] && continue
+ VAL=$(./mvnw help:evaluate -f "${POM_PATH}" -Dexpression="${PROP}"
-q -DforceStdout -N)
+ VALS="${VALS}${VAL}\n"
+ done <<< "${MAVEN_PROPERTIES}"
+ HASH=$(printf "${VALS}" | sha256sum | cut -c1-16)
+ echo "key=third-party-maven-${HASH}" >> $GITHUB_OUTPUT
+ fi
+ - name: Restore Maven Cache
+ if: ${{ inputs.action == 'restore' }}
+ uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ inputs.atlassian-version }}
+ path: ${{ inputs.cache-paths }}
+ key: ${{ steps.resolve-key.outputs.key }}
- name: Download Maven Repo
+ if: ${{ inputs.action == 'restore' && inputs.download-maven-repo ==
'true' }}
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
# v8.0.1
with:
name: maven-repo
path: ..
- name: Extract Maven Repo
+ if: ${{ inputs.action == 'restore' && inputs.download-maven-repo ==
'true' }}
shell: bash
run: |
df -h /
tar -I 'zstd -d' -xf ../maven-repo.tar.zst -C ~
rm -f ../maven-repo.tar.zst
df -h /
+ - name: Save Maven Cache
+ if: ${{ inputs.action == 'save' }}
+ uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ with:
+ path: ${{ inputs.cache-paths }}
+ key: ${{ inputs.cache-key }}
diff --git a/.github/workflows/alternate-jdk-build.yaml
b/.github/workflows/alternate-jdk-build.yaml
index 6ba30a653c..6043ecb4e9 100644
--- a/.github/workflows/alternate-jdk-build.yaml
+++ b/.github/workflows/alternate-jdk-build.yaml
@@ -66,7 +66,7 @@ jobs:
outputs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
examples-matrix: ${{ steps.set-examples-matrix.outputs.examples-matrix }}
- atlassian-version: ${{ steps.atlassian-version.outputs.version }}
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
env:
MAVEN_OPTS: -Xmx4600m
steps:
@@ -83,18 +83,13 @@ jobs:
with:
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
- - name: Get Atlassian dependency version
- id: atlassian-version
- run: |
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Setup Maven Cache
+ id: maven-cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ maven-properties: |
+ jira-rest-client.version
+ quarkiverse-cxf.version
- name: Update extension metadata
run: |
./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS}
@@ -120,14 +115,12 @@ jobs:
name: maven-repo
path: ${{ runner.temp }}/maven-repo.tar.zst
retention-days: 1
- - name: Save Atlassian Maven Cache
- uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Save Maven Cache
+ uses: ./.github/actions/setup-maven-cache
if: always()
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ action: save
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
- name: Setup Native Test Matrix
id: set-native-matrix
run: |
@@ -171,7 +164,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Integration Tests
run: |
for MODULE in $(yq -M -N e ".${{ matrix.category }}"
tooling/scripts/test-categories.yaml | grep -vE '^\s*#' | cut -f2 -d' '); do
@@ -242,7 +236,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd extensions-core && mvn test
run: |
cd extensions-core
@@ -322,7 +317,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
@@ -359,7 +355,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd integration-tests && mvn clean verify
shell: bash
run: |
@@ -392,7 +389,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: set CQ_VERSION
run: echo "CQ_VERSION=$(./mvnw help:evaluate
-Dexpression=project.version -q -DforceStdout -N)" >> $GITHUB_ENV
- name: clone and verify examples
diff --git a/.github/workflows/camel-master-cron.yaml
b/.github/workflows/camel-master-cron.yaml
index 6ef67ce7d4..7c254c2649 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -36,7 +36,7 @@ jobs:
outputs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
examples-matrix: ${{ steps.set-examples-matrix.outputs.examples-matrix }}
- atlassian-version: ${{ steps.atlassian-version.outputs.version }}
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
env:
MAVEN_OPTS: -Xmx4600m
steps:
@@ -70,19 +70,20 @@ jobs:
git clone --depth 1 --branch main https://github.com/apache/camel.git
cd camel
echo "Current Camel commit:" $(git rev-parse HEAD)
- - name: Get Atlassian dependency version
- id: atlassian-version
+ - name: Compute third-party cache key
+ id: cache-key
run: |
cd ../camel/parent
- JIRA_VERSION=$(../mvnw help:evaluate
-Dexpression=jira-rest-client-api-version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ JIRA_VER=$(../mvnw help:evaluate
-Dexpression=jira-rest-client-api-version -q -DforceStdout -N)
+ cd -
+ CXF_VER=$(./mvnw help:evaluate -Dexpression=quarkiverse-cxf.version
-q -DforceStdout -N)
+ HASH=$(printf "${JIRA_VER}\n${CXF_VER}\n" | sha256sum | cut -c1-16)
+ echo "key=third-party-maven-${HASH}" >> $GITHUB_OUTPUT
+ - name: Setup Maven Cache
+ id: maven-cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ cache-key: ${{ steps.cache-key.outputs.key }}
- name: Build Camel
run: |
cd ../camel
@@ -112,14 +113,12 @@ jobs:
name: maven-repo
path: ${{ runner.temp }}/maven-repo.tar.zst
retention-days: 1
- - name: Save Atlassian Maven Cache
- uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Save Maven Cache
+ uses: ./.github/actions/setup-maven-cache
if: always()
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ action: save
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
- name: Setup Native Test Matrix
id: set-native-matrix
run: |
@@ -164,7 +163,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Reclaim Disk Space
run: .github/reclaim-disk-space.sh
- name: Rebase branch main onto camel-main
@@ -243,7 +243,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto camel-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
@@ -333,7 +334,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto camel-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
@@ -380,7 +382,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto camel-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
@@ -427,7 +430,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Set up JDK 17
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 #
v5.3.0
with:
@@ -509,7 +513,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto camel-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
diff --git a/.github/workflows/check-dependency-convergence.yml
b/.github/workflows/check-dependency-convergence.yml
index 3c906070c6..aed4b1f681 100644
--- a/.github/workflows/check-dependency-convergence.yml
+++ b/.github/workflows/check-dependency-convergence.yml
@@ -47,18 +47,12 @@ jobs:
java-version: '17'
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #
v6.0.3
- - name: Get Atlassian dependency version
- id: atlassian-version
- run: |
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Setup Maven Cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ maven-properties: |
+ jira-rest-client.version
+ quarkiverse-cxf.version
- name: Set Build Info
run: |
[ ! -d ~/build-data ] && mkdir -p ~/build-data
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index d6e0b4b821..00539576ae 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -20,10 +20,7 @@ name: Camel Quarkus CI
on:
push:
branches:
- - main
- - camel-main
- - quarkus-main
- - "[0-9]+.[0-9]+.x"
+ - '**'
paths-ignore:
- '**.adoc'
- '**.md'
@@ -109,7 +106,6 @@ env:
jobs:
pre-build-checks:
- if: github.repository == 'apache/camel-quarkus'
runs-on: ubuntu-latest
outputs:
continue-build: ${{ steps.pre-build-checks.outputs.continue-build }}
@@ -135,20 +131,13 @@ jobs:
with:
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
- - name: Get Atlassian dependency version
- id: atlassian-version
- if: steps.init.outputs.run-checks == 'true'
- run: |
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Setup Maven Cache
if: steps.init.outputs.run-checks == 'true'
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ maven-properties: |
+ jira-rest-client.version
+ quarkiverse-cxf.version
- name: Pre build checks
id: pre-build-checks
run: |
@@ -188,7 +177,7 @@ jobs:
outputs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
examples-matrix: ${{ steps.set-examples-matrix.outputs.examples-matrix }}
- atlassian-version: ${{ steps.atlassian-version.outputs.version }}
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
env:
MAVEN_OPTS: -Xmx4600m
steps:
@@ -220,23 +209,24 @@ jobs:
with:
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
- - name: Get Atlassian dependency version
- id: atlassian-version
+ - name: Compute third-party cache key
+ id: cache-key
run: |
if [[ "${{ github.ref }}" == "refs/heads/camel-main" || "${{
github.base_ref }}" == "camel-main" ]]; then
cd ../camel/parent
- JIRA_VERSION=$(../mvnw help:evaluate
-Dexpression=jira-rest-client-api-version -q -DforceStdout -N)
+ JIRA_VER=$(../mvnw help:evaluate
-Dexpression=jira-rest-client-api-version -q -DforceStdout -N)
+ cd -
else
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
+ JIRA_VER=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
fi
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ CXF_VER=$(./mvnw help:evaluate -Dexpression=quarkiverse-cxf.version
-q -DforceStdout -N)
+ HASH=$(printf "${JIRA_VER}\n${CXF_VER}\n" | sha256sum | cut -c1-16)
+ echo "key=third-party-maven-${HASH}" >> $GITHUB_OUTPUT
+ - name: Setup Maven Cache
+ id: maven-cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ cache-key: ${{ steps.cache-key.outputs.key }}
- name: Build Camel
if: github.ref == 'refs/heads/camel-main' || github.base_ref ==
'camel-main'
run: |
@@ -267,14 +257,12 @@ jobs:
name: maven-repo
path: ${{ runner.temp }}/maven-repo.tar.zst
retention-days: 1
- - name: Save Atlassian Maven Cache
- uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Save Maven Cache
+ uses: ./.github/actions/setup-maven-cache
if: always()
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ action: save
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
- name: Setup Native Test Matrix
id: set-native-matrix
run: |
@@ -318,7 +306,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Integration Tests
run: |
for MODULE in $(yq -M -N e ".${{ matrix.category }}"
tooling/scripts/test-categories.yaml | grep -vE '^\s*#' | cut -f2 -d' '); do
@@ -385,7 +374,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd extensions-core && mvn test
run: |
cd extensions-core
@@ -465,7 +455,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
@@ -503,7 +494,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd integration-tests && mvn clean verify
shell: bash
run: |
@@ -537,7 +529,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: set CQ_VERSION
run: echo "CQ_VERSION=$(./mvnw help:evaluate
-Dexpression=project.version -q -DforceStdout -N)" >> $GITHUB_ENV
- name: clone and verify examples
diff --git a/.github/workflows/generate-sbom-main.yml
b/.github/workflows/generate-sbom-main.yml
index 6e86f23d42..e127aa7aeb 100644
--- a/.github/workflows/generate-sbom-main.yml
+++ b/.github/workflows/generate-sbom-main.yml
@@ -50,18 +50,12 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
cache: 'maven'
- - name: Get Atlassian dependency version
- id: atlassian-version
- run: |
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Setup Maven Cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ maven-properties: |
+ jira-rest-client.version
+ quarkiverse-cxf.version
- name: mvn build and sbom generation
run: ./mvnw -V --no-transfer-progress -e -Psbom -Dquickly -DskipTests
verify ${CQ_MAVEN_ARGS}
- name: Create Pull Request
diff --git a/.github/workflows/pr-validate.yml
b/.github/workflows/pr-validate.yml
index 7386d7568a..b7b3982b21 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -87,30 +87,23 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
- - name: Get Atlassian dependency version
- id: atlassian-version
- run: |
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Setup Maven Cache
+ id: maven-cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ maven-properties: |
+ jira-rest-client.version
+ quarkiverse-cxf.version
- name: mvn validate
run: |
./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} -fae \
-DskipTests \
-Pcheck-format \
clean validate
- - name: Save Atlassian Maven Cache
- uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Save Maven Cache
+ uses: ./.github/actions/setup-maven-cache
if: always()
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ action: save
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
diff --git a/.github/workflows/quarkus-lts-ci-build.yaml
b/.github/workflows/quarkus-lts-ci-build.yaml
index c0481e7a54..1ac3784821 100644
--- a/.github/workflows/quarkus-lts-ci-build.yaml
+++ b/.github/workflows/quarkus-lts-ci-build.yaml
@@ -51,7 +51,7 @@ jobs:
outputs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
examples-matrix: ${{ steps.set-examples-matrix.outputs.examples-matrix }}
- atlassian-version: ${{ steps.atlassian-version.outputs.version }}
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
env:
MAVEN_OPTS: -Xmx4600m
steps:
@@ -75,18 +75,13 @@ jobs:
with:
ref: ${{ github.event.inputs.branch }}.x
fetch-depth: 0
- - name: Get Atlassian dependency version
- id: atlassian-version
- run: |
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Setup Maven Cache
+ id: maven-cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ maven-properties: |
+ jira-rest-client.version
+ quarkiverse-cxf.version
- name: Set Quarkus SNAPSHOT Version
run: |
sed -i
's/<quarkus.version>.*<\/quarkus.version>/<quarkus.version>${{github.event.inputs.branch}}.999-SNAPSHOT<\/quarkus.version>/'
pom.xml
@@ -115,14 +110,12 @@ jobs:
name: maven-repo
path: ${{ runner.temp }}/maven-repo.tar.zst
retention-days: 1
- - name: Save Atlassian Maven Cache
- uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Save Maven Cache
+ uses: ./.github/actions/setup-maven-cache
if: always()
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ action: save
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
- name: Setup Native Test Matrix
id: set-native-matrix
run: |
@@ -162,7 +155,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Integration Tests
run: |
for MODULE in $(yq -M -N e ".${{ matrix.category }}"
tooling/scripts/test-categories.yaml | grep -vE '^\s*#' | cut -f2 -d' '); do
@@ -232,7 +226,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd extensions-core && mvn test
run: |
cd extensions-core
@@ -315,7 +310,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd integration-tests-jvm && mvn clean test
run: |
cd integration-tests-jvm
@@ -356,7 +352,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: cd integration-tests && mvn clean verify
shell: bash
run: |
@@ -387,7 +384,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: set CQ_VERSION
run: echo "CQ_VERSION=$(./mvnw help:evaluate
-Dexpression=project.version -q -DforceStdout -N)" >> $GITHUB_ENV
- name: clone and verify examples
diff --git a/.github/workflows/quarkus-master-cron.yaml
b/.github/workflows/quarkus-master-cron.yaml
index d5289a6aba..19e8f65b17 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -36,7 +36,7 @@ jobs:
outputs:
matrix: ${{ steps.set-native-matrix.outputs.matrix }}
examples-matrix: ${{ steps.set-examples-matrix.outputs.examples-matrix }}
- atlassian-version: ${{ steps.atlassian-version.outputs.version }}
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
env:
MAVEN_OPTS: -Xmx4600m
steps:
@@ -57,18 +57,13 @@ jobs:
with:
ref: quarkus-main
fetch-depth: 0
- - name: Get Atlassian dependency version
- id: atlassian-version
- run: |
- JIRA_VERSION=$(./mvnw help:evaluate
-Dexpression=jira-rest-client.version -q -DforceStdout -N)
- echo "version=${JIRA_VERSION}" >> $GITHUB_OUTPUT
- - name: Restore Atlassian Maven Cache
- uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Setup Maven Cache
+ id: maven-cache
+ uses: ./.github/actions/setup-maven-cache
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ maven-properties: |
+ jira-rest-client.version
+ quarkiverse-cxf.version
- name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
@@ -109,14 +104,12 @@ jobs:
name: maven-repo
path: ${{ runner.temp }}/maven-repo.tar.zst
retention-days: 1
- - name: Save Atlassian Maven Cache
- uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #
v5.0.5
+ - name: Save Maven Cache
+ uses: ./.github/actions/setup-maven-cache
if: always()
with:
- path: |
- ~/.m2/repository/com/atlassian
- ~/.m2/repository/io/atlassian
- key: atlassian-maven-${{ steps.atlassian-version.outputs.version }}
+ action: save
+ cache-key: ${{ steps.maven-cache.outputs.cache-key }}
- name: Setup Native Test Matrix
id: set-native-matrix
run: |
@@ -161,7 +154,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Reclaim Disk Space
run: .github/reclaim-disk-space.sh
- name: Rebase branch main onto quarkus-main
@@ -240,7 +234,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
@@ -330,7 +325,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
@@ -377,7 +373,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
@@ -424,7 +421,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Set up JDK 17
uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 #
v5.3.0
with:
@@ -506,7 +504,8 @@ jobs:
- name: Setup Maven Cache
uses: ./.github/actions/setup-maven-cache
with:
- atlassian-version: ${{
needs.initial-mvn-install.outputs.atlassian-version }}
+ cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
+ download-maven-repo: 'true'
- name: Rebase branch main onto quarkus-main
run: |
git config --local user.email
"41898282+github-actions[bot]@users.noreply.github.com"
