diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index d4f0532f38..f10fe5a909 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -20,10 +20,6 @@ org.springframework.boot spring-boot-starter-thymeleaf - - org.springframework.boot - spring-boot-starter-freemarker - org.springframework.boot spring-boot-starter-web @@ -32,7 +28,6 @@ org.springframework.boot spring-boot-starter-data-jpa - org.springframework.boot spring-boot-starter-actuator diff --git a/spring-boot/src/main/resources/application-errorhandling.properties b/spring-boot/src/main/resources/application-errorhandling.properties index 668ac9ae17..6ffcfbaf52 100644 --- a/spring-boot/src/main/resources/application-errorhandling.properties +++ b/spring-boot/src/main/resources/application-errorhandling.properties @@ -4,10 +4,7 @@ server.servlet-path=/ server.context-path=/ #server.error.whitelabel.enabled=false -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.ErrorMvcAutoConfiguration +#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.ErrorMvcAutoConfiguration #for Spring Boot 2.0+ -#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration - -#freemarker -spring.freemarker.suffix=.ftl \ No newline at end of file +#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration \ No newline at end of file diff --git a/spring-boot/src/main/resources/templates/error-404.ftl b/spring-boot/src/main/resources/templates/error-404.html similarity index 100% rename from spring-boot/src/main/resources/templates/error-404.ftl rename to spring-boot/src/main/resources/templates/error-404.html diff --git a/spring-boot/src/main/resources/templates/error-500.ftl b/spring-boot/src/main/resources/templates/error-500.html similarity index 100% rename from spring-boot/src/main/resources/templates/error-500.ftl rename to spring-boot/src/main/resources/templates/error-500.html diff --git a/spring-boot/src/main/resources/templates/error.ftl b/spring-boot/src/main/resources/templates/error.html similarity index 53% rename from spring-boot/src/main/resources/templates/error.ftl rename to spring-boot/src/main/resources/templates/error.html index be38977a34..26d1a22b6c 100644 --- a/spring-boot/src/main/resources/templates/error.ftl +++ b/spring-boot/src/main/resources/templates/error.html @@ -1,7 +1,7 @@ -

Something went wrong! Our Engineers are on it

+

Something went wrong! Our Engineers are on it temp

Go Home diff --git a/spring-boot/src/main/resources/templates/error/404.html b/spring-boot/src/main/resources/templates/error/404.html new file mode 100644 index 0000000000..df83ce219b --- /dev/null +++ b/spring-boot/src/main/resources/templates/error/404.html @@ -0,0 +1,8 @@ + + + RESOURCE NOT FOUND + + +

404 RESOURCE NOT FOUND

+ + \ No newline at end of file diff --git a/spring-boot/src/main/resources/templates/index.html b/spring-boot/src/main/resources/templates/index.html index 2c4387ed10..c1314558f6 100644 --- a/spring-boot/src/main/resources/templates/index.html +++ b/spring-boot/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - +

Welcome Home


×