From 89c173c28530a7fde02779af554e17708939c04d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 25 Aug 2024 14:19:39 -0400 Subject: [PATCH 01/11] [pom] Update coyote module ffm now --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24eb1feb..0ffe8703 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ - org.apache.tomcat:tomcat-coyote + org.apache.tomcat:tomcat-coyote-ffm org.apache.tomcat.embed:tomcat-embed-core From 31209591f95786dd55be1c76d633c05ece610fd0 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Tue, 24 Sep 2024 21:21:59 -0400 Subject: [PATCH 02/11] [GHA] Use jdk 21 with codesql --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0b90f6ab..35ec64ea 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -53,7 +53,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' # Initializes the CodeQL tools for scanning. From 1c5bef8c48f3123cb78a3cab247d0438ca8de67a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 3 May 2025 15:24:24 -0400 Subject: [PATCH 03/11] [gha] Drop jdk 23, use 24 ga --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 41a265e9..5cc529b4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: matrix: cache: [maven] distribution: [temurin] - java: [17, 21, 23, 24-ea] + java: [17, 21, 24, 25-ea] os: [ubuntu-latest, macos-latest, windows-latest] fail-fast: false max-parallel: 4 From 8d01036dd60b9e5156bc5140f41327a408e3db0c Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 3 May 2025 15:24:55 -0400 Subject: [PATCH 04/11] [mvn] Update for central --- .mvn/settings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.mvn/settings.xml b/.mvn/settings.xml index 28c58f67..70f3e5b5 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -22,7 +22,7 @@ - ossrh + central ${env.CI_DEPLOY_USERNAME} ${env.CI_DEPLOY_PASSWORD} @@ -39,7 +39,6 @@ github - ${env.CI_DEPLOY_USERNAME} ${env.GITHUB_TOKEN} From b2321d37035f498b7ce4e360ccec2cfba3b1fc4a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 3 May 2025 15:25:05 -0400 Subject: [PATCH 05/11] [mvn] Bump maven profiler to 3.3 --- .mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 97568c92..8d66e4ce 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -20,6 +20,6 @@ fr.jcgay.maven maven-profiler - 3.2 + 3.3 From 53d493e025eb7716bb65550207ad93352adce2a8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 3 May 2025 15:25:23 -0400 Subject: [PATCH 06/11] [gha] Cleanup site action and fix for this project due to maven bug --- .github/workflows/site.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index 5d699801..22df5576 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -5,6 +5,9 @@ on: branches: - site +permissions: + contents: write + jobs: build: if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') @@ -20,12 +23,10 @@ jobs: - name: Build site run: ./mvnw site site:stage -DskipTests -Dlicense.skip=true -B -V --no-transfer-progress --settings ./.mvn/settings.xml env: - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - name: Deploy Site to gh-pages uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages - folder: target/staging - ssh-key: ${{ secrets.DEPLOY_KEY }} + folder: target/spring-boot-starter.git From f54464bdaa93dfa1f9757d4fe446cd37a0f67d9a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 26 May 2025 21:27:02 -0400 Subject: [PATCH 07/11] [gha] Add explicit permissions --- .github/workflows/ci.yaml | 2 ++ .github/workflows/coveralls.yaml | 2 ++ .github/workflows/sonar.yaml | 2 ++ .github/workflows/sonatype.yaml | 2 ++ .github/workflows/support.yaml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5cc529b4..6df21c05 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,6 +2,8 @@ name: Java CI on: [workflow_dispatch, push, pull_request] +permissions: read-all + jobs: test: runs-on: ${{ matrix.os }} diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 270a6c85..b4aaaa99 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -2,6 +2,8 @@ name: Coveralls on: [push, pull_request] +permissions: read-all + jobs: build: if: github.repository_owner == 'mybatis' diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 698036e9..a608e6d2 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -5,6 +5,8 @@ on: branches: - master +permissions: read-all + jobs: build: if: github.repository_owner == 'mybatis' diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 494bb2f4..c922f382 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -5,6 +5,8 @@ on: branches: - master +permissions: read-all + jobs: build: if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') diff --git a/.github/workflows/support.yaml b/.github/workflows/support.yaml index f3665471..9e1690e9 100644 --- a/.github/workflows/support.yaml +++ b/.github/workflows/support.yaml @@ -18,6 +18,8 @@ name: Spring Boot Support Samples on: [push, pull_request] +permissions: read-all + jobs: test: runs-on: ${{ matrix.os }} From b71ad8c8769aaf6b9e0c7036f1ab17efe173d72f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 26 May 2025 21:27:16 -0400 Subject: [PATCH 08/11] [gha] Cleanup codeql --- .github/workflows/codeql.yml | 93 ++++++++++-------------------------- 1 file changed, 26 insertions(+), 67 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 35ec64ea..50035648 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,90 +1,49 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL" on: push: - branches: [ "master" ] + branches: [ master ] pull_request: - branches: [ "master" ] + branches: [ master ] schedule: - cron: '45 13 * * 3' jobs: analyze: name: Analyze - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners - # Consider using larger runners for possible analysis time improvements. runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} permissions: - # required for all workflows - security-events: write - - # only required for workflows in private repositories actions: read contents: read + security-events: write strategy: fail-fast: false matrix: language: [ 'java-kotlin' ] - # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] - # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Setup Java - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: 'temurin' - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 - with: - category: "/language:${{matrix.language}}" + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Java + uses: actions/setup-java@v4 + with: + cache: maven + distribution: 'temurin' + java-version: 21 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + queries: +security-and-quality + + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{ matrix.language }}" From e4146e159c7f6d922122d30370c0d38654c3cf04 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 26 May 2025 21:37:59 -0400 Subject: [PATCH 09/11] [ci] formatting --- .mvn/extensions.xml | 2 +- .mvn/settings.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 8d66e4ce..4b143af9 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@