Merge pull request #2992 from hazendaz/master

Build cleanup

Author: hazendaz

.github/workflows/ci.yaml

@@ -7,27 +7,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 21, 22]
-        distribution: ['zulu']
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        java: [11, 17, 21, 22-ea]
+        distribution: ['temurin']
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set JDK from jdk.java.net
-        uses: oracle-actions/setup-java@v1
-        with:
-          website: jdk.java.net
-          release: ${{ matrix.java }}
-        if: ${{ matrix.java != '11' && matrix.java != '17' }}
-      - name: Set up older JDK
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: ${{ matrix.distribution }}
-        if: ${{ matrix.java == '11' || matrix.java == '17' }}
       - name: Print JDK Version
         run: java -version
       - name: Cache local Maven m2

pom.xml

@@ -154,8 +154,6 @@
 
     <!-- Reproducible Builds -->
     <project.build.outputTimestamp>1698763635</project.build.outputTimestamp>
-
-    <allowed.build.jdks>[11,12),[17,18),[21,22),[22,23)</allowed.build.jdks>
   </properties>
 
   <dependencies>

src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java

@@ -248,7 +248,7 @@ private void executeStatement(String command) throws SQLException {
       }
       try {
         boolean hasResults = statement.execute(sql);
-        // DO NOT try to 'imporove' the condition even if IDE tells you to!
+        // DO NOT try to 'improve' the condition even if IDE tells you to!
         // It's important that getUpdateCount() is called here.
         while (!(!hasResults && statement.getUpdateCount() == -1)) {
           checkWarnings(statement);