Merge branch 'master' into convert-md-en

# Conflicts:
#	src/site/xdoc/configuration.xml
#	src/site/xdoc/logging.xml
#	src/site/xdoc/sqlmap-xml.xml

Author: awxiaoxian2020

.gitattributes

@@ -1,2 +1,2 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
+* text=auto

.github/workflows/ci.yaml

@@ -40,18 +40,20 @@ jobs:
       - name: Set argLine command line option
         if: ${{ matrix.java == '11' }}
         run: echo 'ARG_LINE=-D"argLine=--illegal-access=permit"' >> $GITHUB_ENV
+      - name: Run all tests
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.java == '11' }}
+        run: echo 'ARG_LINE=-D"excludedGroups="' >> $GITHUB_ENV
       - name: Skip tests that require illegal reflective access
         if: ${{ matrix.os == 'ubuntu-latest' && matrix.java != '11' }}
         run: echo 'ARG_LINE=-D"excludedGroups=RequireIllegalAccess"' >> $GITHUB_ENV
       - name: Skip tests that require illegal reflective access
         if: ${{ matrix.os != 'ubuntu-latest' && matrix.java != '11' }}
         run: echo 'ARG_LINE=-D"excludedGroups=TestcontainersTests,RequireIllegalAccess"' >> $GITHUB_ENV
-      - name: Set env command line option
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: echo 'ENV_GITHUB="-Denv.GITHUB"' >> $GITHUB_ENV
+      - name: Active Profiles
+        run: ./mvnw help:active-profiles
       - name: Test with Maven
         if: ${{ matrix.os != 'windows-latest' }}
-        run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ENV_GITHUB $ARG_LINE
+        run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" $ARG_LINE
       - name: Test with Maven
         if: ${{ matrix.os == 'windows-latest' && matrix.java == '11' }}
         run: ./mvnw test -B -D"license.skip=true" -D"jacoco.skip=true" -D"argLine=--illegal-access=permit"

.gitignore

@@ -16,3 +16,4 @@ derby.log
 /bin/
 .mvn/wrapper/maven-wrapper.jar
 .sts4-cache/
+*.releaseBackup

.mvn/maven.config

@@ -1 +1,2 @@
--Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5 --no-transfer-progress
+-Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5
+--no-transfer-progress

.mvn/wrapper/maven-wrapper.properties

@@ -6,13 +6,13 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#   https://www.apache.org/licenses/LICENSE-2.0
+#   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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

README.md

@@ -21,3 +21,54 @@ Essentials
 * [See the docs](https://mybatis.org/mybatis-3)
 * [Download Latest](https://github.com/mybatis/mybatis-3/releases)
 * [Download Snapshot](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/mybatis/)
+
+Contributions
+-------------
+
+Mybatis-core is now being auto formatted.  Given nature of some code logic with mybatis, it is more appropriate to force a formatting structure manually for snippets such as sql statements.  To do so, add following blocks around code.
+
+- ```// @formatter:off``` to start the block of unformatted code
+- ```// @formatter:on``` to end the block of unformatted code
+
+If comment sections need same behaviour such as javadocs, note that the entire block must be around entire comment as direct usage does not properly indicate that formatter treats it all as one comment block regardless.
+
+Tests
+-----
+
+Mybatis-3 code runs more expressive testing depending on jdk usage and platform.
+
+By default, we set ```<excludedGroups>TestcontainersTests</excludedGroups>``` which will exclude a subset of tests with @Tag('TestcontainersTests').  Further, if pre jdk 16, we will further exclude record classes from executions further reducing tests.
+
+When using jdk 16+, we adjust the rule to ```<excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>```.
+
+When we run on ci platform, we further make adjustments as needed.  See [here](.github/workflows/ci.yaml) for details.
+
+As of 2/20/2023, using combined system + jdk will result in given number of tests ran.  This will change as tests are added or removed over time.
+
+without adjusting settings (ie use as is, platform does not matter)
+
+- any OS + jdk 11 = 1730 tests
+- any OS + jdk 17 = 1710 tests
+- any OS + jdk 19 = 1710 tests
+- any OS + jdk 20 = 1710 tests
+- any OS + jdk 21 = 1710 tests
+
+our adjustments for GH actions where platform does matter
+
+- windows + jdk 11 = 1730 tests
+- windows + jdk 17 = 1710 tests
+- windows + jdk 19 = 1710 tests
+- windows + jdk 20 = 1710 tests
+- windows + jdk 21 = 1710 tests
+
+- linux + jdk 11 = 1765 tests
+- linux + jdk 17 = 1745 tests
+- linux + jdk 19 = 1745 tests
+- linux + jdk 20 = 1745 tests
+- linux + jdk 21 = 1745 tests
+
+- mac + jdk 11 = 1730 tests
+- mac + jdk 17 = 1710 tests
+- mac + jdk 19 = 1710 tests
+- mac + jdk 20 = 1710 tests
+- mac + jdk 21 = 1710 tests

format.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+       Copyright 2009-2023 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
+
+          https://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.
+
+-->
+<!DOCTYPE Format>
+<Format>
+ <!-- Dummy format file -->
+</Format>