From 61f910ac0780d654c7b912ea44da796ad6abefc7 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 30 Oct 2026 12:52:32 +0100 Subject: [PATCH] chore(ci): build and publish with Temurin JDK for eMudhra CA compromise Backport of #315 to the v2.0.16 maintenance branch. Floating Liberica 21 resolves to 21.0.13+11, which still trusts the compromised eMudhra intermediates; Temurin 21 floats to 21.0.13+9, which does not. --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/gitflow-hotfix-finish.yml | 6 +++--- .github/workflows/gitflow-release-finish.yml | 8 ++++---- .github/workflows/hotfix-finish.yml | 2 +- .github/workflows/hotfix-manual.yml | 2 +- .github/workflows/maven-jreleaser-release.yml | 2 +- .github/workflows/release-finish.yml | 2 +- .github/workflows/release-manual.yml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 615e2cce..aefa1bcb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: 17 - distribution: liberica + distribution: temurin - name: Cache Maven dependencies uses: actions/cache@v5 with: @@ -76,5 +76,5 @@ jobs: snapshot: true skip_version_update: true java_version: 11 - java_distribution: liberica + java_distribution: temurin secrets: inherit \ No newline at end of file diff --git a/.github/workflows/gitflow-hotfix-finish.yml b/.github/workflows/gitflow-hotfix-finish.yml index 9f0c8970..b618fdc3 100644 --- a/.github/workflows/gitflow-hotfix-finish.yml +++ b/.github/workflows/gitflow-hotfix-finish.yml @@ -26,7 +26,7 @@ on: description: 'Java distribution to use' required: false type: string - default: "liberica" + default: "temurin" version_tag_prefix: description: 'Prefix for version tags' required: false @@ -73,7 +73,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: ${{ inputs.java_version || 21 }} - distribution: ${{ inputs.java_distribution || 'liberica' }} + distribution: ${{ inputs.java_distribution || 'temurin' }} - name: Get hotfix version id: get_version @@ -131,7 +131,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: ${{ inputs.java_version || 21 }} - distribution: ${{ inputs.java_distribution || 'liberica' }} + distribution: ${{ inputs.java_distribution || 'temurin' }} cache: maven - name: Install xmlstarlet diff --git a/.github/workflows/gitflow-release-finish.yml b/.github/workflows/gitflow-release-finish.yml index 952139a7..b072fc37 100644 --- a/.github/workflows/gitflow-release-finish.yml +++ b/.github/workflows/gitflow-release-finish.yml @@ -30,7 +30,7 @@ on: description: 'Java distribution to use' required: false type: string - default: "liberica" + default: "temurin" version_tag_prefix: description: 'Prefix for version tags' required: false @@ -77,7 +77,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: ${{ inputs.java_version || 21 }} - distribution: ${{ inputs.java_distribution || 'liberica' }} + distribution: ${{ inputs.java_distribution || 'temurin' }} - name: Get release version id: get_version @@ -135,7 +135,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: ${{ inputs.java_version || 21 }} - distribution: ${{ inputs.java_distribution || 'liberica' }} + distribution: ${{ inputs.java_distribution || 'temurin' }} cache: maven - name: Install xmlstarlet @@ -214,7 +214,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: ${{ inputs.java_version || 21 }} - distribution: ${{ inputs.java_distribution || 'liberica' }} + distribution: ${{ inputs.java_distribution || 'temurin' }} - name: Calculate next development version id: next_version diff --git a/.github/workflows/hotfix-finish.yml b/.github/workflows/hotfix-finish.yml index 740d36aa..5457e984 100644 --- a/.github/workflows/hotfix-finish.yml +++ b/.github/workflows/hotfix-finish.yml @@ -22,7 +22,7 @@ jobs: base_branch: master runner: ubuntu-24.04 java_version: 11 - java_distribution: liberica + java_distribution: temurin version_tag_prefix: v artifact_group_id: org.entur artifact_ids: netex-java-model diff --git a/.github/workflows/hotfix-manual.yml b/.github/workflows/hotfix-manual.yml index f8ed3e3d..f073eaf1 100644 --- a/.github/workflows/hotfix-manual.yml +++ b/.github/workflows/hotfix-manual.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: 11 - distribution: liberica + distribution: temurin cache: maven - name: Install xmlstarlet diff --git a/.github/workflows/maven-jreleaser-release.yml b/.github/workflows/maven-jreleaser-release.yml index 3f038dab..8809c10d 100644 --- a/.github/workflows/maven-jreleaser-release.yml +++ b/.github/workflows/maven-jreleaser-release.yml @@ -26,7 +26,7 @@ on: description: "Java distribution for Setup-Java" required: false type: string - default: "liberica" + default: "temurin" version: description: "The version to release (e.g., '1.3.0' or '1.3.0-SNAPSHOT'). This is required for this standalone workflow." required: true diff --git a/.github/workflows/release-finish.yml b/.github/workflows/release-finish.yml index f93f24b0..a5a6101d 100644 --- a/.github/workflows/release-finish.yml +++ b/.github/workflows/release-finish.yml @@ -31,7 +31,7 @@ jobs: base_branch: master runner: ubuntu-24.04 java_version: 11 - java_distribution: liberica + java_distribution: temurin version_tag_prefix: v artifact_group_id: org.entur artifact_ids: netex-java-model diff --git a/.github/workflows/release-manual.yml b/.github/workflows/release-manual.yml index 11f4c473..41defe5c 100644 --- a/.github/workflows/release-manual.yml +++ b/.github/workflows/release-manual.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/setup-java@v4 with: java-version: 11 - distribution: liberica + distribution: temurin cache: maven - name: Install xmlstarlet