Update Spring Boot to 3.1.0, dependencies, remove standalone and dock…

…er image
nkonev · May 27, 2023 · b7681a8 · b7681a8
1 parent 48bea0b
commit b7681a8
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 237 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,5 +32,5 @@ jobs:
           (cd ./docker; docker-compose down -v; docker-compose up -d mssql postgresql)
           pwd
           ls -lah
-          ./mvnw clean package -DenableStandaloneTests=true -DenableOomTests=true -DenableFuzzyStartMssqlTests=true
+          ./mvnw clean package -DenableOomTests=true -DenableFuzzyStartMssqlTests=true
           rm -rf ~/.m2/repository/name/nkonev/r2dbc-migrate
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>name.nkonev.r2dbc-migrate</groupId>
 	<artifactId>r2dbc-migrate-parent</artifactId>
-	<version>2.9.5-SNAPSHOT</version>
+	<version>2.10.0-SNAPSHOT</version>
 	<name>r2dbc-migrate parent project</name>
 	<description>R2DBC migration tool and library</description>
 	<packaging>pom</packaging>
@@ -36,9 +36,9 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<spring.boot.version>3.0.0</spring.boot.version>
+		<spring.boot.version>3.1.0</spring.boot.version>
 		<maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
-		<testcontainers.version>1.17.2</testcontainers.version>
+		<testcontainers.version>1.18.1</testcontainers.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.encoding>${project.build.sourceEncoding}</maven.compiler.encoding>
@@ -51,11 +51,11 @@
         <nexus.staging.plugin.version>1.6.13</nexus.staging.plugin.version>
         <maven.gpg.plugin>3.0.1</maven.gpg.plugin>
         <reflections.version>0.10.2</reflections.version>
-        <mssql.driver.version>1.0.0.RELEASE</mssql.driver.version>
-        <mysql.driver.version>1.0.0</mysql.driver.version>
-        <mariadb.driver.version>1.1.3</mariadb.driver.version>
-        <commons.io.version>2.11.0</commons.io.version>
-        <logcaptor.version>2.7.10</logcaptor.version>
+        <mssql.driver.version>1.0.1.RELEASE</mssql.driver.version>
+        <mysql.driver.version>1.0.1</mysql.driver.version>
+        <mariadb.driver.version>1.1.4</mariadb.driver.version>
+        <commons.io.version>2.12.0</commons.io.version>
+        <logcaptor.version>2.9.0</logcaptor.version>
     </properties>
 
 	<modules>
@@ -64,7 +64,6 @@
 		<module>r2dbc-migrate-resource-reader-reflections</module>
 		<module>r2dbc-migrate-resource-reader-spring</module>
 		<module>r2dbc-migrate-spring-boot-starter</module>
-		<module>r2dbc-migrate-standalone</module>
 	</modules>
 
 	<dependencyManagement>

diff --git a/r2dbc-migrate-core/pom.xml b/r2dbc-migrate-core/pom.xml
@@ -8,14 +8,14 @@
 	<parent>
 		<artifactId>r2dbc-migrate-parent</artifactId>
 		<groupId>name.nkonev.r2dbc-migrate</groupId>
-		<version>2.9.5-SNAPSHOT</version>
+		<version>2.10.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<artifactId>r2dbc-migrate-resource-reader-api</artifactId>
 			<groupId>name.nkonev.r2dbc-migrate</groupId>
-			<version>2.9.5-SNAPSHOT</version>
+			<version>2.10.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.r2dbc</groupId>
@@ -95,13 +95,13 @@
 		<dependency>
 			<artifactId>r2dbc-migrate-resource-reader-reflections</artifactId>
 			<groupId>name.nkonev.r2dbc-migrate</groupId>
-			<version>2.9.5-SNAPSHOT</version>
+			<version>2.10.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<artifactId>r2dbc-migrate-resource-reader-spring</artifactId>
 			<groupId>name.nkonev.r2dbc-migrate</groupId>
-			<version>2.9.5-SNAPSHOT</version>
+			<version>2.10.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/r2dbc-migrate-resource-reader-api/pom.xml b/r2dbc-migrate-resource-reader-api/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>r2dbc-migrate-parent</artifactId>
 		<groupId>name.nkonev.r2dbc-migrate</groupId>
-		<version>2.9.5-SNAPSHOT</version>
+		<version>2.10.0-SNAPSHOT</version>
 	</parent>
 
 </project>
diff --git a/r2dbc-migrate-resource-reader-reflections/pom.xml b/r2dbc-migrate-resource-reader-reflections/pom.xml
@@ -8,14 +8,14 @@
 	<parent>
 		<artifactId>r2dbc-migrate-parent</artifactId>
 		<groupId>name.nkonev.r2dbc-migrate</groupId>
-		<version>2.9.5-SNAPSHOT</version>
+		<version>2.10.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<artifactId>r2dbc-migrate-resource-reader-api</artifactId>
 			<groupId>name.nkonev.r2dbc-migrate</groupId>
-			<version>2.9.5-SNAPSHOT</version>
+			<version>2.10.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

diff --git a/r2dbc-migrate-resource-reader-spring/pom.xml b/r2dbc-migrate-resource-reader-spring/pom.xml
@@ -8,14 +8,14 @@
 	<parent>
 		<artifactId>r2dbc-migrate-parent</artifactId>
 		<groupId>name.nkonev.r2dbc-migrate</groupId>
-		<version>2.9.5-SNAPSHOT</version>
+		<version>2.10.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<artifactId>r2dbc-migrate-resource-reader-api</artifactId>
 			<groupId>name.nkonev.r2dbc-migrate</groupId>
-			<version>2.9.5-SNAPSHOT</version>
+			<version>2.10.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

diff --git a/r2dbc-migrate-spring-boot-starter/pom.xml b/r2dbc-migrate-spring-boot-starter/pom.xml
@@ -8,19 +8,19 @@
 	<parent>
 		<artifactId>r2dbc-migrate-parent</artifactId>
 		<groupId>name.nkonev.r2dbc-migrate</groupId>
-		<version>2.9.5-SNAPSHOT</version>
+		<version>2.10.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<artifactId>r2dbc-migrate-core</artifactId>
 			<groupId>name.nkonev.r2dbc-migrate</groupId>
-			<version>2.9.5-SNAPSHOT</version>
+			<version>2.10.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>r2dbc-migrate-resource-reader-spring</artifactId>
 			<groupId>name.nkonev.r2dbc-migrate</groupId>
-			<version>2.9.5-SNAPSHOT</version>
+			<version>2.10.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/r2dbc-migrate-standalone/Dockerfile b/r2dbc-migrate-standalone/Dockerfile
diff --git a/r2dbc-migrate-standalone/pom.xml b/r2dbc-migrate-standalone/pom.xml
diff --git a/...tandalone/src/main/java/name/nkonev/r2dbc/migrate/standalone/R2dbcMigrateApplication.java b/...tandalone/src/main/java/name/nkonev/r2dbc/migrate/standalone/R2dbcMigrateApplication.java
diff --git a/...lone/src/test/java/name/nkonev/r2dbc/migrate/standalone/R2dbcMigrateApplicationTests.java b/...lone/src/test/java/name/nkonev/r2dbc/migrate/standalone/R2dbcMigrateApplicationTests.java
diff --git a/r2dbc-migrate-standalone/src/test/resources/application.properties b/r2dbc-migrate-standalone/src/test/resources/application.properties
diff --git a/readme.md b/readme.md
@@ -10,7 +10,7 @@ Inspired by [this](https://spring.io/blog/2020/03/12/spring-boot-2-3-0-m3-availa
 * Microsoft SQL Server
 * H2
 * MariaDB
-* MySQL - see the new R2DBC 1.0-compatible [driver](https://github.com/asyncer-io/r2dbc-mysql)
+* MySQL
 
 
 It supports user-provided dialect. You can pass implementation of `SqlQueries` interface to the `migrate()` method. If you use Spring Boot, just define a bean of type `SqlQueries`. Example [SimplePostgresqlDialect](https://github.com/nkonev/r2dbc-migrate/blob/d65c7c49512a598dc4cc664bc33f78cb57ef3c43/r2dbc-migrate-core/src/test/java/name/nkonev/r2dbc/migrate/core/PostgresTestcontainersTest.java#L408).
@@ -25,7 +25,6 @@ It supports user-provided dialect. You can pass implementation of `SqlQueries` i
 * Supports lock, that make you able to start number of replicas your microservice, without care of migrations collide each other. Database-specific lock tracking [issue](https://github.com/nkonev/r2dbc-migrate/issues/28).
 * Each migration runs in the separated transaction by default
 * It also supports `nontransactional` migrations, due to SQL Server 2017 prohibits `CREATE DATABASE` in the transaction
-* Docker image
 * First-class Spring Boot integration, see example below
 * Also you can use this library without Spring (Boot), see library example below
 * This library tends to be non-invasive, consequently it intentionally doesn't try to parse SQL and make some decisions relying on. So (in theory) you can freely update database and driver's version
@@ -92,21 +91,3 @@ See example [here](https://github.com/nkonev/r2dbc-migrate-example/tree/native).
 
 ## Library example
 https://github.com/nkonev/r2dbc-migrate-example/tree/library
-
-## docker-compose v3 example
-```yml
-version: '3.7'
-services:
-  migrate:
-    image: nkonev/r2dbc-migrate:VERSION
-    environment:
-      _JAVA_OPTIONS: -Xmx128m
-      spring.r2dbc.url: "r2dbc:pool:mssql://mssqlcontainer:1433"
-      spring.r2dbc.username: sa
-      spring.r2dbc.password: "yourSuperStrong(!)Password"
-      r2dbc.migrate.resourcesPath: "file:/migrations/*.sql"
-      r2dbc.migrate.validationQuery: "SELECT collation_name as result FROM sys.databases WHERE name = N'master'"
-      r2dbc.migrate.validationQueryExpectedResultValue: "Cyrillic_General_CI_AS"
-    volumes:
-      - ./migrations:/migrations
-```