From 2a0117c7a1d427488145d88470dace7399472a59 Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Wed, 18 Jun 2025 16:38:41 +0100 Subject: [PATCH 1/2] [APPENG-1245] Add support for spring boot 3.5 --- .github/workflows/build.yml | 4 ++-- CHANGELOG.md | 7 +++++++ build.common.gradle | 2 ++ build.gradle | 2 +- build.libraries.gradle | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13657898..c5a28091 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,8 @@ jobs: max-parallel: 100 matrix: spring_boot_version: - - 3.4.0 - - 3.3.1 + - 3.4.6 + - 3.5.0 env: SPRING_BOOT_VERSION: ${{ matrix.spring_boot_version }} GRADLE_OPTS: "-Djava.security.egd=file:/dev/./urandom -Dorg.gradle.parallel=true" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ac824d4..e85be7ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ 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). +# 1.46.1 - 2025/06/18 + +### Changed +- Added support for Spring Boot 3.5. +- Updated the version of spring boot 3.4 to 3.4.6. +- Dropped support for Spring Boot 3.3. + ## 1.51.0 - 2025/04/17 ### Changed diff --git a/build.common.gradle b/build.common.gradle index 6afffc06..acda0929 100644 --- a/build.common.gradle +++ b/build.common.gradle @@ -80,6 +80,8 @@ dependencies { testImplementation libraries.junitMockito testImplementation libraries.assertJCore + testRuntimeOnly libraries.junitPlatformLauncher + if (springBootVersion.startsWith("2")) { /* Since hibernate-validator is depending on jakarta.validation:jakarta-validation-api and we are forcing the version to newer one to be able to compile for both javax and jakarta then we need to explicitly diff --git a/build.gradle b/build.gradle index 32ad5650..f21275ff 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") ?: "3.3.1" + ext.springBootVersion = System.getenv("SPRING_BOOT_VERSION") ?: "3.4.6" } dependencies { classpath "com.avast.gradle:gradle-docker-compose-plugin:0.17.10" diff --git a/build.libraries.gradle b/build.libraries.gradle index 324c17df..aae2cb34 100644 --- a/build.libraries.gradle +++ b/build.libraries.gradle @@ -57,6 +57,7 @@ ext { slf4j : "org.slf4j:slf4j-api", junitApi : 'org.junit.jupiter:junit-jupiter-api', junitEngine : 'org.junit.jupiter:junit-jupiter-engine', + junitPlatformLauncher : 'org.junit.platform:junit-platform-launcher', junitParams : 'org.junit.jupiter:junit-jupiter-params', junitMockito : 'org.mockito:mockito-junit-jupiter', assertJCore : 'org.assertj:assertj-core', From 7eb9a6c2292776838b9331a6e95688e89a0257dc Mon Sep 17 00:00:00 2001 From: Heshan Andrews Date: Mon, 23 Jun 2025 13:24:52 +0100 Subject: [PATCH 2/2] Bump the version and update the date in changelog --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e85be7ad..bb0f34ad 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). -# 1.46.1 - 2025/06/18 +# 1.51.1 - 2025/06/18 ### Changed - Added support for Spring Boot 3.5. diff --git a/gradle.properties b/gradle.properties index 105f37d4..253c5e40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=1.51.0 +version=1.51.1 org.gradle.internal.http.socketTimeout=120000