Merge pull request #1098 from hazendaz/master

Build Updates

Author: hazendaz

.github/workflows/ci.yaml

@@ -2,14 +2,16 @@ name: Java CI
 
 on: [workflow_dispatch, push, pull_request]
 
+permissions: read-all
+
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       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

.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

.github/workflows/coveralls.yaml

@@ -2,6 +2,8 @@ name: Coveralls
 
 on: [push, pull_request]
 
+permissions: read-all
+
 jobs:
   coveralls:
     if: github.repository_owner == 'mybatis'

.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 }}

.github/workflows/sonar.yaml

@@ -5,6 +5,8 @@ on:
     branches:
       - master
 
+permissions: read-all
+
 jobs:
   build:
     if: github.repository_owner == 'mybatis'

.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]')

.mvn/extensions.xml

@@ -20,6 +20,6 @@
     <extension>
       <groupId>fr.jcgay.maven</groupId>
       <artifactId>maven-profiler</artifactId>
-      <version>3.2</version>
+      <version>3.3</version>
     </extension>
 </extensions>

.mvn/settings.xml

@@ -22,7 +22,7 @@
   <servers>
     <!-- Used for sonatype snapshots and releases -->
     <server>
-      <id>ossrh</id>
+      <id>central</id>
       <username>${env.CI_DEPLOY_USERNAME}</username>
       <password>${env.CI_DEPLOY_PASSWORD}</password>
     </server>
@@ -39,7 +39,6 @@
     <!-- Github deployments (site) -->
     <server>
       <id>github</id>
-      <username>${env.CI_DEPLOY_USERNAME}</username>
       <password>${env.GITHUB_TOKEN}</password>
     </server>