diff --git a/samples/spring-postgres/backend/Dockerfile b/samples/spring-postgres/backend/Dockerfile index 10e0920..abeeae4 100755 --- a/samples/spring-postgres/backend/Dockerfile +++ b/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 diff --git a/samples/spring-postgres/backend/pom.xml b/samples/spring-postgres/backend/pom.xml index aeef767..99faf25 100755 --- a/samples/spring-postgres/backend/pom.xml +++ b/samples/spring-postgres/backend/pom.xml @@ -14,24 +14,28 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 2.2.5.RELEASE UTF-8 UTF-8 - 1.8 + 11 org.springframework.boot - spring-boot-starter-jersey + spring-boot-starter-web org.springframework.boot - spring-boot-starter-web + spring-boot-starter-freemarker + + + org.springframework.boot + spring-boot-starter-jersey org.springframework.session @@ -40,26 +44,22 @@ org.springframework.boot spring-boot-devtools - - - org.springframework.boot - spring-boot-starter-freemarker + runtime + true org.springframework.boot spring-boot-starter-test test - - - org.projectlombok - lombok - - - javax.xml.bind - jaxb-api - 2.3.0 + + + org.junit.vintage + junit-vintage-engine + + + diff --git a/samples/spring-postgres/backend/src/main/java/com/company/project/controllers/HomeController.java b/samples/spring-postgres/backend/src/main/java/com/company/project/controllers/HomeController.java index 966839d..a683b50 100755 --- a/samples/spring-postgres/backend/src/main/java/com/company/project/controllers/HomeController.java +++ b/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 { diff --git a/samples/spring-postgres/backend/src/main/resources/templates/home.ftl b/samples/spring-postgres/backend/src/main/resources/templates/home.ftlh similarity index 100% rename from samples/spring-postgres/backend/src/main/resources/templates/home.ftl rename to samples/spring-postgres/backend/src/main/resources/templates/home.ftlh