Upgrade to Mybatis Spring Version 2.1.0

Closes #1220
spring-projects · Sep 27, 2022 · 4fe539b · 4fe539b
1 parent 6537480
commit 4fe539b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,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 -->
@@ -152,10 +152,6 @@
 			<id>spring-libs-snapshot</id>
 			<url>https://repo.spring.io/libs-snapshot</url>
 		</repository>
-		<repository>
-			<id>oss-sonatype-snapshot</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</repository>
 	</repositories>
 
 	<pluginRepositories>

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;