Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Mybatis Spring Version 2.1.0.

Browse Source 
Closes #1220
Original pull request #1222
This commit is contained in:
Jens Schauder
2022-04-19 11:39:54 +02:00
parent 5399171a79
commit 3b2e8c7a7e
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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 -->

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

@@ -24,7 +24,6 @@ import java.io.IOException;
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 @@ import org.springframework.transaction.annotation.Transactional;
@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;

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

@@ -22,7 +22,6 @@ import junit.framework.AssertionFailedError;
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 @@ import org.springframework.transaction.annotation.Transactional;
@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;