diff --git a/pom.xml b/pom.xml index b230bbb69e..03c0887649 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ - + 4.0.0 org.springframework.data spring-data-relational-parent - 2.2.0-SNAPSHOT + 2.2.0-upgrade-versions-SNAPSHOT pom Spring Data Relational Parent @@ -23,19 +24,25 @@ 2.5.0-SNAPSHOT reuseReports - 0.1.4 + + 3.0.2 + 2.0.6 + 3.5.6 - 4.0.2 - 11.5.0.0 + + + 11.5.5.0 1.4.200 - 2.2.8 - 7.0.0.jre8 - 3.5.0 - 2.0.0 - 5.1.41 - 42.0.0 - 2.6.0 - 3.0.2 + 2.5.2 + 2.7.2 + 9.2.1.jre8 + 8.0.23 + 42.2.19 + 19.6.0.0 + + + 4.0.3 + 0.1.4 2017 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..afaa428f61 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 @@ -196,14 +196,14 @@ com.ibm.db2 jcc - 11.1.4.4 + ${db2.version} test com.oracle.database.jdbc ojdbc8 - 19.6.0.0 + ${oracle.version} test 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. 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