Merge pull request #43 from mpbauer/enhancement/bump-to-spring-boot-2…

….4.2

Bump to Spring Boot 2.4.2

pom.xml

@@ -5,15 +5,15 @@
 
     <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>
 
     <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>

src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJdbcTests.java

@@ -29,7 +29,7 @@
  */
 @SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("jdbc, hsqldb")
+@ActiveProfiles({"jdbc", "hsqldb"})
 public class ClinicServiceJdbcTests extends AbstractClinicServiceTests {
 
 

src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceJpaTests.java

@@ -16,7 +16,7 @@
 
 @SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("jpa, hsqldb")
+@ActiveProfiles({"jpa", "hsqldb"})
 public class ClinicServiceJpaTests extends AbstractClinicServiceTests {
 
 }

src/test/java/org/springframework/samples/petclinic/service/clinicService/ClinicServiceSpringDataJpaTests.java

@@ -14,7 +14,7 @@
 
 @SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("spring-data-jpa, hsqldb")
+@ActiveProfiles({"spring-data-jpa", "hsqldb"})
 public class ClinicServiceSpringDataJpaTests extends AbstractClinicServiceTests {
 
 }

src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJdbcTests.java

@@ -7,7 +7,7 @@
 
 @SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("jdbc, hsqldb")
+@ActiveProfiles({"jdbc", "hsqldb"})
 public class UserServiceJdbcTests extends AbstractUserServiceTests {
 
 }

src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceJpaTests.java

@@ -7,7 +7,7 @@
 
 @SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("jpa, hsqldb")
+@ActiveProfiles({"jpa", "hsqldb"})
 public class UserServiceJpaTests extends AbstractUserServiceTests {
 
 }

src/test/java/org/springframework/samples/petclinic/service/userService/UserServiceSpringDataJpaTests.java

@@ -7,7 +7,7 @@
 
 @SpringBootTest
 @RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("spring-data-jpa, hsqldb")
+@ActiveProfiles({"spring-data-jpa", "hsqldb"})
 public class UserServiceSpringDataJpaTests extends AbstractUserServiceTests {
 
 }