diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 597edca4..06b1c216 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,38 +1,22 @@
-#
-# Copyright 2004-2020 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 name: Java CI
 
-on: [push, pull_request]
+on: [workflow_dispatch, push, pull_request]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 21]
-        distribution: ['zulu']
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        java: [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 up JDK
+      - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index 54a74235..038d8811 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -1,19 +1,3 @@
-#
-#    Copyright 2016-2020 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.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
 name: Coveralls
 
 on: [push, pull_request]
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 48fef2cb..0b18badd 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -1,19 +1,3 @@
-#
-# Copyright 2004-2020 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 name: SonarCloud
 
 on:
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index f691ebc6..46800b48 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -1,19 +1,3 @@
-#
-# Copyright 2004-2020 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.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 name: Sonatype
 
 on:
diff --git a/pom.xml b/pom.xml
index 428eae3c..00f00a9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
   <scm>
     <url>http://github.com/mybatis/mybatis-2</url>
-    <connection>scm:git:ssh://github.com/mybatis/mybatis-2.git</connection>
+    <connection>scm:git:ssh://git@github.com/mybatis/mybatis-2.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mybatis/mybatis-2.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
@@ -58,9 +58,9 @@
   </ciManagement>
   <distributionManagement>
     <site>
-      <id>gh-pages</id>
+      <id>gh-pages-scm</id>
       <name>Mybatis GitHub Pages</name>
-      <url>git:ssh://git@github.com/mybatis/mybatis-2.git?gh-pages#</url>
+      <url>scm:git:ssh://git@github.com/mybatis/mybatis-2.git</url>
     </site>
   </distributionManagement>
 
diff --git a/src/main/java/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java b/src/main/java/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
index 864d55a0..10508e3b 100644
--- a/src/main/java/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
+++ b/src/main/java/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.CharacterData;
 
 /**
  * The Class SqlStatementParser.
diff --git a/src/main/java/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java b/src/main/java/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java
index 7a6c2df0..f72de2dc 100644
--- a/src/main/java/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java
+++ b/src/main/java/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java
@@ -18,7 +18,7 @@
 import com.ibatis.common.xml.NodeletUtils;
 import com.ibatis.sqlmap.engine.config.SqlSource;
 import com.ibatis.sqlmap.engine.mapping.parameter.InlineParameterMapParser;
-import com.ibatis.sqlmap.engine.mapping.sql.Sql;
+import com.ibatis.sqlmap.engine.mapping.sql.Sql;
 import com.ibatis.sqlmap.engine.mapping.sql.SqlText;
 import com.ibatis.sqlmap.engine.mapping.sql.dynamic.DynamicSql;
 import com.ibatis.sqlmap.engine.mapping.sql.dynamic.elements.*;
@@ -26,10 +26,9 @@
 
 import java.util.Properties;
 
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.w3c.dom.CharacterData;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
  * The Class XMLSqlSource.
diff --git a/src/test/java/com/ibatis/sqlmap/XmlStatementTest.java b/src/test/java/com/ibatis/sqlmap/XmlStatementTest.java
index 1b70b59b..fd20f5dd 100644
--- a/src/test/java/com/ibatis/sqlmap/XmlStatementTest.java
+++ b/src/test/java/com/ibatis/sqlmap/XmlStatementTest.java
@@ -25,7 +25,6 @@
 
 import xmltester.MiniDom;
 import xmltester.MiniParser;
-import xmltester.MiniParser;
 
 class XmlStatementTest extends BaseSqlMap {