From f6d31eeb4c92a1b356db3a25f4fda5bd340d2b07 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 12 May 2022 16:36:46 +0200 Subject: [PATCH] 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 --- pom.xml | 2 +- .../MyBatisCustomizingNamespaceHsqlIntegrationTests.java | 2 ++ .../data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d8f545de..f18481d2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.0.2 - 2.1.0-SNAPSHOT + 2.0.7 3.5.9 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java index de126979..b826aeb6 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java @@ -24,6 +24,7 @@ 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; @@ -58,6 +59,7 @@ 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; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java index d0bef26a..f83cf3df 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java @@ -22,6 +22,7 @@ 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; @@ -42,8 +43,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; import org.springframework.transaction.annotation.Transactional; /** @@ -57,6 +56,7 @@ 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;