Upgrade to Mybatis Spring Version 2.1.0.

Closes #1220 Original pull request #1222
spring-projects · Oct 10, 2023 · 3b2e8c7 · 3b2e8c7
1 parent 5399171
commit 3b2e8c7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
 
 		<!-- dependency versions -->
 		<jsr305.version>3.0.2</jsr305.version>
-		<mybatis-spring.version>2.0.7</mybatis-spring.version>
+		<mybatis-spring.version>2.1.0</mybatis-spring.version>
 		<mybatis.version>3.5.9</mybatis.version>
 
 		<!-- databases and jdbc drivers -->

diff --git a/...rg/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java b/...rg/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java
@@ -24,7 +24,6 @@
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mybatis.spring.SqlSessionFactoryBean;
@@ -59,7 +58,6 @@
 @ActiveProfiles("hsql")
 @Transactional
 @ExtendWith(SpringExtension.class)
-@Disabled("Temporary disabled because no mybatis-spring release compatible with the current Spring Framework 6 release is available. See https://github.com/mybatis/spring/pull/663")
 public class MyBatisCustomizingNamespaceHsqlIntegrationTests {
 
 	@Autowired SqlSessionFactory sqlSessionFactory;

diff --git a/...jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java b/...jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
@@ -22,7 +22,6 @@
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mybatis.spring.SqlSessionFactoryBean;
@@ -56,7 +55,6 @@
 @ActiveProfiles("hsql")
 @Transactional
 @ExtendWith(SpringExtension.class)
-@Disabled("Temporary disabled because no mybatis-spring release compatible with the current Spring Framework 6 release is available. See https://github.com/mybatis/spring/pull/663")
 public class MyBatisHsqlIntegrationTests {
 
 	@Autowired SqlSessionFactory sqlSessionFactory;