diff --git a/Dockerfile b/Dockerfile index 1e47c92f..0767bbeb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-jdk as build +FROM eclipse-temurin:17-jdk-alpine as build WORKDIR /workspace/app COPY gradlew . diff --git a/src/main/java/ee/buerokratt/ruuter/configuration/JacksonConfiguration.java b/src/main/java/ee/buerokratt/ruuter/configuration/JacksonConfiguration.java index 3b34536b..540687dd 100644 --- a/src/main/java/ee/buerokratt/ruuter/configuration/JacksonConfiguration.java +++ b/src/main/java/ee/buerokratt/ruuter/configuration/JacksonConfiguration.java @@ -8,6 +8,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import org.springframework.http.converter.HttpMessageConverter; + +import java.util.Map; @Configuration public class JacksonConfiguration { @@ -22,7 +25,6 @@ public ObjectMapper objectMapper() { return new ObjectMapper(); else return new ObjectMapper().configure(JsonParser.Feature.STRICT_DUPLICATE_DETECTION, true); - } @Bean @@ -30,3 +32,4 @@ public ObjectMapper ymlMapper() { return new ObjectMapper(new YAMLFactory()).configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } } +