From c5df8f3d1c978e46ff8bd73958aefaa1486ef1b1 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 14 Jan 2022 10:57:50 +0100 Subject: [PATCH 1/9] Prepare 2.4 M1 (2021.2.0). See #1088 --- pom.xml | 8 ++++---- src/main/resources/notice.txt | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2c64717780..0a74c396bd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,12 +15,12 @@ org.springframework.data.build spring-data-parent - 2.7.0-SNAPSHOT + 2.7.0-M1 spring-data-jdbc - 2.7.0-SNAPSHOT + 2.7.0-M1 reuseReports @@ -276,8 +276,8 @@ - spring-libs-snapshot - https://repo.spring.io/libs-snapshot + spring-libs-milestone + https://repo.spring.io/libs-milestone diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index 64e438568d..3dbd606f0c 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -1,4 +1,4 @@ -Spring Data JDBC 2.3 GA (2021.1.0) +Spring Data JDBC 2.4 M1 (2021.2.0) Copyright (c) [2017-2019] Pivotal Software, Inc. This product is licensed to you under the Apache License, Version 2.0 (the "License"). @@ -30,5 +30,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file. + From 38a8089cb548977991a97788d919fa430c57f241 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 14 Jan 2022 10:58:16 +0100 Subject: [PATCH 2/9] Release version 2.4 M1 (2021.2.0). See #1088 --- pom.xml | 2 +- spring-data-jdbc-distribution/pom.xml | 2 +- spring-data-jdbc/pom.xml | 4 ++-- spring-data-relational/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 0a74c396bd..a8ec61a236 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-M1 pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index 0646c2846d..2bc9f10d99 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 - 2.4.0-SNAPSHOT + 2.4.0-M1 ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 11114a795e..d08fc0d1e9 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 2.4.0-SNAPSHOT + 2.4.0-M1 Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-M1 diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index a6eb48c891..2c66ccb09b 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 2.4.0-SNAPSHOT + 2.4.0-M1 Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-M1 From 51ffa1c59fa70731b2c645513321c9ff9c8ff21e Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 14 Jan 2022 11:07:59 +0100 Subject: [PATCH 3/9] Prepare next development iteration. See #1088 --- pom.xml | 2 +- spring-data-jdbc-distribution/pom.xml | 2 +- spring-data-jdbc/pom.xml | 4 ++-- spring-data-relational/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a8ec61a236..0a74c396bd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-M1 + 2.4.0-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index 2bc9f10d99..0646c2846d 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 - 2.4.0-M1 + 2.4.0-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index d08fc0d1e9..11114a795e 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 2.4.0-M1 + 2.4.0-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-M1 + 2.4.0-SNAPSHOT diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index 2c66ccb09b..a6eb48c891 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 2.4.0-M1 + 2.4.0-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-M1 + 2.4.0-SNAPSHOT From cb5e3271a4789595300c4a0e2cb684dac3f5985d Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 14 Jan 2022 11:08:02 +0100 Subject: [PATCH 4/9] After release cleanups. See #1088 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0a74c396bd..2c64717780 100644 --- a/pom.xml +++ b/pom.xml @@ -15,12 +15,12 @@ org.springframework.data.build spring-data-parent - 2.7.0-M1 + 2.7.0-SNAPSHOT spring-data-jdbc - 2.7.0-M1 + 2.7.0-SNAPSHOT reuseReports @@ -276,8 +276,8 @@ - spring-libs-milestone - https://repo.spring.io/libs-milestone + spring-libs-snapshot + https://repo.spring.io/libs-snapshot From d879f21f57056c7eb84302654a95143f59e3ad57 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 18 Jan 2022 09:08:59 +0100 Subject: [PATCH 5/9] Prepare 2.4 M2 (2021.2.0). See #1131 --- pom.xml | 8 ++++---- src/main/resources/notice.txt | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2c64717780..e55043e2bd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,12 +15,12 @@ org.springframework.data.build spring-data-parent - 2.7.0-SNAPSHOT + 2.7.0-M2 spring-data-jdbc - 2.7.0-SNAPSHOT + 2.7.0-M2 reuseReports @@ -276,8 +276,8 @@ - spring-libs-snapshot - https://repo.spring.io/libs-snapshot + spring-libs-milestone + https://repo.spring.io/libs-milestone diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index 3dbd606f0c..c3d360e056 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -1,4 +1,4 @@ -Spring Data JDBC 2.4 M1 (2021.2.0) +Spring Data JDBC 2.4 M2 (2021.2.0) Copyright (c) [2017-2019] Pivotal Software, Inc. This product is licensed to you under the Apache License, Version 2.0 (the "License"). @@ -31,5 +31,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file. + From 76ece50f2b0a638c44a3e068f7456d1cced63007 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 18 Jan 2022 09:09:34 +0100 Subject: [PATCH 6/9] Release version 2.4 M2 (2021.2.0). See #1131 --- pom.xml | 2 +- spring-data-jdbc-distribution/pom.xml | 2 +- spring-data-jdbc/pom.xml | 4 ++-- spring-data-relational/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index e55043e2bd..5992dc1d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-M2 pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index 0646c2846d..cb4596228f 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 - 2.4.0-SNAPSHOT + 2.4.0-M2 ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 11114a795e..349c604731 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 2.4.0-SNAPSHOT + 2.4.0-M2 Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-M2 diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index a6eb48c891..6a7225368d 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 2.4.0-SNAPSHOT + 2.4.0-M2 Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-SNAPSHOT + 2.4.0-M2 From dce0e36c9091a541cd948518384854e49cf3e0e9 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 18 Jan 2022 09:21:29 +0100 Subject: [PATCH 7/9] Prepare next development iteration. See #1131 --- pom.xml | 2 +- spring-data-jdbc-distribution/pom.xml | 2 +- spring-data-jdbc/pom.xml | 4 ++-- spring-data-relational/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 5992dc1d2d..e55043e2bd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-M2 + 2.4.0-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index cb4596228f..0646c2846d 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 - 2.4.0-M2 + 2.4.0-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 349c604731..11114a795e 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 2.4.0-M2 + 2.4.0-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-M2 + 2.4.0-SNAPSHOT diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index 6a7225368d..a6eb48c891 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 2.4.0-M2 + 2.4.0-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 2.4.0-M2 + 2.4.0-SNAPSHOT From eee773ea829403f0a3802aad046177e559903ea4 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 18 Jan 2022 09:21:32 +0100 Subject: [PATCH 8/9] After release cleanups. See #1131 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e55043e2bd..2c64717780 100644 --- a/pom.xml +++ b/pom.xml @@ -15,12 +15,12 @@ org.springframework.data.build spring-data-parent - 2.7.0-M2 + 2.7.0-SNAPSHOT spring-data-jdbc - 2.7.0-M2 + 2.7.0-SNAPSHOT reuseReports @@ -276,8 +276,8 @@ - spring-libs-milestone - https://repo.spring.io/libs-milestone + spring-libs-snapshot + https://repo.spring.io/libs-snapshot From fa86ba895e21bf45078942dad623768b42e42703 Mon Sep 17 00:00:00 2001 From: Stefan Kuhn Date: Wed, 26 Jan 2022 16:33:18 +0100 Subject: [PATCH 9/9] chore: qualify jdbcMappingContext for expected behaviour when using r2dbc in parallel --- .../jdbc/repository/support/JdbcRepositoryFactoryBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java index f52efa84e6..51adc7cb2d 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.data.jdbc.core.convert.DataAccessStrategy; @@ -96,7 +97,7 @@ protected RepositoryFactorySupport doCreateRepositoryFactory() { } @Autowired - public void setMappingContext(RelationalMappingContext mappingContext) { + public void setMappingContext(@Qualifier("jdbcMappingContext") RelationalMappingContext mappingContext) { Assert.notNull(mappingContext, "MappingContext must not be null");