From 587021a130aa2d09378ae4836a07e30a9a001185 Mon Sep 17 00:00:00 2001 From: Damian Jankowski Date: Tue, 7 Apr 2026 11:07:49 +0200 Subject: [PATCH 1/2] Update gh actions --- .github/actions/action.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/maven-pulls.yml | 6 +++--- .github/workflows/maven-v1-pulls.yml | 8 ++++---- .github/workflows/maven-v1.yml | 8 ++++---- .github/workflows/maven.yml | 8 ++++---- .github/workflows/next-snapshot-v1.yml | 12 ++++++------ .github/workflows/next-snapshot.yml | 12 ++++++------ .github/workflows/prepare-release-v1.yml | 10 +++++----- .github/workflows/prepare-release.yml | 10 +++++----- .github/workflows/release-v1.yml | 10 +++++----- .github/workflows/release.yml | 10 +++++----- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/actions/action.yml b/.github/actions/action.yml index b7f56fcb89..f6a622c32a 100644 --- a/.github/actions/action.yml +++ b/.github/actions/action.yml @@ -27,9 +27,9 @@ runs: shell: bash - name: Build Java if: steps.java-version == null || steps.java-version < 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: - distribution: 'zulu' + distribution: temurin java-version: '11' - name: Download JAR run: curl -L 'https://repository.sonatype.org/service/local/artifact/maven/content?r=central-proxy&g=io.swagger.parser.v3&a=swagger-parser-cli&e=jar&v=${{ inputs.parserVersion }}' -o swagger-parser-cli.jar diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9283ea245c..21f87f428d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -29,7 +29,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 # Override language selection by uncommenting this and choosing your languages with: languages: java @@ -37,7 +37,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3 + uses: github/codeql-action/autobuild@v4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -51,4 +51,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index f67f5a42c2..dcec25ecdd 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Dependency Review uses: actions/dependency-review-action@v3 with: diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml index 847110e2a9..3bca32efa7 100644 --- a/.github/workflows/maven-pulls.yml +++ b/.github/workflows/maven-pulls.yml @@ -13,9 +13,9 @@ jobs: java: [ 11, 17 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} distribution: temurin @@ -23,7 +23,7 @@ jobs: server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven-v1-pulls.yml b/.github/workflows/maven-v1-pulls.yml index 1c077fd617..56b5a0aa30 100644 --- a/.github/workflows/maven-v1-pulls.yml +++ b/.github/workflows/maven-v1-pulls.yml @@ -13,14 +13,14 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} - distribution: 'zulu' + distribution: temurin - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven-v1.yml b/.github/workflows/maven-v1.yml index 4646419134..85041a48c5 100644 --- a/.github/workflows/maven-v1.yml +++ b/.github/workflows/maven-v1.yml @@ -13,17 +13,17 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} - distribution: 'zulu' + distribution: temurin server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1078ae9abd..68d0bbba56 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,17 +13,17 @@ jobs: java: [ 11, 17 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} - distribution: 'temurin' + distribution: temurin server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/next-snapshot-v1.yml b/.github/workflows/next-snapshot-v1.yml index fa8ee06613..df771896bc 100644 --- a/.github/workflows/next-snapshot-v1.yml +++ b/.github/workflows/next-snapshot-v1.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: tibdex/github-app-token@v1 + - uses: actions/checkout@v6 + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.APP_ID }} @@ -21,15 +21,15 @@ jobs: with: python-version: '3.10' - name: Set up Java 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: 8 - distribution: 'zulu' + distribution: temurin server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -58,7 +58,7 @@ jobs: git config --global hub.protocol https git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/swagger-api/swagger-parser.git - name: Checkout v1 - uses: actions/checkout@v2 + uses: actions/checkout@v6 with: ref: "v1" fetch-depth: 0 diff --git a/.github/workflows/next-snapshot.yml b/.github/workflows/next-snapshot.yml index 114b18f749..40213a2f62 100644 --- a/.github/workflows/next-snapshot.yml +++ b/.github/workflows/next-snapshot.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: tibdex/github-app-token@v1 + - uses: actions/checkout@v6 + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.APP_ID }} @@ -21,15 +21,15 @@ jobs: with: python-version: '3.10' - name: Set up Java 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 - distribution: 'temurin' + distribution: temurin server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -58,7 +58,7 @@ jobs: git config --global hub.protocol https git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/swagger-api/swagger-parser.git - name: Checkout master - uses: actions/checkout@v2 + uses: actions/checkout@v6 with: ref: "master" fetch-depth: 0 diff --git a/.github/workflows/prepare-release-v1.yml b/.github/workflows/prepare-release-v1.yml index 398f728a3e..cab5a3bf90 100644 --- a/.github/workflows/prepare-release-v1.yml +++ b/.github/workflows/prepare-release-v1.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: tibdex/github-app-token@v1 + - uses: actions/checkout@v6 + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.APP_ID }} @@ -21,15 +21,15 @@ jobs: with: python-version: '3.10' - name: Set up Java 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: 8 - distribution: 'zulu' + distribution: temurin server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 182f4ec957..f3bb41bcd0 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: tibdex/github-app-token@v1 + - uses: actions/checkout@v6 + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.APP_ID }} @@ -21,15 +21,15 @@ jobs: with: python-version: '3.10' - name: Set up Java 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 - distribution: 'temurin' + distribution: temurin server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/release-v1.yml b/.github/workflows/release-v1.yml index 6731b061e6..0a1ef75768 100644 --- a/.github/workflows/release-v1.yml +++ b/.github/workflows/release-v1.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: tibdex/github-app-token@v1 + - uses: actions/checkout@v6 + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.APP_ID }} @@ -21,15 +21,15 @@ jobs: with: python-version: '3.10' - name: Set up Java 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v5 with: java-version: 8 - distribution: 'zulu' + distribution: temurin server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f3bb0d867..7c3d15d56e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: tibdex/github-app-token@v1 + - uses: actions/checkout@v6 + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.APP_ID }} @@ -21,16 +21,16 @@ jobs: with: python-version: '3.10' - name: Set up Java 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 11 - distribution: 'temurin' + distribution: temurin server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }} - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 26ac9edba9739f5ee624ffd95eacf4bf51401f3f Mon Sep 17 00:00:00 2001 From: Damian Jankowski Date: Tue, 7 Apr 2026 15:21:57 +0200 Subject: [PATCH 2/2] Revert maven-pulls changes to see if UT would fail --- .github/workflows/codeql-analysis.yml | 5 ----- .github/workflows/maven-pulls.yml | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 21f87f428d..c3260e4097 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -22,11 +22,6 @@ jobs: # a pull request then we can checkout the head. fetch-depth: 2 - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v4 diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml index 3bca32efa7..847110e2a9 100644 --- a/.github/workflows/maven-pulls.yml +++ b/.github/workflows/maven-pulls.yml @@ -13,9 +13,9 @@ jobs: java: [ 11, 17 ] steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: temurin @@ -23,7 +23,7 @@ jobs: server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository - uses: actions/cache@v5 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}