diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d5a23da975..715d7525fa 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,19 +9,19 @@ jobs:
       matrix:
         cache: [maven]
         distribution: [temurin]
-        java: [17, 21, 22, 23-ea]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        java: [17, 21, 23, 24-ea]
+        os: [macos-latest, ubuntu-latest, windows-latest]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
+      - name: Setup Java ${{ matrix.java }} ${{ matrix.distribution }}
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
-          distribution: ${{ matrix.distribution }}
           cache: ${{ matrix.cache }}
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java }}
       - name: Test with Maven
         run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true"
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
new file mode 100644
index 0000000000..50a5b42388
--- /dev/null
+++ b/.github/workflows/codeql.yaml
@@ -0,0 +1,49 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  schedule:
+    - cron: '37 14 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ java-kotlin ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          cache: maven
+          java-version: 21
+          distribution: 'temurin'
+
+      - 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 }}"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index 4f13b7e031..0000000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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" ]
-  pull_request:
-    branches: [ "master" ]
-  schedule:
-    - cron: '37 14 * * 6'
-
-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
-
-    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: 17
-        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}}"
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index 270a6c85be..297681d58d 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -3,12 +3,12 @@ name: Coveralls
 on: [push, pull_request]
 
 jobs:
-  build:
+  coveralls:
     if: github.repository_owner == 'mybatis'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
           cache: maven
diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
index 5d6998019f..9b99a2b626 100644
--- a/.github/workflows/site.yaml
+++ b/.github/workflows/site.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
           cache: maven
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 2df4e0f388..7fda0dbe1b 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -14,14 +14,14 @@ jobs:
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
           cache: maven
           distribution: temurin
           java-version: 21
       - name: Analyze with SonarCloud
-        run: ./mvnw verify jacoco:report sonar:sonar -B -V -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
+        run: ./mvnw verify jacoco:report sonar:sonar -B -V -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress -Dsonar.scanner.skipJreProvisioning=true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index 494bb2f4c7..c3d8119e13 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
           cache: maven
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index aeaad3ef68..8a33a856cd 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2024 the original author or authors.
+    Copyright 2010-2025 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index 13cc3f6222..503a653bd5 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2024 the original author or authors.
+    Copyright 2010-2025 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index bdf0ddfa6e..9439f285a5 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -25,7 +25,6 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -46,7 +45,7 @@ public static void main(String[] args) {
             log(" - Downloader started");
             final URL wrapperUrl = URI.create(args[0]).toURL();
             final String jarPath = args[1].replace("..", ""); // Sanitize path
-            final Path wrapperJarPath = Paths.get(jarPath).toAbsolutePath().normalize();
+            final Path wrapperJarPath = Path.of(jarPath).toAbsolutePath().normalize();
             downloadFileFromURL(wrapperUrl, wrapperJarPath);
             log("Done");
         } catch (IOException e) {
diff --git a/pom.xml b/pom.xml
index 56a33d5a68..c8f1c16baf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2024 the original author or authors.
+    Copyright 2010-2025 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/site/site.xml b/src/site/site.xml
index 2c5f8e5ef5..7f2132dc36 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2022 the original author or authors.
+    Copyright 2010-2025 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -45,4 +45,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/test/resources/org/mybatis/spring/annotation/override.properties b/src/test/resources/org/mybatis/spring/annotation/override.properties
index 1806d7d61f..10239f89cf 100644
--- a/src/test/resources/org/mybatis/spring/annotation/override.properties
+++ b/src/test/resources/org/mybatis/spring/annotation/override.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2024 the original author or authors.
+# Copyright 2010-2025 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-myBean.name=MyBean!!
\ No newline at end of file
+myBean.name=MyBean!!
diff --git a/src/test/resources/org/mybatis/spring/annotation/scan.properties b/src/test/resources/org/mybatis/spring/annotation/scan.properties
index abee1ba878..72055a9304 100644
--- a/src/test/resources/org/mybatis/spring/annotation/scan.properties
+++ b/src/test/resources/org/mybatis/spring/annotation/scan.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2024 the original author or authors.
+# Copyright 2010-2025 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-mybatis.lazy-initialization=true
\ No newline at end of file
+mybatis.lazy-initialization=true
diff --git a/src/test/resources/org/mybatis/spring/config/default-scope.properties b/src/test/resources/org/mybatis/spring/config/default-scope.properties
index f6cd55d65c..c87bbdeb7e 100644
--- a/src/test/resources/org/mybatis/spring/config/default-scope.properties
+++ b/src/test/resources/org/mybatis/spring/config/default-scope.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2024 the original author or authors.
+# Copyright 2010-2025 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-mybatis.default-scope=thread
\ No newline at end of file
+mybatis.default-scope=thread
diff --git a/src/test/resources/org/mybatis/spring/config/lazy.properties b/src/test/resources/org/mybatis/spring/config/lazy.properties
index abee1ba878..72055a9304 100644
--- a/src/test/resources/org/mybatis/spring/config/lazy.properties
+++ b/src/test/resources/org/mybatis/spring/config/lazy.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2024 the original author or authors.
+# Copyright 2010-2025 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-mybatis.lazy-initialization=true
\ No newline at end of file
+mybatis.lazy-initialization=true
diff --git a/src/test/resources/org/mybatis/spring/config/override.properties b/src/test/resources/org/mybatis/spring/config/override.properties
index 1806d7d61f..10239f89cf 100644
--- a/src/test/resources/org/mybatis/spring/config/override.properties
+++ b/src/test/resources/org/mybatis/spring/config/override.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2024 the original author or authors.
+# Copyright 2010-2025 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-myBean.name=MyBean!!
\ No newline at end of file
+myBean.name=MyBean!!
diff --git a/src/test/resources/org/mybatis/spring/filter/config/application.properties b/src/test/resources/org/mybatis/spring/filter/config/application.properties
index 80036de558..0d07a113ed 100644
--- a/src/test/resources/org/mybatis/spring/filter/config/application.properties
+++ b/src/test/resources/org/mybatis/spring/filter/config/application.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2024 the original author or authors.
+# Copyright 2010-2025 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 #
 
 exclude-filters.regex=org\.mybatis\.spring\.filter\.datasource\.datasource1\..*
-exclude-filters.aspectj=*..CommonDataSourceMapper
\ No newline at end of file
+exclude-filters.aspectj=*..CommonDataSourceMapper
diff --git a/src/test/resources/org/mybatis/spring/filter/xml/default.properties b/src/test/resources/org/mybatis/spring/filter/xml/default.properties
index 0502d171b6..6effd30b64 100644
--- a/src/test/resources/org/mybatis/spring/filter/xml/default.properties
+++ b/src/test/resources/org/mybatis/spring/filter/xml/default.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2024 the original author or authors.
+# Copyright 2010-2025 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 
 filter.custom=org.mybatis.spring.filter.customfilter.CustomTypeFilter
 filter.aspectj=*..CommonDataSourceMapper
-filter.regex=org\.mybatis\.spring\.filter\.datasource\.datasource1\..*
\ No newline at end of file
+filter.regex=org\.mybatis\.spring\.filter\.datasource\.datasource1\..*
diff --git a/src/test/resources/org/mybatis/spring/submitted/autowire/BarMapper.xml b/src/test/resources/org/mybatis/spring/submitted/autowire/BarMapper.xml
index 2aa6df1346..793ada7b1c 100644
--- a/src/test/resources/org/mybatis/spring/submitted/autowire/BarMapper.xml
+++ b/src/test/resources/org/mybatis/spring/submitted/autowire/BarMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2024 the original author or authors.
+    Copyright 2010-2025 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
 	<select id="executeBar" resultType="string">
 		select * from Bar -- this should run on database Bar, but actually runs on Foo.
 	</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml b/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml
index e67a953870..44ba73af94 100644
--- a/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml
+++ b/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2024 the original author or authors.
+    Copyright 2010-2025 the original author or authors.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
 	<select id="executeFoo" resultType="string">
 		select * from Foo
 	</select>
-</mapper>
\ No newline at end of file
+</mapper>