Build updates

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

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

.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

.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

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

.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

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

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

.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) {

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.

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>
+</project>

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!!
+myBean.name=MyBean!!

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
+mybatis.lazy-initialization=true

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
+mybatis.default-scope=thread

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
+mybatis.lazy-initialization=true

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!!
+myBean.name=MyBean!!

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
+exclude-filters.aspectj=*..CommonDataSourceMapper

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\..*
+filter.regex=org\.mybatis\.spring\.filter\.datasource\.datasource1\..*

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>
+</mapper>