Skip to content

Commit f6d31ee

Browse files
committed
Downgrade to mybatis-spring 2.0.7.
Since at the time of the release only snapshot releases of mybatis-spring 2.1 are available we decided to downgrade to 2.0.7. for the release. Unfortunately that release is not compatible with the current milestone of Spring Framework and therefore the MyBatis integration is broken. If you want to use MyBatis with this release, manually add a dependency to mybatis-spring 2.1.0-SNAPSHOT. Closes #1245
1 parent 053476f commit f6d31ee

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<!-- dependency versions -->
2727
<jsr305.version>3.0.2</jsr305.version>
28-
<mybatis-spring.version>2.1.0-SNAPSHOT</mybatis-spring.version>
28+
<mybatis-spring.version>2.0.7</mybatis-spring.version>
2929
<mybatis.version>3.5.9</mybatis.version>
3030

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
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;
2728
import org.junit.jupiter.api.Test;
2829
import org.junit.jupiter.api.extension.ExtendWith;
2930
import org.mybatis.spring.SqlSessionFactoryBean;
@@ -58,6 +59,7 @@
5859
@ActiveProfiles("hsql")
5960
@Transactional
6061
@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")
6163
public class MyBatisCustomizingNamespaceHsqlIntegrationTests {
6264

6365
@Autowired SqlSessionFactory sqlSessionFactory;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
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;
2526
import org.junit.jupiter.api.Test;
2627
import org.junit.jupiter.api.extension.ExtendWith;
2728
import org.mybatis.spring.SqlSessionFactoryBean;
@@ -42,8 +43,6 @@
4243
import org.springframework.test.context.ActiveProfiles;
4344
import org.springframework.test.context.ContextConfiguration;
4445
import org.springframework.test.context.junit.jupiter.SpringExtension;
45-
import org.springframework.test.context.junit4.rules.SpringClassRule;
46-
import org.springframework.test.context.junit4.rules.SpringMethodRule;
4746
import org.springframework.transaction.annotation.Transactional;
4847

4948
/**
@@ -57,6 +56,7 @@
5756
@ActiveProfiles("hsql")
5857
@Transactional
5958
@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")
6060
public class MyBatisHsqlIntegrationTests {
6161

6262
@Autowired SqlSessionFactory sqlSessionFactory;

0 commit comments

Comments
 (0)