From 6537480bb01f20cc02202ea8a1c89e70accb1400 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 19 Apr 2022 11:40:31 +0200 Subject: [PATCH 1/2] 1220-mybatis-2.1.0 - Prepare branch --- pom.xml | 2 +- spring-data-jdbc-distribution/pom.xml | 2 +- spring-data-jdbc/pom.xml | 4 ++-- spring-data-r2dbc/pom.xml | 4 ++-- spring-data-relational/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b2d4b1d1ae..7e5f9a4d9f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index db3b7ddd1a..8d7889b212 100644 --- a/spring-data-jdbc-distribution/pom.xml +++ b/spring-data-jdbc-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 547ff62b8b..a14d4417ed 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT diff --git a/spring-data-r2dbc/pom.xml b/spring-data-r2dbc/pom.xml index 14d7909d7b..d76683412d 100644 --- a/spring-data-r2dbc/pom.xml +++ b/spring-data-r2dbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-r2dbc - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT Spring Data R2DBC Spring Data module for R2DBC @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index e9d0455c68..3f3621e109 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-1220-mybatis-2.1.0-SNAPSHOT From 4fe539b4e2401d1e7e3dcfc4a12c7871ed667fa3 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 19 Apr 2022 11:39:54 +0200 Subject: [PATCH 2/2] Upgrade to Mybatis Spring Version 2.1.0 Closes #1220 --- pom.xml | 6 +----- .../MyBatisCustomizingNamespaceHsqlIntegrationTests.java | 2 -- .../data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 7e5f9a4d9f..b3c154ebb2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.0.2 - 2.0.7 + 2.1.0 3.5.9 @@ -152,10 +152,6 @@ spring-libs-snapshot https://repo.spring.io/libs-snapshot - - oss-sonatype-snapshot - https://oss.sonatype.org/content/repositories/snapshots - 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 b826aeb67e..de126979de 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,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/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 f83cf3df06..44388aca75 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,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;