Skip to content

Commit 314bec1

Browse files
hazendazhazendaz
authored
Merge pull request mybatis#3039 from mybatis/hsqldb
Releasing Mybatis 3.5.15
2 parents eddd154 + c155810 commit 314bec1

19 files changed

+51
-53
lines changed

‎pom.xml

+23-20
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828

2929
<groupId>org.mybatis</groupId>
3030
<artifactId>mybatis</artifactId>
31-
<version>3.5.15-SNAPSHOT</version>
31+
<version>3.5.16-SNAPSHOT</version>
3232

3333
<name>mybatis</name>
34-
<description>
35-
The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented
34+
<description>The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented
3635
applications. MyBatis couples objects with stored procedures or SQL statements using a XML descriptor or
3736
annotations. Simplicity is the biggest advantage of the MyBatis data mapper over object relational mapping
38-
tools.
39-
</description>
37+
tools.</description>
4038
<url>https://www.mybatis.org/mybatis-3</url>
4139

4240
<inceptionYear>2009</inceptionYear>
@@ -109,10 +107,10 @@
109107
</contributors>
110108

111109
<scm>
112-
<url>https://github.com/mybatis/mybatis-3</url>
113110
<connection>scm:git:ssh://[email protected]/mybatis/mybatis-3.git</connection>
114111
<developerConnection>scm:git:ssh://[email protected]/mybatis/mybatis-3.git</developerConnection>
115-
<tag>HEAD</tag>
112+
<tag>mybatis-3.5.15</tag>
113+
<url>https://github.com/mybatis/mybatis-3</url>
116114
</scm>
117115
<issueManagement>
118116
<system>GitHub Issue Management</system>
@@ -136,7 +134,9 @@
136134
<byte-buddy.version>1.14.10</byte-buddy.version>
137135
<derby.version>10.17.1.0</derby.version>
138136
<log4j.version>2.22.0</log4j.version>
137+
<mockito.version>5.8.0</mockito.version>
139138
<mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version>
139+
<testcontainers.version>1.19.3</testcontainers.version>
140140

141141
<!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
142142
<!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
@@ -157,7 +157,7 @@
157157
<argLine>-Xmx2048m</argLine>
158158

159159
<!-- Reproducible Builds -->
160-
<project.build.outputTimestamp>1698763635</project.build.outputTimestamp>
160+
<project.build.outputTimestamp>1702533513</project.build.outputTimestamp>
161161
</properties>
162162

163163
<dependencies>
@@ -228,19 +228,19 @@
228228
<dependency>
229229
<groupId>org.mockito</groupId>
230230
<artifactId>mockito-core</artifactId>
231-
<version>5.8.0</version>
231+
<version>${mockito.version}</version>
232232
<scope>test</scope>
233233
</dependency>
234234
<dependency>
235235
<groupId>org.mockito</groupId>
236236
<artifactId>mockito-subclass</artifactId>
237-
<version>5.8.0</version>
237+
<version>${mockito.version}</version>
238238
<scope>test</scope>
239239
</dependency>
240240
<dependency>
241241
<groupId>org.mockito</groupId>
242242
<artifactId>mockito-junit-jupiter</artifactId>
243-
<version>5.8.0</version>
243+
<version>${mockito.version}</version>
244244
<scope>test</scope>
245245
</dependency>
246246
<dependency>
@@ -289,19 +289,19 @@
289289
<dependency>
290290
<groupId>org.testcontainers</groupId>
291291
<artifactId>junit-jupiter</artifactId>
292-
<version>1.19.3</version>
292+
<version>${testcontainers.version}</version>
293293
<scope>test</scope>
294294
</dependency>
295295
<dependency>
296296
<groupId>org.testcontainers</groupId>
297297
<artifactId>postgresql</artifactId>
298-
<version>1.19.3</version>
298+
<version>${testcontainers.version}</version>
299299
<scope>test</scope>
300300
</dependency>
301301
<dependency>
302302
<groupId>org.testcontainers</groupId>
303303
<artifactId>mysql</artifactId>
304-
<version>1.19.3</version>
304+
<version>${testcontainers.version}</version>
305305
<scope>test</scope>
306306
</dependency>
307307
<!-- For javadoc link -->
@@ -371,19 +371,21 @@
371371
</systemPropertyVariables>
372372
</configuration>
373373
</plugin>
374+
<!-- Do not run pdf plugin as not compliant with site 2.0
374375
<plugin>
375376
<groupId>org.apache.maven.plugins</groupId>
376377
<artifactId>maven-pdf-plugin</artifactId>
377378
</plugin>
379+
-->
378380
<plugin>
379381
<groupId>org.apache.maven.plugins</groupId>
380382
<artifactId>maven-shade-plugin</artifactId>
381383
<executions>
382384
<execution>
383-
<phase>package</phase>
384385
<goals>
385386
<goal>shade</goal>
386387
</goals>
388+
<phase>package</phase>
387389
<configuration>
388390
<createDependencyReducedPom>false</createDependencyReducedPom>
389391
<artifactSet>
@@ -425,7 +427,8 @@
425427
<groupId>org.apache.maven.plugins</groupId>
426428
<artifactId>maven-site-plugin</artifactId>
427429
<configuration>
428-
<locales>en,es,ja,fr,zh_CN,ko</locales>
430+
<locales>default,es,ja,fr,zh_CN,ko</locales>
431+
<topSiteURL>${project.distributionManagement.site.url}</topSiteURL>
429432
</configuration>
430433
</plugin>
431434
<plugin>
@@ -448,8 +451,8 @@
448451
<jdk>(,16)</jdk>
449452
</activation>
450453
<properties>
451-
<derby.version>10.15.2.0</derby.version>
452-
<mssql-jdbc.version>12.4.2.jre8</mssql-jdbc.version>
454+
<derby.version>10.15.2.0</derby.version>
455+
<mssql-jdbc.version>12.4.2.jre8</mssql-jdbc.version>
453456
</properties>
454457
<build>
455458
<pluginManagement>
@@ -494,7 +497,7 @@
494497
<jdk>[17,)</jdk>
495498
</activation>
496499
<properties>
497-
<derby.version>10.16.1.1</derby.version>
500+
<derby.version>10.16.1.1</derby.version>
498501
</properties>
499502
</profile>
500503
<profile>
@@ -503,7 +506,7 @@
503506
<jdk>[19,)</jdk>
504507
</activation>
505508
<properties>
506-
<derby.version>10.17.1.0</derby.version>
509+
<derby.version>10.17.1.0</derby.version>
507510
</properties>
508511
</profile>
509512
</profiles>

‎src/site/ko/markdown/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ author: Clinton Begin, 이동국(한국어 번역)
2727
<!-- <li class="fr"><a href="../fr/index.html">프랑스어</a></li> -->
2828
<li class="ja"><a href="../ja/index.html">일본어</a></li>
2929
<li class="ko"><a href="../ko/index.html">한국어</a></li>
30-
<li class="zh"><a href="../zh/index.html">중국어번체</a></li>
30+
<li class="zh"><a href="../zh_CN/index.html">중국어번체</a></li>
3131
</ul>
3232

3333
당신의 모국어로 작성된 마이바티스 문서를 읽고 싶은가? 그렇다면 모국어로 작성된 문서를 패치로 첨부한 이슈를 등록해달라!

‎src/site/markdown/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Users can read about MyBatis in following translations:
2727
<!-- <li class="fr"><a href="./fr/index.html">Français</a></li> -->
2828
<li class="ja"><a href="./ja/index.html">日本語</a></li>
2929
<li class="ko"><a href="./ko/index.html">한국어</a></li>
30-
<li class="zh"><a href="./zh/index.html">简体中文</a></li>
30+
<li class="zh"><a href="./zh_CN/index.html">简体中文</a></li>
3131
</ul>
3232

3333
Do you want to read about MyBatis in your own native language? File an issue providing patches with your mother tongue documentation!

‎src/site/pdf.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2023 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
1616
limitations under the License.
1717
1818
-->
19-
<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2120
xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 https://maven.apache.org/xsd/document-1.0.1.xsd"
2221
outputName="${project.artifactId}-${project.version}">
2322

‎src/site/site.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
19+
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2121

2222
<body>
2323
<menu name="Reference Documentation">
@@ -53,4 +53,4 @@
5353

5454
<menu ref="reports"/>
5555
</body>
56-
</project>
56+
</site>

‎src/site/site_es.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
21-
name="MyBatis">
19+
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2221

2322
<body>
2423
<menu name="Manual de Referencia">
@@ -55,4 +54,4 @@
5554

5655
<menu ref="reports"/>
5756
</body>
58-
</project>
57+
</site>

‎src/site/site_fr.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2023 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
21-
name="MyBatis">
19+
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2221

2322
<body>
2423
<menu name="Core">
@@ -57,4 +56,4 @@
5756

5857
<menu ref="reports"/>
5958
</body>
60-
</project>
59+
</site>

‎src/site/site_ja.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
21-
name="MyBatis">
19+
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2221

2322
<body>
2423
<menu name="Core">
@@ -56,4 +55,4 @@
5655

5756
<menu ref="reports"/>
5857
</body>
59-
</project>
58+
</site>

‎src/site/site_ko.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd"
21-
name="MyBatis">
19+
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2221

2322
<body>
2423
<menu name="Core">
@@ -53,4 +52,4 @@
5352
</menu>
5453
<menu ref="reports"/>
5554
</body>
56-
</project>
55+
</site>

‎src/site/site_zh.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
limitations under the License.
1717
1818
-->
19-
<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
19+
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2121

2222
<body>
2323
<menu name="参考文档">
@@ -53,4 +53,4 @@
5353

5454
<menu ref="reports"/>
5555
</body>
56-
</project>
56+
</site>

‎src/site/zh/markdown/index.md renamed to ‎src/site/zh_CN/markdown/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ MyBatis 是一款优秀的持久层框架，它支持自定义 SQL、存储过
2525
<!-- <li class="fr"><a href="./fr/index.html">Français</a></li> -->
2626
<li class="ja"><a href="../ja/index.html">日本語</a></li>
2727
<li class="ko"><a href="../ko/index.html">한국어</a></li>
28-
<li class="zh"><a href="./getting-started.html">简体中文</a></li>
28+
<li class="zh"><a href="../zh_CN/getting-started.html">简体中文</a></li>
2929
</ul>
3030

3131
想用你的母语来了解 MyBatis 吗？那就将文档翻译成你的母语并提供给我们吧！

‎src/site/zh/markdown/logging.md renamed to ‎src/site/zh_CN/markdown/logging.md

File renamed without changes.

‎src/site/zh/resources/css/site.css renamed to ‎src/site/zh_CN/resources/css/site.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/site/zh/xdoc/configuration.xml renamed to ‎src/site/zh_CN/xdoc/configuration.xml

File renamed without changes.

‎src/site/zh/xdoc/dynamic-sql.xml renamed to ‎src/site/zh_CN/xdoc/dynamic-sql.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2023 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎src/site/zh/xdoc/getting-started.xml renamed to ‎src/site/zh_CN/xdoc/getting-started.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2023 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎src/site/zh/xdoc/java-api.xml renamed to ‎src/site/zh_CN/xdoc/java-api.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2023 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎src/site/zh/xdoc/sqlmap-xml.xml renamed to ‎src/site/zh_CN/xdoc/sqlmap-xml.xml

File renamed without changes.

‎src/site/zh/xdoc/statement-builders.xml renamed to ‎src/site/zh_CN/xdoc/statement-builders.xml

File renamed without changes.

0 commit comments

Comments
 (0)