diff --git a/build.gradle b/build.gradle index aa7c51244fe..21baa9a26e6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { id 'java' id 'org.springframework.boot' version '3.3.4' - id 'io.spring.dependency-management' version '1.1.5' - id 'org.graalvm.buildtools.native' version '0.10.2' - id 'org.cyclonedx.bom' version '1.8.2' - id 'io.spring.javaformat' version '0.0.41' + id 'io.spring.dependency-management' version '1.1.6' + id 'org.graalvm.buildtools.native' version '0.10.3' + id 'org.cyclonedx.bom' version '1.10.0' + id 'io.spring.javaformat' version '0.0.43' id "io.spring.nohttp" version "0.0.11" } @@ -25,6 +25,8 @@ repositories { mavenCentral() } +ext.checkstyleVersion = "10.18.1" +ext.springJavaformatCheckstyleVersion = "0.0.43" ext.webjarsFontawesomeVersion = "4.7.0" ext.webjarsBootstrapVersion = "5.3.3" @@ -49,8 +51,8 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-docker-compose' testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:mysql' - checkstyle 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.41' - checkstyle 'com.puppycrawl.tools:checkstyle:10.16.0' + checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${springJavaformatCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}" } tasks.named('test') { diff --git a/docker-compose.yml b/docker-compose.yml index aaebf7ca813..7d41b57d290 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: mysql: - image: mysql:8.4 + image: mysql:9.0 ports: - "3306:3306" environment: @@ -14,7 +14,7 @@ services: profiles: - mysql postgres: - image: postgres:16.3 + image: postgres:17.0 ports: - "5432:5432" environment: diff --git a/pom.xml b/pom.xml index 276d501f843..e327681664f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,13 +28,13 @@ 5.3.3 4.7.0 - 10.16.0 + 10.18.1 0.8.12 0.2.29 1.0.0 - 3.3.1 + 3.5.0 0.0.11 - 0.0.41 + 0.0.43 diff --git a/readme.md b/readme.md index 9dea4591b24..43d6bab4956 100644 --- a/readme.md +++ b/readme.md @@ -52,13 +52,13 @@ A similar setup is provided for MySQL and PostgreSQL if a persistent database co You can start MySQL or PostgreSQL locally with whatever installer works for your OS or use docker: ```bash -docker run -e MYSQL_USER=petclinic -e MYSQL_PASSWORD=petclinic -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:8.4 +docker run -e MYSQL_USER=petclinic -e MYSQL_PASSWORD=petclinic -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:9.0 ``` or ```bash -docker run -e POSTGRES_USER=petclinic -e POSTGRES_PASSWORD=petclinic -e POSTGRES_DB=petclinic -p 5432:5432 postgres:16.3 +docker run -e POSTGRES_USER=petclinic -e POSTGRES_PASSWORD=petclinic -e POSTGRES_DB=petclinic -p 5432:5432 postgres:17.0 ``` Further documentation is provided for [MySQL](https://github.com/spring-projects/spring-petclinic/blob/main/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt) diff --git a/src/test/java/org/springframework/samples/petclinic/MySqlIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/MySqlIntegrationTests.java index 08d0d712990..300ac359ff9 100644 --- a/src/test/java/org/springframework/samples/petclinic/MySqlIntegrationTests.java +++ b/src/test/java/org/springframework/samples/petclinic/MySqlIntegrationTests.java @@ -46,7 +46,7 @@ class MySqlIntegrationTests { @ServiceConnection @Container - static MySQLContainer container = new MySQLContainer<>("mysql:8.4"); + static MySQLContainer container = new MySQLContainer<>("mysql:9.0"); @LocalServerPort int port; diff --git a/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java b/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java index 3c582d67cdf..96b71ecc515 100644 --- a/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java +++ b/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java @@ -36,7 +36,7 @@ public class MysqlTestApplication { @Profile("mysql") @Bean static MySQLContainer container() { - return new MySQLContainer<>("mysql:8.4"); + return new MySQLContainer<>("mysql:9.0"); } public static void main(String[] args) {