Merge branch 'master' into feature/mybatis-benchmarks-setup

Author: epochcoder

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 17, 21, 22-ea, 23-ea]
+        java: [11, 17, 21, 22, 23-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4

.github/workflows/sonatype.yaml

@@ -17,7 +17,7 @@ jobs:
           java-version: 21
           distribution: zulu
       - name: Deploy to Sonatype
-        run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true
+        run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true -Prelease -Dgpg.skip
         env:
           CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
           CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

pom.xml

@@ -28,7 +28,7 @@
 
   <groupId>org.mybatis</groupId>
   <artifactId>mybatis</artifactId>
-  <version>3.5.16-SNAPSHOT</version>
+  <version>3.5.17-SNAPSHOT</version>
 
   <name>mybatis</name>
   <description>The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented
@@ -131,7 +131,7 @@
   <properties>
     <clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
 
-    <byte-buddy.version>1.14.12</byte-buddy.version>
+    <byte-buddy.version>1.14.13</byte-buddy.version>
     <derby.version>10.17.1.0</derby.version>
     <log4j.version>2.23.1</log4j.version>
     <mockito.version>5.11.0</mockito.version>
@@ -159,7 +159,7 @@
     <argLine>-Xmx2048m -javaagent:${settings.localRepository}/net/bytebuddy/byte-buddy-agent/${byte-buddy.version}/byte-buddy-agent-${byte-buddy.version}.jar</argLine>
 
     <!-- Reproducible Builds -->
-    <project.build.outputTimestamp>1702533513</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1712079482</project.build.outputTimestamp>
   </properties>
 
   <dependencies>
@@ -324,7 +324,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -336,15 +336,15 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.12</version>
+      <version>2.0.13</version>
       <optional>true</optional>
     </dependency>
 
     <!-- Logging Support used in testing -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/org/apache/ibatis/annotations/Select.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.
@@ -26,33 +26,33 @@
  * The annotation that specify an SQL for retrieving record(s).
  * <p>
  * <b>How to use:</b>
- * <br/>
+ * <p>
  * <ul>
- *   <li>
- *   Simple:
- *   <pre>
- *   public interface UserMapper {
- *       &#064;Select("SELECT id, name FROM users WHERE id = #{id}")
- *       User selectById(int id);
- *   }
- *   </pre>
- *   </li>
- *   <li>
- *   Dynamic SQL:
- *   <pre>
- *   public interface UserMapper {
- *       &#064;Select({"&lt;script>",
- *           "select * from users",
- *           "where name = #{name}",
- *           "&lt;if test=\"age != null\"> age = #{age} &lt;/if>",
- *           "&lt;/script>"})
- *       User select(@NotNull String name, @Nullable Intger age);
- *   }
- *   </pre>
- *   </li>
+ * <li>Simple:
+ *
+ * <pre>{@code
+ * public interface UserMapper {
+ *   @Select("SELECT id, name FROM users WHERE id = #{id}")
+ *   User selectById(int id);
+ * }
+ * }</pre>
+ *
+ * </li>
+ * <li>Dynamic SQL:
+ *
+ * <pre>{@code
+ * public interface UserMapper {
+ *   @Select({ "<script>", "select * from users", "where name = #{name}",
+ *       "<if test=\"age != null\"> age = #{age} </if>", "</script>" })
+ *   User select(@NotNull String name, @Nullable Intger age);
+ * }
+ * }</pre>
+ *
+ * </li>
  * </ul>
  *
  * @author Clinton Begin
+ *
  * @see <a href="https://mybatis.org/mybatis-3/dynamic-sql.html">How to use Dynamic SQL</a>
  */
 @Documented
@@ -69,6 +69,7 @@
 
   /**
    * @return A database id that correspond this statement
+   *
    * @since 3.5.5
    */
   String databaseId() default "";
@@ -78,6 +79,7 @@
    * e.g. RETURNING of PostgreSQL or OUTPUT of MS SQL Server.
    *
    * @return {@code true} if this select affects DB data; {@code false} if otherwise
+   *
    * @since 3.5.12
    */
   boolean affectData() default false;
@@ -86,6 +88,7 @@
    * The container annotation for {@link Select}.
    *
    * @author Kazuki Shimizu
+   *
    * @since 3.5.5
    */
   @Documented

src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java

@@ -65,7 +65,7 @@ private void processGeneratedKeys(Executor executor, MappedStatement ms, Object
         // The transaction will be closed by parent executor.
         Executor keyExecutor = configuration.newExecutor(executor.getTransaction(), ExecutorType.SIMPLE);
         List<Object> values = keyExecutor.query(keyStatement, parameter, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
-        if (values.size() == 0) {
+        if (values.isEmpty()) {
           throw new ExecutorException("SelectKey returned no data.");
         }
         if (values.size() > 1) {

src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 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.
@@ -18,13 +18,14 @@
 import java.io.Reader;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.junit.jupiter.api.Assertions;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -47,7 +48,7 @@ void setUp() throws Exception {
   }
 
   @Test
-  void testBlockingCache() {
+  void testBlockingCache() throws InterruptedException {
     ExecutorService defaultThreadPool = Executors.newFixedThreadPool(2);
 
     long init = System.currentTimeMillis();
@@ -57,13 +58,12 @@ void testBlockingCache() {
     }
 
     defaultThreadPool.shutdown();
-
-    while (!defaultThreadPool.isTerminated()) {
-      continue;
+    if (!defaultThreadPool.awaitTermination(5, TimeUnit.SECONDS)) {
+      defaultThreadPool.shutdownNow();
     }
 
     long totalTime = System.currentTimeMillis() - init;
-    Assertions.assertTrue(totalTime > 1000);
+    Assertions.assertThat(totalTime).isGreaterThanOrEqualTo(1000);
   }
 
   private void accessDB() {