Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spring Boot 3.2 support #195

Merged
merged 2 commits into from
Mar 1, 2024
Merged

Spring Boot 3.2 support #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
747ba4f
Add compatibility with Spring Boot 3.2 in matrix tests. Update depend…
tw-peeterkarolin Feb 29, 2024
0c6e188
Make test autoconfiguration deterministic.
tw-peeterkarolin Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ jobs:
max-parallel: 100
matrix:
spring_boot_version:
- 3.1.2
- 3.0.9
- 3.2.3
- 3.1.9
- 2.7.14
- 2.6.15
env:
SPRING_BOOT_VERSION: ${{ matrix.spring_boot_version }}
GRADLE_OPTS: "-Djava.security.egd=file:/dev/./urandom -Dorg.gradle.parallel=true"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ 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.41.3 - 2024/02/29
### Changed
* Add compatibility with Spring Boot 3.2.
* Update dependencies

#### 1.41.2 - 2024/02/16
### Changed
* Kafka producer instantiation will be attempted up to 5 times with a 500ms delay between each attempt. In some cases, it has been observed that the CI fails to start the Kafka producer because the kafka docker container itself seems to not be fully up & accessible yet.
Expand Down
8 changes: 4 additions & 4 deletions build.common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ dependencies {
}

java {
if (springBootVersion.startsWith("3.")) {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
} else {
if (springBootVersion.startsWith("2.")) {
Copy link
Contributor Author

@tw-peeterkarolin tw-peeterkarolin Feb 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unlikely, but to avoid setting Java 11 for Boot 4.x.

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
} else {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
withSourcesJar()
withJavadocJar()
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.eclipse.jgit.api.errors.RefAlreadyExistsException

buildscript {
if (!project.hasProperty("springBootVersion")) {
ext.springBootVersion = System.getenv("SPRING_BOOT_VERSION") ?: "2.6.15"
ext.springBootVersion = System.getenv("SPRING_BOOT_VERSION") ?: "2.7.14"
}
dependencies {
classpath "com.avast.gradle:gradle-docker-compose-plugin:0.16.4"
Expand Down
24 changes: 12 additions & 12 deletions build.libraries.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ ext {
twGafferJtaJakartaStarter : 'com.transferwise.common:tw-gaffer-jta-jakarta-starter:3.0.0',
apacheCuratorRecipies : "org.apache.curator:curator-recipes:5.5.0",
apacheCommonsCollections : "org.apache.commons:commons-collections4:4.4",
commonsIo : "commons-io:commons-io:2.11.0",
guava : "com.google.guava:guava:31.1-jre",
commonsIo : "commons-io:commons-io:2.15.1",
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",
semver4j : "com.vdurmont:semver4j:3.1.0",
spotbugsAnnotations : "com.github.spotbugs:spotbugs-annotations:${spotbugs.toolVersion.get()}",
springBootDependencies : "org.springframework.boot:spring-boot-dependencies:$springBootVersion",
twGracefulShutdown : "com.transferwise.common:tw-graceful-shutdown:2.13.0",
twGracefulShutdownIntefaces : "com.transferwise.common:tw-graceful-shutdown-interfaces:2.13.0",
twContext : "com.transferwise.common:tw-context:0.12.0",
twContextStarter : "com.transferwise.common:tw-context-starter:0.12.0",
twIncidents : 'com.transferwise.common:tw-incidents:1.2.0',
twLeaderSelector : "com.transferwise.common:tw-leader-selector:1.10.0",
twLeaderSelectorStarter : "com.transferwise.common:tw-leader-selector-starter:1.10.0",
twBaseUtils : "com.transferwise.common:tw-base-utils:1.10.1",
twEntryPointsStarter : 'com.transferwise.common:tw-entrypoints-starter:2.10.0',
twSpyqlStarter : 'com.transferwise.common:tw-spyql-starter:1.6.1',
twGracefulShutdown : "com.transferwise.common:tw-graceful-shutdown:2.14.3",
twGracefulShutdownIntefaces : "com.transferwise.common:tw-graceful-shutdown-interfaces:2.14.3",
twContext : "com.transferwise.common:tw-context:1.0.1",
twContextStarter : "com.transferwise.common:tw-context-starter:1.0.1",
twIncidents : 'com.transferwise.common:tw-incidents:1.2.2',
twLeaderSelector : "com.transferwise.common:tw-leader-selector:1.10.2",
twLeaderSelectorStarter : "com.transferwise.common:tw-leader-selector-starter:1.10.2",
twBaseUtils : "com.transferwise.common:tw-base-utils:1.12.4",
twEntryPointsStarter : 'com.transferwise.common:tw-entrypoints-starter:2.16.0',
twSpyqlStarter : 'com.transferwise.common:tw-spyql-starter:1.6.2',
lubenZstd : 'com.github.luben:zstd-jni:1.5.5-2',
lz4Java : 'org.lz4:lz4-java:1.8.0',

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=1.41.2
version=1.41.3
org.gradle.internal.http.socketTimeout=120000
2 changes: 2 additions & 0 deletions ...src/main/java/com/transferwise/tasks/impl/jobs/test/TwTasksJobsTestAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.transferwise.tasks.impl.jobs.test;

import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;

@Configuration
@AutoConfigureBefore(name = "com.transferwise.tasks.core.autoconfigure.TwTasksCoreAutoConfiguration")
@AutoConfigureAfter(name = "com.transferwise.tasks.test.TwTasksCoreTestAutoConfiguration")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make the autoconfigure order deterministic.

@Import(JobsTestConfiguration.class)
public class TwTasksJobsTestAutoConfiguration {

Expand Down
Loading