Merge branch 'master' into schema-provider

Author: jeffgbutler

CHANGELOG.md

@@ -2,7 +2,16 @@
 
 This log will detail notable changes to MyBatis Dynamic SQL. Full details are available on the GitHub milestone pages.
 
-## Release 1.1.1
+## Release 1.1.2 - Unreleased
+
+GitHub milestone: [https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.2+](https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.2+)
+
+### Added
+
+- Changed the public SQLBuilder API to accept Collection instead of List for in conditions and batch record inserts. This should have no impact on existing code, but allow for some future flexibility
+
+
+## Release 1.1.1 - April 7, 2019
 
 GitHub milestone: [https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.1+](https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.1+)
 
@@ -19,7 +28,7 @@ GitHub milestone: [https://github.com/mybatis/mybatis-dynamic-sql/issues?q=miles
 - Fixed self joins
 
 
-## Release 1.1.0
+## Release 1.1.0 - April 24, 2018
 
 GitHub milestone: [https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.0+](https://github.com/mybatis/mybatis-dynamic-sql/issues?q=milestone%3A1.1.0+)
 

pom.xml

@@ -40,8 +40,8 @@
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <junit.jupiter.version>5.4.1</junit.jupiter.version>
-    <junit.platform.version>1.4.1</junit.platform.version>
+    <junit.jupiter.version>5.4.2</junit.jupiter.version>
+    <junit.platform.version>1.4.2</junit.platform.version>
     <spring.batch.version>4.1.2.RELEASE</spring.batch.version>
     <clirr.comparisonVersion>1.1.0</clirr.comparisonVersion>
     <module.name>org.mybatis.dynamic.sql</module.name>
@@ -144,7 +144,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>5.1.6.RELEASE</version>
+      <version>5.1.7.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -171,6 +171,13 @@
       <version>1.2.3</version>
       <scope>test</scope>
     </dependency>
+    <!-- Hamcrest is only here to make Infinitest happy. Not really used in the project. -->
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <scm>

src/test/java/examples/springbatch/cursor/CursorReaderBatchConfiguration.java

@@ -82,7 +82,7 @@ public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Excepti
     }
 
     @Bean
-    public PlatformTransactionManager dtm(DataSource dataSource) {
+    public PlatformTransactionManager transactionManager(DataSource dataSource) {
         return new DataSourceTransactionManager(dataSource);
     }
 

src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java

@@ -45,6 +45,7 @@
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import examples.springbatch.common.Person;
 import examples.springbatch.mapper.PersonMapper;
@@ -80,7 +81,7 @@ public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Excepti
     }
 
     @Bean
-    public DataSourceTransactionManager dtm(DataSource dataSource) {
+    public PlatformTransactionManager transactionManager(DataSource dataSource) {
         return new DataSourceTransactionManager(dataSource);
     }