diff --git a/pom.xml b/pom.xml index 90e68b4e628dff76964de9bbffaaa74073d4e026..5420c9c00053f086e34889eaa1b1f1cd3c7fc980 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>org.springframework.samples</groupId> <artifactId>spring-petclinic-rest</artifactId> - <version>2.2.5</version> + <version>2.4.2</version> <description>REST version of the Spring Petclinic sample application</description> <url>https://spring-petclinic.github.io/</url> @@ -13,7 +13,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.2.5.RELEASE</version> + <version>2.4.2</version> <relativePath/> <!-- lookup parent from Maven repository --> </parent> @@ -60,6 +60,10 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + </dependency> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -99,6 +103,18 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> diff --git a/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJdbcTests.java b/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJdbcTests.java index 5c3ea71158d1463426ba35af4a6674abe3ef00bd..06623fec7dbab245c0f2db0f1a14c11a20e8ef0c 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJdbcTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJdbcTests.java @@ -29,7 +29,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("jdbc, hsqldb") +@ActiveProfiles({"jdbc", "hsqldb"}) public class ClinicServiceJdbcTests extends AbstractClinicServiceTests { diff --git a/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJpaTests.java b/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJpaTests.java index d0ada35b7cccafd1695ef4834beeee8185a71e37..162bcb94553c96825b1677e5b24ad05668791345 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJpaTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJpaTests.java @@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("jpa, hsqldb") +@ActiveProfiles({"jpa", "hsqldb"}) public class ClinicServiceJpaTests extends AbstractClinicServiceTests { } diff --git a/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceSpringDataJpaTests.java b/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceSpringDataJpaTests.java index d3f27fbfbce68dc3972d8dd292c72495a36000ba..2b6dbc3a8d5ad25403fab1da2da026a66dfe8e9d 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceSpringDataJpaTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceSpringDataJpaTests.java @@ -14,7 +14,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("spring-data-jpa, hsqldb") +@ActiveProfiles({"spring-data-jpa", "hsqldb"}) public class ClinicServiceSpringDataJpaTests extends AbstractClinicServiceTests { } diff --git a/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJdbcTests.java b/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJdbcTests.java index 790a1ff7f89c1feb2ebab6f7cd71eeecc2a64924..e79eb66150bba43e62b1467211f0cf57a0905979 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJdbcTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJdbcTests.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("jdbc, hsqldb") +@ActiveProfiles({"jdbc", "hsqldb"}) public class UserServiceJdbcTests extends AbstractUserServiceTests { } diff --git a/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJpaTests.java b/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJpaTests.java index 370c6675715cccc3cac55cd07d04be66a9f1bb4b..75210fec435efa43b5fbde67c7ccb7e5e6d7b3eb 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJpaTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJpaTests.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("jpa, hsqldb") +@ActiveProfiles({"jpa", "hsqldb"}) public class UserServiceJpaTests extends AbstractUserServiceTests { } diff --git a/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceSpringDataJpaTests.java b/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceSpringDataJpaTests.java index 09d13146cfcbf08fd00b1be60b13c1ec824f2029..3d077ba32bfd12fd257d15b01cd15243a8770f5d 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceSpringDataJpaTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceSpringDataJpaTests.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("spring-data-jpa, hsqldb") +@ActiveProfiles({"spring-data-jpa", "hsqldb"}) public class UserServiceSpringDataJpaTests extends AbstractUserServiceTests { }