Merge master into add-skipSetAutoCommitOnClose-to-JdbcTransactionFactory

Author: harawata

pom.xml

@@ -216,13 +216,13 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/site/xdoc/getting-started.xml

@@ -125,7 +125,7 @@ SqlSessionFactory sqlSessionFactory =
         Notice in this case the configuration is adding a mapper class.
         Mapper classes are Java classes that
         contain SQL Mapping Annotations
-        that avoid the need for XML. However, due
+        that avoid the need for XML mapping. However, due
         to some limitations of
         Java Annotations and the complexity of some MyBatis mappings, XML
         mapping is still required for the