Skip to content

Commit 3b2e8c7

Browse files
committed
Upgrade to Mybatis Spring Version 2.1.0.
Closes #1220 Original pull request #1222
1 parent 5399171 commit 3b2e8c7

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<!-- dependency versions -->
2828
<jsr305.version>3.0.2</jsr305.version>
29-
<mybatis-spring.version>2.0.7</mybatis-spring.version>
29+
<mybatis-spring.version>2.1.0</mybatis-spring.version>
3030
<mybatis.version>3.5.9</mybatis.version>
3131

3232
<!-- databases and jdbc drivers -->

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.ibatis.session.Configuration;
2525
import org.apache.ibatis.session.SqlSession;
2626
import org.apache.ibatis.session.SqlSessionFactory;
27-
import org.junit.jupiter.api.Disabled;
2827
import org.junit.jupiter.api.Test;
2928
import org.junit.jupiter.api.extension.ExtendWith;
3029
import org.mybatis.spring.SqlSessionFactoryBean;
@@ -59,7 +58,6 @@
5958
@ActiveProfiles("hsql")
6059
@Transactional
6160
@ExtendWith(SpringExtension.class)
62-
@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")
6361
public class MyBatisCustomizingNamespaceHsqlIntegrationTests {
6462

6563
@Autowired SqlSessionFactory sqlSessionFactory;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.apache.ibatis.session.Configuration;
2323
import org.apache.ibatis.session.SqlSession;
2424
import org.apache.ibatis.session.SqlSessionFactory;
25-
import org.junit.jupiter.api.Disabled;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.api.extension.ExtendWith;
2827
import org.mybatis.spring.SqlSessionFactoryBean;
@@ -56,7 +55,6 @@
5655
@ActiveProfiles("hsql")
5756
@Transactional
5857
@ExtendWith(SpringExtension.class)
59-
@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")
6058
public class MyBatisHsqlIntegrationTests {
6159

6260
@Autowired SqlSessionFactory sqlSessionFactory;

0 commit comments

Comments
 (0)