diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f27e3068693..c8922c313cb 100644 --- a/.github/workflows/ci.yaml +++ b/.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 diff --git a/pom.xml b/pom.xml index f2fc1194242..4c696b19eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -154,8 +154,6 @@ 1698763635 - - [11,12),[17,18),[21,22),[22,23) diff --git a/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java b/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java index 092b30aaa31..0293b35c242 100644 --- a/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java +++ b/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);