Upgrade to Spring Framework 5.2.0

spring-petclinic · Oct 10, 2019 · f366df3 · f366df3
1 parent 93f539f
commit f366df3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-framework-petclinic</artifactId>
-    <version>5.1.5</version>
+    <version>5.2.0</version>
 
     <name>Spring Framework Petclinic</name>
     <packaging>war</packaging>
@@ -21,7 +21,9 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- Spring -->
-        <spring-framework.version>5.1.5.RELEASE</spring-framework.version>
+        <!-- For framework compatibility, refer to the Spring Boot Dependencies BOM -->
+        <!-- https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot-dependencies/pom.xml -->
+        <spring-framework.version>5.2.0.RELEASE</spring-framework.version>
         <spring-data-jdbc.version>2.0.0.M1</spring-data-jdbc.version>
 
         <!-- Web dependencies -->
@@ -32,40 +34,42 @@
         <wro4j.version>1.8.0</wro4j.version>
 
         <!-- Java EE / Java SE dependencies -->
-        <tomcat.version>9.0.12</tomcat.version>
-        <jaxb.version>2.3.0</jaxb.version>
+        <tomcat.version>9.0.26</tomcat.version>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
+        <jaxb-core.version>2.3.0.1</jaxb-core.version>
+        <jaxb-impl.version>2.3.2</jaxb-impl.version>
         <activation.version>1.1.1</activation.version>
         <servlet-api.version>4.0.1</servlet-api.version>
         <taglibs-standard.version>1.2.5</taglibs-standard.version>
 
         <!-- Persistence -->
-        <spring-data-releasetrain.version>Lovelace-SR5</spring-data-releasetrain.version>
-        <hibernate.version>5.3.7.Final</hibernate.version>
-        <hibernate-validator.version>6.0.14.Final</hibernate-validator.version>
-        <hsqldb.version>2.4.1</hsqldb.version>
+        <spring-data-releasetrain.version>Moore-RELEASE</spring-data-releasetrain.version>
+        <hibernate.version>5.4.6.Final</hibernate.version>
+        <hibernate-validator.version>6.0.17.Final</hibernate-validator.version>
+        <hsqldb.version>2.5.0</hsqldb.version>
 
         <!-- Logging -->
-        <slf4j.version>1.7.25</slf4j.version>
+        <slf4j.version>1.7.28</slf4j.version>
         <logback.version>1.2.3</logback.version>
 
         <!-- Test -->
-        <assertj.version>3.11.1</assertj.version>
+        <assertj.version>3.13.2</assertj.version>
         <jacoco.version>0.8.2</jacoco.version>
         <json-path.version>2.4.0</json-path.version>
-        <mockito.version>2.23.4</mockito.version>
-        <hamcrest.version>1.3</hamcrest.version>
-        <junit-jupiter.version>5.3.2</junit-jupiter.version>
+        <mockito.version>3.1.0</mockito.version>
+        <hamcrest.version>2.1</hamcrest.version>
+        <junit-jupiter.version>5.5.2</junit-jupiter.version>
 
         <!-- JDBC Drivers -->
         <mysql-driver.version>8.0.11</mysql-driver.version>
         <postgresql-driver.version>9.4.1211.jre7</postgresql-driver.version>
 
         <!-- Others -->
-        <jackson.version>2.9.7</jackson.version>
-        <aspectj.version>1.9.1</aspectj.version>
+        <jackson.version>2.10.0</jackson.version>
+        <aspectj.version>1.9.4</aspectj.version>
 
         <!-- Maven plugins -->
-        <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version>
+        <jetty-maven-plugin.version>9.4.20.v20190813</jetty-maven-plugin.version>
         <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
@@ -275,7 +279,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
@@ -286,17 +290,17 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>${jaxb.version}</version>
+            <version>${jaxb-api.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
-            <version>${jaxb.version}</version>
+            <version>${jaxb-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>${jaxb.version}</version>
+            <version>${jaxb-impl.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>

diff --git a/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java
@@ -63,7 +63,7 @@ public void testShowVetListHtml() throws Exception {
     public void testShowResourcesVetList() throws Exception {
         ResultActions actions = mockMvc.perform(get("/vets.json").accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk());
-        actions.andExpect(content().contentType("application/json;charset=UTF-8"))
+        actions.andExpect(content().contentType("application/json"))
             .andExpect(jsonPath("$.vetList[0].id").value(1));
     }