From 3a895702a04abcc931c0251a7050bfbe68427966 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 10:44:37 +0100 Subject: [PATCH 01/15] [APPENG-849] Add spring boot 3.3 support --- .github/workflows/build.yml | 1 + CHANGELOG.md | 6 ++++++ gradle.properties | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ac6da0..c5659f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,7 @@ jobs: max-parallel: 100 matrix: spring_boot_version: + - 3.3.0 - 3.2.2 - 3.1.6 - 3.0.13 diff --git a/CHANGELOG.md b/CHANGELOG.md index b59aebd..586b0e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.28.4] - 2024-02-20 + +### Changed + +Added Spring Boot 3.3 support. + ## [0.28.3] - 2024-02-20 ### Changed diff --git a/gradle.properties b/gradle.properties index 1f6dd97..d9cbcb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.28.3 +version=0.28.4 From 7b1e2b1b83b682813ced4e43007eb6ee430ea19c Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 10:55:29 +0100 Subject: [PATCH 02/15] Remove sb 3.0 and 3.1 support --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5659f6..4446f37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,8 +20,6 @@ jobs: spring_boot_version: - 3.3.0 - 3.2.2 - - 3.1.6 - - 3.0.13 - 2.7.18 env: SPRING_BOOT_VERSION: ${{ matrix.spring_boot_version }} From 90523733fb0d5cdb7b00d89a7ac69dc2045d89a0 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 11:06:29 +0100 Subject: [PATCH 03/15] Upgrade spring boot version to 3.3.1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4446f37..7d6a4bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: max-parallel: 100 matrix: spring_boot_version: - - 3.3.0 + - 3.3.1 - 3.2.2 - 2.7.18 env: From 261c5919c28b217b8c3d651d00a6832df4f23835 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 13:12:55 +0100 Subject: [PATCH 04/15] Remove sb 2.7 and add flyway postgres --- .github/workflows/build.yml | 1 - build.libraries.gradle | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d6a4bf..7e2a9f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,6 @@ jobs: spring_boot_version: - 3.3.1 - 3.2.2 - - 2.7.18 env: SPRING_BOOT_VERSION: ${{ matrix.spring_boot_version }} GRADLE_OPTS: "-Djava.security.egd=file:/dev/./urandom -Dorg.gradle.parallel=true" diff --git a/build.libraries.gradle b/build.libraries.gradle index 1b11d88..fe6803b 100644 --- a/build.libraries.gradle +++ b/build.libraries.gradle @@ -31,6 +31,7 @@ ext { commonsLang3 : 'org.apache.commons:commons-lang3', flywayCore : 'org.flywaydb:flyway-core', flywayMysql : 'org.flywaydb:flyway-mysql', + flywayPostgresql : 'org.flywaydb:flyway-postgresql', jacksonDatabind : 'com.fasterxml.jackson.core:jackson-databind', kafkaClients : 'org.apache.kafka:kafka-clients', lombok : 'org.projectlombok:lombok', From 536652b76114db67bc5d4c1bc978e10aecf86bbb Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 13:23:04 +0100 Subject: [PATCH 05/15] Add flyway postgresql as a version defined lib --- build.libraries.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.libraries.gradle b/build.libraries.gradle index fe6803b..e2c9b1e 100644 --- a/build.libraries.gradle +++ b/build.libraries.gradle @@ -7,6 +7,7 @@ ext { commonsIo : 'commons-io:commons-io:2.15.1', curatorFramework : 'org.apache.curator:curator-framework:5.5.0', curatorRecipes : 'org.apache.curator:curator-recipes:5.5.0', + flywayPostgresql : 'org.flywaydb:flyway-postgresql:10.15.2', guava : 'com.google.guava:guava:33.0.0-jre', jakartaValidationApi : 'jakarta.validation:jakarta.validation-api:3.0.2', javaxValidationApi : "javax.validation:validation-api:2.0.1.Final", @@ -31,7 +32,6 @@ ext { commonsLang3 : 'org.apache.commons:commons-lang3', flywayCore : 'org.flywaydb:flyway-core', flywayMysql : 'org.flywaydb:flyway-mysql', - flywayPostgresql : 'org.flywaydb:flyway-postgresql', jacksonDatabind : 'com.fasterxml.jackson.core:jackson-databind', kafkaClients : 'org.apache.kafka:kafka-clients', lombok : 'org.projectlombok:lombok', From 178f67d035c873ebd22deaa50a0bac134f45602a Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 13:30:47 +0100 Subject: [PATCH 06/15] Add libraries.postgresql to tkms-starter build.gradle --- tw-tkms-starter/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tw-tkms-starter/build.gradle b/tw-tkms-starter/build.gradle index 7b70c90..f59b867 100644 --- a/tw-tkms-starter/build.gradle +++ b/tw-tkms-starter/build.gradle @@ -58,6 +58,9 @@ dependencies { if (!springBootVersion.startsWith("2.6")) { testImplementation libraries.flywayMysql } + if (springBootVersion.startsWith("3.3")) { + testImplementation libraries.flywayPostgresql + } testImplementation libraries.flywayCore testImplementation libraries.lombok testImplementation libraries.springBootStarterActuator From 3de84eb3f827f11aa36691750de9413d035318fe Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 13:37:03 +0100 Subject: [PATCH 07/15] Fix postgres flyway package name issue --- build.libraries.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.libraries.gradle b/build.libraries.gradle index e2c9b1e..a62ea07 100644 --- a/build.libraries.gradle +++ b/build.libraries.gradle @@ -7,7 +7,7 @@ ext { commonsIo : 'commons-io:commons-io:2.15.1', curatorFramework : 'org.apache.curator:curator-framework:5.5.0', curatorRecipes : 'org.apache.curator:curator-recipes:5.5.0', - flywayPostgresql : 'org.flywaydb:flyway-postgresql:10.15.2', + flywayPostgresql : 'org.flywaydb:flyway-database-postgresql:10.15.2', guava : 'com.google.guava:guava:33.0.0-jre', jakartaValidationApi : 'jakarta.validation:jakarta.validation-api:3.0.2', javaxValidationApi : "javax.validation:validation-api:2.0.1.Final", From 6ab2526820b86f161b55a3b63db236b765bb437d Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Tue, 16 Jul 2024 13:43:55 +0100 Subject: [PATCH 08/15] Update the changelog latest version date --- CHANGELOG.md | 2 +- build.libraries.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 586b0e2..9ab58c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.28.4] - 2024-02-20 +## [0.28.4] - 2024-07-16 ### Changed diff --git a/build.libraries.gradle b/build.libraries.gradle index a62ea07..c3e3402 100644 --- a/build.libraries.gradle +++ b/build.libraries.gradle @@ -7,7 +7,6 @@ ext { commonsIo : 'commons-io:commons-io:2.15.1', curatorFramework : 'org.apache.curator:curator-framework:5.5.0', curatorRecipes : 'org.apache.curator:curator-recipes:5.5.0', - flywayPostgresql : 'org.flywaydb:flyway-database-postgresql:10.15.2', guava : 'com.google.guava:guava:33.0.0-jre', jakartaValidationApi : 'jakarta.validation:jakarta.validation-api:3.0.2', javaxValidationApi : "javax.validation:validation-api:2.0.1.Final", @@ -32,6 +31,7 @@ ext { commonsLang3 : 'org.apache.commons:commons-lang3', flywayCore : 'org.flywaydb:flyway-core', flywayMysql : 'org.flywaydb:flyway-mysql', + flywayPostgresql : 'org.flywaydb:flyway-database-postgresql', jacksonDatabind : 'com.fasterxml.jackson.core:jackson-databind', kafkaClients : 'org.apache.kafka:kafka-clients', lombok : 'org.projectlombok:lombok', From 0135d0324a37a11f184157af68c4e8749c5c98b5 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Wed, 17 Jul 2024 14:53:50 +0100 Subject: [PATCH 09/15] Set the default spring boot version to 3.2.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ee3084e..214518b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.eclipse.jgit.api.errors.RefAlreadyExistsException buildscript { if (!project.hasProperty("springBootVersion")) { - ext.springBootVersion = System.getenv("SPRING_BOOT_VERSION") ?: "2.7.18" + ext.springBootVersion = System.getenv("SPRING_BOOT_VERSION") ?: "3.2.2" } dependencies { classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' From b3e3b92aa4110f2dea7365c9046d1d789df80b51 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Wed, 17 Jul 2024 15:13:29 +0100 Subject: [PATCH 10/15] set the spring boot version in build.libraries.gradle --- build.libraries.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.libraries.gradle b/build.libraries.gradle index c3e3402..0e0d20f 100644 --- a/build.libraries.gradle +++ b/build.libraries.gradle @@ -1,6 +1,6 @@ ext { protobufVersion = "3.24.0" - springBootVersion = "${System.getenv("SPRING_BOOT_VERSION") ?: '2.7.18'}" + springBootVersion = "${System.getenv("SPRING_BOOT_VERSION") ?: '3.2.2'}" libraries = [ // version defined awaitility : 'org.awaitility:awaitility:4.2.0', From 1b6117f9f96c22056a44b7197171650b8df3fdd5 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Fri, 19 Jul 2024 17:11:14 +0100 Subject: [PATCH 11/15] Change gzip expected file size in postgres e2e tests --- .../com/transferwise/kafka/tkms/PostgresEndToEndIntTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/PostgresEndToEndIntTest.java b/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/PostgresEndToEndIntTest.java index 821f952..c1e9a71 100644 --- a/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/PostgresEndToEndIntTest.java +++ b/tw-tkms-starter/src/test/java/com/transferwise/kafka/tkms/PostgresEndToEndIntTest.java @@ -16,7 +16,7 @@ private static Stream compressionInput() { var arguments = new ArrayList(); for (var deferUntilCommit : deferUntilCommits) { - arguments.add(Arguments.of(CompressionAlgorithm.GZIP, 112, 111, deferUntilCommit)); + arguments.add(Arguments.of(CompressionAlgorithm.GZIP, 111, 110, deferUntilCommit)); arguments.add(Arguments.of(CompressionAlgorithm.NONE, 1172, 1171, deferUntilCommit)); arguments.add(Arguments.of(CompressionAlgorithm.LZ4, 135, 134, deferUntilCommit)); arguments.add(Arguments.of(CompressionAlgorithm.SNAPPY, 164, 160, deferUntilCommit)); From c187dd490fdf989a81934bc67f5b2116e5451b2e Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Mon, 22 Jul 2024 14:01:24 +0100 Subject: [PATCH 12/15] Remove conditional addition of flywayMysql --- tw-tkms-starter/build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tw-tkms-starter/build.gradle b/tw-tkms-starter/build.gradle index f59b867..6952fd7 100644 --- a/tw-tkms-starter/build.gradle +++ b/tw-tkms-starter/build.gradle @@ -55,12 +55,10 @@ dependencies { testImplementation project(":tw-tkms-test-starter") testImplementation libraries.awaitility - if (!springBootVersion.startsWith("2.6")) { - testImplementation libraries.flywayMysql - } if (springBootVersion.startsWith("3.3")) { testImplementation libraries.flywayPostgresql } + testImplementation libraries.flywayMysql testImplementation libraries.flywayCore testImplementation libraries.lombok testImplementation libraries.springBootStarterActuator From cba2e503ba8338e2c33f74b84d2a09c31d96474f Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Mon, 22 Jul 2024 14:17:06 +0100 Subject: [PATCH 13/15] Change the flywayPostgresql conditional statement to use negate of the previous --- tw-tkms-starter/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tw-tkms-starter/build.gradle b/tw-tkms-starter/build.gradle index 6952fd7..4dada7d 100644 --- a/tw-tkms-starter/build.gradle +++ b/tw-tkms-starter/build.gradle @@ -55,7 +55,7 @@ dependencies { testImplementation project(":tw-tkms-test-starter") testImplementation libraries.awaitility - if (springBootVersion.startsWith("3.3")) { + if (!springBootVersion.startsWith("3.2")) { testImplementation libraries.flywayPostgresql } testImplementation libraries.flywayMysql From 0b9a53c36fb073d68281a714c4d4dbf25406de36 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Mon, 22 Jul 2024 14:23:22 +0100 Subject: [PATCH 14/15] Bump the version to a minor --- CHANGELOG.md | 5 +++-- gradle.properties | 2 +- tw-tkms-starter/build.gradle | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ab58c6..bdace02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.28.4] - 2024-07-16 +## [0.29.0] - 2024-07-16 ### Changed -Added Spring Boot 3.3 support. +- Added Spring Boot 3.3 support. +- Removed support for spring boot 3.1 and 2.7. ## [0.28.3] - 2024-02-20 diff --git a/gradle.properties b/gradle.properties index d9cbcb9..187e7df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.28.4 +version=0.29.0 diff --git a/tw-tkms-starter/build.gradle b/tw-tkms-starter/build.gradle index 4dada7d..82f5228 100644 --- a/tw-tkms-starter/build.gradle +++ b/tw-tkms-starter/build.gradle @@ -55,6 +55,7 @@ dependencies { testImplementation project(":tw-tkms-test-starter") testImplementation libraries.awaitility + // If we are running on spring boot 3.3 or newer then we need to use the flyway-postgresql dependency. if (!springBootVersion.startsWith("3.2")) { testImplementation libraries.flywayPostgresql } From 971dd1a2ea95e617ad17ed0ea4b831f32c15857f Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Mon, 22 Jul 2024 14:28:58 +0100 Subject: [PATCH 15/15] Update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdace02..e04f0cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.29.0] - 2024-07-16 -### Changed +### Added - Added Spring Boot 3.3 support. + +### Removed - Removed support for spring boot 3.1 and 2.7. ## [0.28.3] - 2024-02-20