Merge pull request #929 from hazendaz/master

Site work and minor cleanup
mybatis · Dec 10, 2023 · 3b6932d · 3b6932d
2 parents e1034f4 + fe49f79
commit 3b6932d
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ target/
 .mvn/wrapper/maven-wrapper.jar
 *.releaseBackup
 release.properties
+.github/keys/
diff --git a/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md b/mybatis-spring-boot-autoconfigure/src/site/markdown/index.md
@@ -6,7 +6,7 @@ Users can read about MyBatis-Spring-Boot-Starter in the following translations:
 
 <ul class="i18n">
   <li class="en"><a href="./index.html">English</a></li>
-  <li class="zh"><a href="./zh/index.html">简体中文</a></li>
+  <li class="zh"><a href="./zh_CN/index.html">简体中文</a></li>
 </ul>
 
 ## What is MyBatis-Spring-Boot-Starter?

diff --git a/...figure/src/site/resources/zh/css/site.css → ...ure/src/site/resources/zh_CN/css/site.css b/...figure/src/site/resources/zh/css/site.css → ...ure/src/site/resources/zh_CN/css/site.css
diff --git a/mybatis-spring-boot-autoconfigure/src/site/site.xml b/mybatis-spring-boot-autoconfigure/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 http://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">
@@ -26,4 +26,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/mybatis-spring-boot-autoconfigure/src/site/site_zh.xml b/mybatis-spring-boot-autoconfigure/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 http://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="参考文档">
@@ -26,4 +26,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/...toconfigure/src/site/zh/markdown/index.md → ...onfigure/src/site/zh_CN/markdown/index.md b/...toconfigure/src/site/zh/markdown/index.md → ...onfigure/src/site/zh_CN/markdown/index.md
@@ -6,7 +6,7 @@
 
 <ul class="i18n">
   <li class="en"><a href="./../index.html">English</a></li>
-  <li class="zh"><a href="./../zh/index.html">简体中文</a></li>
+  <li class="zh"><a href="./../zh_CN/index.html">简体中文</a></li>
 </ul>
 
 ## 什么是 MyBatis-Spring-Boot-Starter?

diff --git a/...oconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisPropertiesTest.java b/...oconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisPropertiesTest.java
@@ -197,8 +197,8 @@ void testWithCustomizeCoreConfiguration() {
             "mybatis.configuration.default-sql-provider-type:org.mybatis.spring.boot.autoconfigure.MybatisPropertiesTest$MySqlProvider",
             "mybatis.configuration.defaultEnumTypeHandler:org.apache.ibatis.type.EnumOrdinalTypeHandler",
             "mybatis.configuration.configuration-factory:org.mybatis.spring.boot.autoconfigure.MybatisPropertiesTest$MyConfigurationFactory",
-            "mybatis.configuration.variables.key1:value1", "mybatis.configuration.variables.key2:value2", "mybatis.configuration.database-id:mysql")
-            .run(context -> {
+            "mybatis.configuration.variables.key1:value1", "mybatis.configuration.variables.key2:value2",
+            "mybatis.configuration.database-id:mysql").run(context -> {
               assertThat(context.getBean(SqlSessionFactory.class).getConfiguration().getDefaultStatementTimeout())
                   .isEqualTo(2000);
               assertThat(context.getBean(SqlSessionFactory.class).getConfiguration().getDefaultFetchSize())
@@ -232,7 +232,7 @@ void testWithCustomizeCoreConfiguration() {
               assertThat(context.getBean(SqlSessionFactory.class).getConfiguration().getVariables())
                   .hasToString("{key1=value1, key2=value2}");
               assertThat(context.getBean(SqlSessionFactory.class).getConfiguration().getDatabaseId())
-                      .hasToString("mysql");
+                  .hasToString("mysql");
             }));
   }
 

diff --git a/...sample-web/src/test/java/sample/mybatis/web/SampleMybatisWithMockBeanApplicationTest.java b/...sample-web/src/test/java/sample/mybatis/web/SampleMybatisWithMockBeanApplicationTest.java
@@ -15,20 +15,21 @@
  */
 package sample.mybatis.web;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+
 import sample.mybatis.web.domain.City;
 import sample.mybatis.web.mapper.CityMapper;
 
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * @author Kazuki Shimizu
  */
@@ -40,7 +41,7 @@ class SampleMybatisWithMockBeanApplicationTest {
 
   @MockBean
   CityMapper cityMapper;
-  
+
   @BeforeEach
   void setup() {
     City city = new City();

diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md b/mybatis-spring-boot-test-autoconfigure/src/site/markdown/index.md
@@ -6,7 +6,7 @@ Users can read about MyBatis-Spring-Boot-Starter-Test in the following translati
 
 <ul class="i18n">
   <li class="en"><a href="./index.html">English</a></li>
-  <li class="zh"><a href="./zh/index.html">简体中文</a></li>
+  <li class="zh"><a href="./zh_CN/index.html">简体中文</a></li>
 </ul>
 
 ## What is MyBatis-Spring-Boot-Starter-Test?

diff --git a/...figure/src/site/resources/zh/css/site.css → ...ure/src/site/resources/zh_CN/css/site.css b/...figure/src/site/resources/zh/css/site.css → ...ure/src/site/resources/zh_CN/css/site.css
diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/site.xml b/mybatis-spring-boot-test-autoconfigure/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 http://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">
@@ -26,4 +26,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/mybatis-spring-boot-test-autoconfigure/src/site/site_zh.xml b/mybatis-spring-boot-test-autoconfigure/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 http://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="参考文档">
@@ -26,4 +26,4 @@
 
     <menu ref="reports"/>
   </body>
-</project>
+</site>
diff --git a/...toconfigure/src/site/zh/markdown/index.md → ...onfigure/src/site/zh_CN/markdown/index.md b/...toconfigure/src/site/zh/markdown/index.md → ...onfigure/src/site/zh_CN/markdown/index.md
@@ -6,7 +6,7 @@
 
 <ul class="i18n">
   <li class="en"><a href="./../index.html">English</a></li>
-  <li class="zh"><a href="./../zh/index.html">简体中文</a></li>
+  <li class="zh"><a href="./../zh_CN/index.html">简体中文</a></li>
 </ul>
 
 ## 什么是 MyBatis-Spring-Boot-Starter-Test?

diff --git a/pom.xml b/pom.xml
@@ -220,7 +220,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <configuration>
-            <locales>en,zh_CN</locales>
+            <locales>default,zh_CN</locales>
             <siteDirectory>${project.build.directory}/site-src</siteDirectory>
           </configuration>
         </plugin>

diff --git a/scripts/get_latest_version.sh b/scripts/get_latest_version.sh