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

[APPENG-849] Add spring boot 3.3 support #85

Merged
merged 15 commits into from
Jul 22, 2024
Merged

[APPENG-849] Add spring boot 3.3 support #85

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3a89570
[APPENG-849] Add spring boot 3.3 support
Gravewalker666 Jul 16, 2024
7b1e2b1
Remove sb 3.0 and 3.1 support
Gravewalker666 Jul 16, 2024
9052373
Upgrade spring boot version to 3.3.1
Gravewalker666 Jul 16, 2024
261c591
Remove sb 2.7 and add flyway postgres
Gravewalker666 Jul 16, 2024
536652b
Add flyway postgresql as a version defined lib
Gravewalker666 Jul 16, 2024
178f67d
Add libraries.postgresql to tkms-starter build.gradle
Gravewalker666 Jul 16, 2024
3de84eb
Fix postgres flyway package name issue
Gravewalker666 Jul 16, 2024
6ab2526
Update the changelog latest version date
Gravewalker666 Jul 16, 2024
0135d03
Set the default spring boot version to 3.2.2
Gravewalker666 Jul 17, 2024
b3e3b92
set the spring boot version in build.libraries.gradle
Gravewalker666 Jul 17, 2024
1b6117f
Change gzip expected file size in postgres e2e tests
Gravewalker666 Jul 19, 2024
c187dd4
Remove conditional addition of flywayMysql
Gravewalker666 Jul 22, 2024
cba2e50
Change the flywayPostgresql conditional statement to use negate of th…
Gravewalker666 Jul 22, 2024
0b9a53c
Bump the version to a minor
Gravewalker666 Jul 22, 2024
971dd1a
Update changelog
Gravewalker666 Jul 22, 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
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ jobs:
max-parallel: 100
matrix:
spring_boot_version:
- 3.3.1
- 3.2.2
- 3.1.6
- 3.0.13
- 2.7.18
env:
SPRING_BOOT_VERSION: ${{ matrix.spring_boot_version }}
GRADLE_OPTS: "-Djava.security.egd=file:/dev/./urandom -Dorg.gradle.parallel=true"
Expand Down
6 changes: 6 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,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

### Changed

Added Spring Boot 3.3 support.

## [0.28.3] - 2024-02-20

### Changed
Expand Down
1 change: 1 addition & 0 deletions build.libraries.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-database-postgresql',
jacksonDatabind : 'com.fasterxml.jackson.core:jackson-databind',
kafkaClients : 'org.apache.kafka:kafka-clients',
lombok : 'org.projectlombok:lombok',
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 +1 @@
version=0.28.3
version=0.28.4
3 changes: 3 additions & 0 deletions tw-tkms-starter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ dependencies {
if (!springBootVersion.startsWith("2.6")) {
testImplementation libraries.flywayMysql
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tw-peeterkarolin should we get rid of this block now that we don't support 2.6 anymore?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not Peeter, but I think that will make sense

Copy link
Contributor

Choose a reason for hiding this comment

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

Agree as well that now that we only have Boot 2.7 and up then there is no need for that if block. Now we can always add the flywayMysql

if (springBootVersion.startsWith("3.3")) {
Copy link
Contributor

@tw-peeterkarolin tw-peeterkarolin Jul 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

That if might be better if we use !springBootVersion.startsWith("3.2") instead so that it will be forward compatible with next Spring Boot versions.

On the other hand it will constantly remind us that we need to double check if we still need that if at all in new boot versions, so it's more an optional comment.

testImplementation libraries.flywayPostgresql
}
testImplementation libraries.flywayCore
testImplementation libraries.lombok
testImplementation libraries.springBootStarterActuator
Expand Down
Loading