diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 715d7525fa..1acc3c74e2 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 }} @@ -9,7 +11,7 @@ jobs: matrix: cache: [maven] distribution: [temurin] - java: [17, 21, 23, 24-ea] + java: [17, 21, 24, 25-ea] os: [macos-latest, ubuntu-latest, windows-latest] fail-fast: false max-parallel: 4 diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 50a5b42388..3040637b68 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -31,8 +31,8 @@ jobs: uses: actions/setup-java@v4 with: cache: maven - java-version: 21 distribution: 'temurin' + java-version: 21 - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 297681d58d..94480dd396 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: coveralls: if: github.repository_owner == 'mybatis' diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index 9b99a2b626..99583387a6 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,7 +23,6 @@ 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 @@ -28,4 +30,3 @@ jobs: with: branch: gh-pages folder: target/staging - ssh-key: ${{ secrets.DEPLOY_KEY }} diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 7fda0dbe1b..ca15fbdced 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 c3d8119e13..da1d658141 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/.mvn/extensions.xml b/.mvn/extensions.xml index 8a33a856cd..b6c32576a7 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -20,6 +20,6 @@ fr.jcgay.maven maven-profiler - 3.2 + 3.3 diff --git a/.mvn/settings.xml b/.mvn/settings.xml index 503a653bd5..b8e9a63f79 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}