Merge pull request #3039 from mybatis/hsqldb

hazendaz · web-flow · commit 314bec134376 · 2023-12-14T01:00:15.000-05:00
Releasing Mybatis 3.5.15
diff --git a/pom.xml b/pom.xml
@@ -28,15 +28,13 @@
 
   <groupId>org.mybatis</groupId>
   <artifactId>mybatis</artifactId>
-  <version>3.5.15-SNAPSHOT</version>
+  <version>3.5.16-SNAPSHOT</version>
 
   <name>mybatis</name>
-  <description>
-    The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented
+  <description>The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented
     applications. MyBatis couples objects with stored procedures or SQL statements using a XML descriptor or
     annotations. Simplicity is the biggest advantage of the MyBatis data mapper over object relational mapping
-    tools.
-  </description>
+    tools.</description>
   <url>https://www.mybatis.org/mybatis-3</url>
 
   <inceptionYear>2009</inceptionYear>
@@ -109,10 +107,10 @@
   </contributors>
 
   <scm>
-    <url>https://github.com/mybatis/mybatis-3</url>
     <connection>scm:git:ssh://git@github.com/mybatis/mybatis-3.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mybatis/mybatis-3.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>mybatis-3.5.15</tag>
+    <url>https://github.com/mybatis/mybatis-3</url>
   </scm>
   <issueManagement>
     <system>GitHub Issue Management</system>
@@ -136,7 +134,9 @@
     <byte-buddy.version>1.14.10</byte-buddy.version>
     <derby.version>10.17.1.0</derby.version>
     <log4j.version>2.22.0</log4j.version>
+    <mockito.version>5.8.0</mockito.version>
     <mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version>
+    <testcontainers.version>1.19.3</testcontainers.version>
 
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
@@ -157,7 +157,7 @@
     <argLine>-Xmx2048m</argLine>
 
     <!-- Reproducible Builds -->
-    <project.build.outputTimestamp>1698763635</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1702533513</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -228,19 +228,19 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.8.0</version>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-subclass</artifactId>
-      <version>5.8.0</version>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>5.8.0</version>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -289,19 +289,19 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.19.3</version>
+      <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.19.3</version>
+      <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mysql</artifactId>
-      <version>1.19.3</version>
+      <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
     <!-- For javadoc link -->
@@ -371,19 +371,21 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+      <!-- Do not run pdf plugin as not compliant with site 2.0
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pdf-plugin</artifactId>
       </plugin>
+      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <createDependencyReducedPom>false</createDependencyReducedPom>
               <artifactSet>
@@ -425,7 +427,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
-          <locales>en,es,ja,fr,zh_CN,ko</locales>
+          <locales>default,es,ja,fr,zh_CN,ko</locales>
+          <topSiteURL>${project.distributionManagement.site.url}</topSiteURL>
         </configuration>
       </plugin>
       <plugin>
@@ -448,8 +451,8 @@
         <jdk>(,16)</jdk>
       </activation>
       <properties>
-          <derby.version>10.15.2.0</derby.version>
-          <mssql-jdbc.version>12.4.2.jre8</mssql-jdbc.version>
+        <derby.version>10.15.2.0</derby.version>
+        <mssql-jdbc.version>12.4.2.jre8</mssql-jdbc.version>
       </properties>
       <build>
         <pluginManagement>
@@ -494,7 +497,7 @@
         <jdk>[17,)</jdk>
       </activation>
       <properties>
-          <derby.version>10.16.1.1</derby.version>
+        <derby.version>10.16.1.1</derby.version>
       </properties>
     </profile>
     <profile>
@@ -503,7 +506,7 @@
         <jdk>[19,)</jdk>
       </activation>
       <properties>
-          <derby.version>10.17.1.0</derby.version>
+        <derby.version>10.17.1.0</derby.version>
       </properties>
     </profile>
   </profiles>
diff --git a/src/site/ko/markdown/index.md b/src/site/ko/markdown/index.md
@@ -27,7 +27,7 @@ author: Clinton Begin, 이동국(한국어 번역)
 <!--      <li class="fr"><a href="../fr/index.html">프랑스어</a></li> -->
           <li class="ja"><a href="../ja/index.html">일본어</a></li>
           <li class="ko"><a href="../ko/index.html">한국어</a></li>
-          <li class="zh"><a href="../zh/index.html">중국어번체</a></li>
+          <li class="zh"><a href="../zh_CN/index.html">중국어번체</a></li>
 </ul>
 
 당신의 모국어로 작성된 마이바티스 문서를 읽고 싶은가? 그렇다면 모국어로 작성된 문서를 패치로 첨부한 이슈를 등록해달라!
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -27,7 +27,7 @@ Users can read about MyBatis in following translations:
 <!--      <li class="fr"><a href="./fr/index.html">Français</a></li> -->
           <li class="ja"><a href="./ja/index.html">日本語</a></li>
           <li class="ko"><a href="./ko/index.html">한국어</a></li>
-          <li class="zh"><a href="./zh/index.html">简体中文</a></li>
+          <li class="zh"><a href="./zh_CN/index.html">简体中文</a></li>
 </ul>
 
 Do you want to read about MyBatis in your own native language? File an issue providing patches with your mother tongue documentation!
diff --git a/src/site/pdf.xml b/src/site/pdf.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       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.
@@ -16,8 +16,7 @@
        limitations under the License.
 
 -->
-<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 https://maven.apache.org/xsd/document-1.0.1.xsd"
   outputName="${project.artifactId}-${project.version}">
 
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -16,8 +16,8 @@
        limitations under the License.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
   <body>
     <menu name="Reference Documentation">
@@ -53,4 +53,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/src/site/site_es.xml b/src/site/site_es.xml
@@ -16,9 +16,8 @@
        limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
-  name="MyBatis">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
   <body>
     <menu name="Manual de Referencia">
@@ -55,4 +54,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       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.
@@ -16,9 +16,8 @@
        limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
-  name="MyBatis">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
   <body>
     <menu name="Core">
@@ -57,4 +56,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/src/site/site_ja.xml b/src/site/site_ja.xml
@@ -16,9 +16,8 @@
        limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
-  name="MyBatis">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
   <body>
     <menu name="Core">
@@ -56,4 +55,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/src/site/site_ko.xml b/src/site/site_ko.xml
@@ -16,9 +16,8 @@
        limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
-  name="MyBatis">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
   <body>
     <menu name="Core">
@@ -53,4 +52,4 @@
     </menu>
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/src/site/site_zh.xml b/src/site/site_zh.xml
@@ -16,8 +16,8 @@
        limitations under the License.
 
 -->
-<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
   <body>
     <menu name="参考文档">
@@ -53,4 +53,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/src/site/zh_CN/markdown/index.md b/src/site/zh_CN/markdown/index.md
@@ -25,7 +25,7 @@ MyBatis 是一款优秀的持久层框架，它支持自定义 SQL、存储过
           <!--      <li class="fr"><a href="./fr/index.html">Français</a></li> -->
           <li class="ja"><a href="../ja/index.html">日本語</a></li>
           <li class="ko"><a href="../ko/index.html">한국어</a></li>
-          <li class="zh"><a href="./getting-started.html">简体中文</a></li>
+          <li class="zh"><a href="../zh_CN/getting-started.html">简体中文</a></li>
 </ul>
 
 想用你的母语来了解 MyBatis 吗？那就将文档翻译成你的母语并提供给我们吧！
diff --git a/src/site/zh_CN/markdown/logging.md b/src/site/zh_CN/markdown/logging.md
diff --git a/src/site/zh_CN/resources/css/site.css b/src/site/zh_CN/resources/css/site.css
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2022 the original author or authors.
+ *    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.
diff --git a/src/site/zh_CN/xdoc/configuration.xml b/src/site/zh_CN/xdoc/configuration.xml
diff --git a/src/site/zh_CN/xdoc/dynamic-sql.xml b/src/site/zh_CN/xdoc/dynamic-sql.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       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.
diff --git a/src/site/zh_CN/xdoc/getting-started.xml b/src/site/zh_CN/xdoc/getting-started.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       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.
diff --git a/src/site/zh_CN/xdoc/java-api.xml b/src/site/zh_CN/xdoc/java-api.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       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.
diff --git a/src/site/zh_CN/xdoc/sqlmap-xml.xml b/src/site/zh_CN/xdoc/sqlmap-xml.xml
diff --git a/src/site/zh_CN/xdoc/statement-builders.xml b/src/site/zh_CN/xdoc/statement-builders.xml
