Upgrade to Spring Boot 2.2.5

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

samples/spring-postgres/backend/Dockerfile

@@ -1,11 +1,11 @@
-FROM maven:3.5-jdk-9 AS build
+FROM maven:3.6.3-jdk-11 AS build
 COPY pom.xml .
 RUN mvn --batch-mode dependency:resolve
 COPY . .
 RUN mvn --batch-mode package
 RUN cp target/*jar target/app.jar
 
-FROM openjdk:9-jre
+FROM openjdk:11-jre
 EXPOSE 8080
 VOLUME /tmp
 COPY --from=build target/app.jar app.jar

samples/spring-postgres/backend/pom.xml

@@ -14,24 +14,28 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.3.RELEASE</version>
+        <version>2.2.5.RELEASE</version>
         <relativePath/>
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jersey</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jersey</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.session</groupId>
@@ -40,26 +44,22 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-        </dependency>
+            <scope>runtime</scope>
-        <dependency>
+            <optional>true</optional>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
-        </dependency>
+            <exclusions>
-        <dependency>
+                <exclusion>
-            <groupId>org.projectlombok</groupId>
+                    <groupId>org.junit.vintage</groupId>
-            <artifactId>lombok</artifactId>
+                    <artifactId>junit-vintage-engine</artifactId>
-        </dependency>
+                </exclusion>
-        <dependency>
+            </exclusions>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

samples/spring-postgres/backend/src/main/java/com/company/project/controllers/HomeController.java

@@ -3,7 +3,6 @@ package com.company.project.controllers;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 public class HomeController {