DevFW-CICD/spring-petclinic
14
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-12-27 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to Spring Boot 4.0.0

Browse source 
Signed-off-by: Patrick Baumgartner <contact@patbaumgartner.com>
This commit is contained in:
Patrick Baumgartner 2025-11-22 17:03:50 +01:00 • committed by Dave Syer
parent b5a630b199
commit 37d53152a0
12 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
View file

@ -17,7 +17,6 @@ package org.springframework.samples.petclinic.owner;
import java.util.Optional;
import jakarta.annotation.Nonnull;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;

4
src/test/java/org/springframework/samples/petclinic/MySqlIntegrationTests.java
View file

@ -33,9 +33,9 @@ import org.springframework.samples.petclinic.vet.VetRepository;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.aot.DisabledInAotMode;
import org.springframework.web.client.RestTemplate;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.mysql.MySQLContainer;
import org.testcontainers.utility.DockerImageName;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@ -47,7 +47,7 @@ class MySqlIntegrationTests {
@ServiceConnection
@Container
static MySQLContainer<?> container = new MySQLContainer<>(DockerImageName.parse("mysql:9.2"));
static MySQLContainer container = new MySQLContainer(DockerImageName.parse("mysql:9.5"));
@LocalServerPort
int port;

6
src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java
View file

@ -21,7 +21,7 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.mysql.MySQLContainer;
import org.testcontainers.utility.DockerImageName;
/**
@ -35,8 +35,8 @@ public class MysqlTestApplication {
@ServiceConnection
@Profile("mysql")
@Bean
static MySQLContainer<?> container() {
return new MySQLContainer<>(DockerImageName.parse("mysql:9.2"));
static MySQLContainer container() {
return new MySQLContainer(DockerImageName.parse("mysql:9.5"));
}
public static void main(String[] args) {

2
src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
View file

@ -31,9 +31,9 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.samples.petclinic.owner.Owner;
import org.springframework.samples.petclinic.owner.OwnerRepository;
import org.springframework.samples.petclinic.owner.PetTypeRepository;
import org.springframework.samples.petclinic.owner.Pet;
import org.springframework.samples.petclinic.owner.PetType;
import org.springframework.samples.petclinic.owner.PetTypeRepository;
import org.springframework.samples.petclinic.owner.Visit;
import org.springframework.samples.petclinic.vet.Vet;
import org.springframework.samples.petclinic.vet.VetRepository;

2
src/test/java/org/springframework/samples/petclinic/system/CrashControllerIntegrationTests.java
View file

@ -48,7 +48,7 @@ import org.springframework.http.ResponseEntity;
*/
// NOT Waiting https://github.com/spring-projects/spring-boot/issues/5574
@SpringBootTest(webEnvironment = RANDOM_PORT,
properties = { "server.error.include-message=ALWAYS", "management.endpoints.access.default=none" })
properties = { "spring.web.error.include-message=ALWAYS", "management.endpoints.access.default=none" })
@AutoConfigureTestRestTemplate
class CrashControllerIntegrationTests {