From ca6c6ead37aab250c56ac0cb83c44ea86a776468 Mon Sep 17 00:00:00 2001 From: Andrii Berezovskyi Date: Sun, 1 Nov 2026 00:09:52 +0100 Subject: [PATCH 1/2] Align Lyo acceptance builds and weekly dependency updates Signed-off-by: Andrii Berezovskyi --- .github/dependabot.yml | 12 +-- .github/workflows/maven-acceptance-manual.yml | 97 +++++++++++++++---- .github/workflows/maven-acceptance-wide.yml | 6 +- src/refimpl-tests/pom.xml | 4 +- src/server-am/pom.xml | 4 +- src/server-cm/pom.xml | 4 +- src/server-qm/pom.xml | 4 +- src/server-rm/pom.xml | 4 +- 8 files changed, 96 insertions(+), 39 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f683df39..e6b22251 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,25 +9,25 @@ updates: directory: "/src/" # Location of package manifests open-pull-requests-limit: 50 schedule: - interval: "daily" + interval: "weekly" - package-ecosystem: "docker" # See documentation for possible values directory: "/src/server-am" # Location of package manifests schedule: - interval: "daily" + interval: "weekly" - package-ecosystem: "docker" # See documentation for possible values directory: "/src/server-cm" # Location of package manifests schedule: - interval: "daily" + interval: "weekly" - package-ecosystem: "docker" # See documentation for possible values directory: "/src/server-rm" # Location of package manifests schedule: - interval: "daily" + interval: "weekly" - package-ecosystem: "docker" # See documentation for possible values directory: "/src/server-qm" # Location of package manifests schedule: - interval: "daily" + interval: "weekly" - package-ecosystem: "github-actions" # See documentation for possible values directory: "/" # Location of package manifests open-pull-requests-limit: 30 schedule: - interval: "daily" + interval: "weekly" diff --git a/.github/workflows/maven-acceptance-manual.yml b/.github/workflows/maven-acceptance-manual.yml index 0be0f119..bc69ba93 100644 --- a/.github/workflows/maven-acceptance-manual.yml +++ b/.github/workflows/maven-acceptance-manual.yml @@ -10,15 +10,18 @@ on: lyoBranch: description: 'Lyo branch to test on' required: true - default: 'master' + default: 'main' lyoRepo: description: 'Lyo repository or fork' required: true - default: 'eclipse/lyo' + default: 'eclipse-lyo/lyo' comment: description: 'comment, e.g. PR number' default: 'n/a' +permissions: + contents: read + concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.lyoRepo }}-${{ github.event.inputs.lyoBranch }} cancel-in-progress: false @@ -43,29 +46,47 @@ jobs: continue-on-error: ${{ matrix.experimental }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: "${{ github.event.inputs.lyoRepo }}" ref: "${{ github.event.inputs.lyoBranch }}" path: lyo-trunk - - uses: actions/checkout@v7 + persist-credentials: false + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: path: main + persist-credentials: false - name: Set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v6 + uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.jdk }} - - uses: actions/cache@v6 + - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6 with: path: ~/.m2/repository key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven- - name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }}) - run: mvn -B clean install --file lyo-trunk/pom.xml -DskipTests -Dmaven.javadoc.skip=true -P '!spotless' -P'!spotbugs' + run: mvn -B --no-transfer-progress clean install --file lyo-trunk/pom.xml -P '!spotbugs,!spotless,!enforcer' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dcyclonedx.skip=true + - name: Detect checked-out Lyo version + id: lyo-version + working-directory: ${{ github.workspace }} + shell: bash + run: | + mvn -B --no-transfer-progress --non-recursive --file lyo-trunk/pom.xml \ + org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \ + -Dexpression=project.version -Doutput="$RUNNER_TEMP/lyo-version.txt" + lyo_version="$(cat "$RUNNER_TEMP/lyo-version.txt")" + if [[ ! "$lyo_version" =~ ^[0-9][A-Za-z0-9._-]*$ ]]; then + echo "Invalid Lyo version: $lyo_version" >&2 + exit 1 + fi + printf 'version=%s\n' "$lyo_version" >> "$GITHUB_OUTPUT" - name: Run tests on RefImpl - run: mvn -B -Pacceptance clean verify --file main/src/pom.xml + env: + LYO_VERSION: ${{ steps.lyo-version.outputs.version }} + run: mvn -B -Pacceptance clean verify --file main/src/pom.xml "-Dversion.lyo=$LYO_VERSION" docker-compose-e2e: @@ -93,29 +114,47 @@ jobs: continue-on-error: ${{ matrix.experimental }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: "${{ github.event.inputs.lyoRepo }}" ref: "${{ github.event.inputs.lyoBranch }}" path: lyo-trunk - - uses: actions/checkout@v7 + persist-credentials: false + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: path: main + persist-credentials: false - name: Set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v6 + uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.jdk }} - - uses: actions/cache@v6 + - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6 with: path: ~/.m2/repository key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven- - name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }}) - run: mvn -B clean install --file lyo-trunk/pom.xml -DskipTests -Dmaven.javadoc.skip=true -P '!spotless' + run: mvn -B --no-transfer-progress clean install --file lyo-trunk/pom.xml -P '!spotbugs,!spotless,!enforcer' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dcyclonedx.skip=true + - name: Detect checked-out Lyo version + id: lyo-version + working-directory: ${{ github.workspace }} + shell: bash + run: | + mvn -B --no-transfer-progress --non-recursive --file lyo-trunk/pom.xml \ + org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \ + -Dexpression=project.version -Doutput="$RUNNER_TEMP/lyo-version.txt" + lyo_version="$(cat "$RUNNER_TEMP/lyo-version.txt")" + if [[ ! "$lyo_version" =~ ^[0-9][A-Za-z0-9._-]*$ ]]; then + echo "Invalid Lyo version: $lyo_version" >&2 + exit 1 + fi + printf 'version=%s\n' "$lyo_version" >> "$GITHUB_OUTPUT" - name: Build with Maven - run: mvn -B package --file main/src/pom.xml + env: + LYO_VERSION: ${{ steps.lyo-version.outputs.version }} + run: mvn -B package --file main/src/pom.xml "-Dversion.lyo=$LYO_VERSION" - name: Build and Start Docker Compose working-directory: main/src/ run: | @@ -156,20 +195,22 @@ jobs: continue-on-error: ${{ matrix.experimental }} steps: - - uses: actions/checkout@v7 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: "${{ github.event.inputs.lyoRepo }}" ref: "${{ github.event.inputs.lyoBranch }}" path: lyo-trunk - - uses: actions/checkout@v7 + persist-credentials: false + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: path: main + persist-credentials: false - name: Set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v6 + uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.jdk }} - - uses: actions/cache@v6 + - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6 with: path: ~/.m2/repository key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }} @@ -177,10 +218,26 @@ jobs: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven- - name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }}) working-directory: lyo-trunk/ - run: mvn -B clean install -DskipTests -Dmaven.javadoc.skip=true -P '!spotless' + run: mvn -B --no-transfer-progress clean install -P '!spotbugs,!spotless,!enforcer' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dcyclonedx.skip=true + - name: Detect checked-out Lyo version + id: lyo-version + working-directory: ${{ github.workspace }} + shell: bash + run: | + mvn -B --no-transfer-progress --non-recursive --file lyo-trunk/pom.xml \ + org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \ + -Dexpression=project.version -Doutput="$RUNNER_TEMP/lyo-version.txt" + lyo_version="$(cat "$RUNNER_TEMP/lyo-version.txt")" + if [[ ! "$lyo_version" =~ ^[0-9][A-Za-z0-9._-]*$ ]]; then + echo "Invalid Lyo version: $lyo_version" >&2 + exit 1 + fi + printf 'version=%s\n' "$lyo_version" >> "$GITHUB_OUTPUT" - name: Build with Maven + env: + LYO_VERSION: ${{ steps.lyo-version.outputs.version }} working-directory: main/src/ - run: mvn -B package -Pwith-jstl-impl + run: mvn -B package -Pwith-jstl-impl "-Dversion.lyo=$LYO_VERSION" - name: Build and Start Docker Compose working-directory: main/src/ run: | diff --git a/.github/workflows/maven-acceptance-wide.yml b/.github/workflows/maven-acceptance-wide.yml index 4420db18..acc61ef1 100644 --- a/.github/workflows/maven-acceptance-wide.yml +++ b/.github/workflows/maven-acceptance-wide.yml @@ -4,9 +4,9 @@ name: CI acceptance tests (more JDKs) on: - schedule: - # run integration tests every Thursday - - cron: "31 06 * * 4" + # schedule: + # # run integration tests every Thursday + # - cron: "31 06 * * 4" workflow_dispatch: concurrency: diff --git a/src/refimpl-tests/pom.xml b/src/refimpl-tests/pom.xml index 4fdbbafb..e11d054d 100644 --- a/src/refimpl-tests/pom.xml +++ b/src/refimpl-tests/pom.xml @@ -90,13 +90,13 @@ org.eclipse.lyo.trs trs-client - 7.0.0-SNAPSHOT + ${version.lyo} test org.eclipse.lyo oslc-domains - 7.0.0-SNAPSHOT + ${version.lyo} test diff --git a/src/server-am/pom.xml b/src/server-am/pom.xml index a797e66e..f278a084 100644 --- a/src/server-am/pom.xml +++ b/src/server-am/pom.xml @@ -23,7 +23,6 @@ UTF-8 UTF-8 21 - 7.0.0-SNAPSHOT 5.33.2 8803 / @@ -31,6 +30,7 @@ + 7.0.0-SNAPSHOT @@ -267,7 +267,7 @@ org.eclipse.lyo oslc-domains - 7.0.0-SNAPSHOT + ${version.lyo} diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml index 431d9655..b6da8887 100644 --- a/src/server-cm/pom.xml +++ b/src/server-cm/pom.xml @@ -23,7 +23,6 @@ UTF-8 UTF-8 21 - 7.0.0-SNAPSHOT 5.33.2 8801 / @@ -31,6 +30,7 @@ + 7.0.0-SNAPSHOT @@ -262,7 +262,7 @@ org.eclipse.lyo oslc-domains - 7.0.0-SNAPSHOT + ${version.lyo} diff --git a/src/server-qm/pom.xml b/src/server-qm/pom.xml index 9c2e95bb..386346ec 100644 --- a/src/server-qm/pom.xml +++ b/src/server-qm/pom.xml @@ -23,7 +23,6 @@ UTF-8 UTF-8 21 - 7.0.0-SNAPSHOT 5.33.2 8802 / @@ -31,6 +30,7 @@ + 7.0.0-SNAPSHOT @@ -262,7 +262,7 @@ org.eclipse.lyo oslc-domains - 7.0.0-SNAPSHOT + ${version.lyo} diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml index 5443de3d..849fc5e6 100644 --- a/src/server-rm/pom.xml +++ b/src/server-rm/pom.xml @@ -24,7 +24,6 @@ UTF-8 UTF-8 21 - 7.0.0-SNAPSHOT 5.33.2 8800 / @@ -32,6 +31,7 @@ + 7.0.0-SNAPSHOT 10.3.1 6.3.0 From 7a0284844c1aca20d2dea6022c46b8e3d6e151d8 Mon Sep 17 00:00:00 2001 From: Andrii Berezovskyi Date: Sun, 1 Nov 2026 00:21:16 +0100 Subject: [PATCH 2/2] Rely on Lyo BOM dependency versions and preserve property locations Signed-off-by: Andrii Berezovskyi --- src/refimpl-tests/pom.xml | 2 -- src/server-am/pom.xml | 3 +-- src/server-cm/pom.xml | 3 +-- src/server-qm/pom.xml | 3 +-- src/server-rm/pom.xml | 3 +-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/refimpl-tests/pom.xml b/src/refimpl-tests/pom.xml index e11d054d..e0799843 100644 --- a/src/refimpl-tests/pom.xml +++ b/src/refimpl-tests/pom.xml @@ -90,13 +90,11 @@ org.eclipse.lyo.trs trs-client - ${version.lyo} test org.eclipse.lyo oslc-domains - ${version.lyo} test diff --git a/src/server-am/pom.xml b/src/server-am/pom.xml index f278a084..e5642e66 100644 --- a/src/server-am/pom.xml +++ b/src/server-am/pom.xml @@ -23,6 +23,7 @@ UTF-8 UTF-8 21 + 7.0.0-SNAPSHOT 5.33.2 8803 / @@ -30,7 +31,6 @@ - 7.0.0-SNAPSHOT @@ -267,7 +267,6 @@ org.eclipse.lyo oslc-domains - ${version.lyo} diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml index b6da8887..951a5c07 100644 --- a/src/server-cm/pom.xml +++ b/src/server-cm/pom.xml @@ -23,6 +23,7 @@ UTF-8 UTF-8 21 + 7.0.0-SNAPSHOT 5.33.2 8801 / @@ -30,7 +31,6 @@ - 7.0.0-SNAPSHOT @@ -262,7 +262,6 @@ org.eclipse.lyo oslc-domains - ${version.lyo} diff --git a/src/server-qm/pom.xml b/src/server-qm/pom.xml index 386346ec..2bea6ad1 100644 --- a/src/server-qm/pom.xml +++ b/src/server-qm/pom.xml @@ -23,6 +23,7 @@ UTF-8 UTF-8 21 + 7.0.0-SNAPSHOT 5.33.2 8802 / @@ -30,7 +31,6 @@ - 7.0.0-SNAPSHOT @@ -262,7 +262,6 @@ org.eclipse.lyo oslc-domains - ${version.lyo} diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml index 849fc5e6..db98eda7 100644 --- a/src/server-rm/pom.xml +++ b/src/server-rm/pom.xml @@ -24,6 +24,7 @@ UTF-8 UTF-8 21 + 7.0.0-SNAPSHOT 5.33.2 8800 / @@ -31,7 +32,6 @@ - 7.0.0-SNAPSHOT 10.3.1 6.3.0