From 4f256a14855faf8812d5dca82daa69aa6e0df184 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 14:57:21 +0200 Subject: [PATCH 01/10] upgrade-versions - Prepare branch --- 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 b230bbb69e..f7fa40746e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 2.2.0-SNAPSHOT + 2.2.0-upgrade-versions-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index a922ef00a2..c7827aca51 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.2.0-SNAPSHOT + 2.2.0-upgrade-versions-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index d00f04e6e3..2d6682d52d 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 2.2.0-SNAPSHOT + 2.2.0-upgrade-versions-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 2.2.0-SNAPSHOT + 2.2.0-upgrade-versions-SNAPSHOT diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index 6b2507aabe..89915621da 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 2.2.0-SNAPSHOT + 2.2.0-upgrade-versions-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 2.2.0-SNAPSHOT + 2.2.0-upgrade-versions-SNAPSHOT From ac57a644ccba3ed45a07d39fdc5597fd46e7dbd2 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:27:06 +0200 Subject: [PATCH 02/10] Polishing Organize version properties in groups and by alphabet. Extracted additional version properties. --- pom.xml | 22 +++++++++++++++------- spring-data-jdbc/pom.xml | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index f7fa40746e..c9b7d4a4e8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -23,19 +24,26 @@ 2.5.0-SNAPSHOT reuseReports - 0.1.4 + + 3.0.2 + 2.0.0 + 3.5.0 - 4.0.2 + + 11.5.0.0 + 11.1.4.4 1.4.200 2.2.8 + 2.6.0 7.0.0.jre8 - 3.5.0 - 2.0.0 5.1.41 42.0.0 - 2.6.0 - 3.0.2 + 19.6.0.0 + + + 4.0.2 + 0.1.4 2017 diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 2d6682d52d..6c26908184 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -196,14 +196,14 @@ com.ibm.db2 jcc - 11.1.4.4 + ${db2.jcc.version} test com.oracle.database.jdbc ojdbc8 - 19.6.0.0 + ${oracle.version} test From 1f48d922842e224e370c5a26b1460cc7b3083ff6 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:33:00 +0200 Subject: [PATCH 03/10] Upgrade awaitility to 4.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9b7d4a4e8..bd5cfb41fc 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 19.6.0.0 - 4.0.2 + 4.0.3 0.1.4 From 49aaa3616c23266b099b0976a48d555460c7978e Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:34:09 +0200 Subject: [PATCH 04/10] Upgrade postgres driver to 42.2.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd5cfb41fc..7cfa32e28a 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 2.6.0 7.0.0.jre8 5.1.41 - 42.0.0 + 42.2.19 19.6.0.0 From a02d750df1b64b5cdb2b8fa787a6d9f7d6c4929b Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:36:05 +0200 Subject: [PATCH 05/10] Upgrade mysql driver to 8.0.23 --- pom.xml | 2 +- .../data/jdbc/testing/MySqlDataSourceConfiguration.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7cfa32e28a..25d68d1c48 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 2.2.8 2.6.0 7.0.0.jre8 - 5.1.41 + 8.0.23 42.2.19 19.6.0.0 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java index c5427d3e7a..cde066512d 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java @@ -21,14 +21,13 @@ import javax.annotation.PostConstruct; import javax.sql.DataSource; +import com.mysql.cj.jdbc.MysqlDataSource; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.core.io.ByteArrayResource; import org.springframework.jdbc.datasource.init.ScriptUtils; import org.testcontainers.containers.MySQLContainer; -import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; - /** * {@link DataSource} setup for MySQL. Starts a docker container with a MySql database and sets up a database name * "test" in it. From 33c5b54bbce796b0cfc0105c52b1c0f2fa09e610 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:37:15 +0200 Subject: [PATCH 06/10] Upgrade Sql Server driver to 9.2.1.jre8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25d68d1c48..5416adc3a3 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.4.200 2.2.8 2.6.0 - 7.0.0.jre8 + 9.2.1.jre8 8.0.23 42.2.19 19.6.0.0 From d436097377914909a0500c9b6a44d353fb30d760 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:39:10 +0200 Subject: [PATCH 07/10] Upgrade MariaDB driver to 2.7.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5416adc3a3..a25c4de58c 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 11.1.4.4 1.4.200 2.2.8 - 2.6.0 + 2.7.2 9.2.1.jre8 8.0.23 42.2.19 From c93d8c02ad444ed17d87bc78b42f872c99730f0f Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:39:34 +0200 Subject: [PATCH 08/10] Upgrade Hsqldb driver to 2.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a25c4de58c..ee6daa11cb 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 11.5.0.0 11.1.4.4 1.4.200 - 2.2.8 + 2.5.2 2.7.2 9.2.1.jre8 8.0.23 From 0b8500e5c26ca477d6044bd2f64f1ac678b95652 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:43:26 +0200 Subject: [PATCH 09/10] Upgrade DB2 driver to 11.5.5.0 --- pom.xml | 3 +-- spring-data-jdbc/pom.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ee6daa11cb..7621463ec2 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,7 @@ - 11.5.0.0 - 11.1.4.4 + 11.5.5.0 1.4.200 2.5.2 2.7.2 diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 6c26908184..afaa428f61 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -196,7 +196,7 @@ com.ibm.db2 jcc - ${db2.jcc.version} + ${db2.version} test From da8da2536254d853b6af244bc5befd3154980e12 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 13 Apr 2021 16:46:16 +0200 Subject: [PATCH 10/10] Upgrade MyBatis dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7621463ec2..03c0887649 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ 3.0.2 - 2.0.0 - 3.5.0 + 2.0.6 + 3.5.6