From 9ab324cc7299d5d351e62c1e984e44aa542080c3 Mon Sep 17 00:00:00 2001 From: Marthym Date: Sun, 29 Oct 2023 13:27:07 +0100 Subject: [PATCH] chore(main): #182 Upgrade java to 21, node to 20... and spring to 3.1.5 close #182 --- .tool-versions | 5 +++-- pom.xml | 4 ++-- .../infra/config/TechwatchJacksonMappingConfiguration.java | 3 --- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.tool-versions b/.tool-versions index 60979423..346f1570 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,3 @@ -nodejs 18.16.1 -java temurin-17.0.6+10 +nodejs 20.9.0 +java temurin-21.0.1+12.0.LTS +maven 3.9.5 diff --git a/pom.xml b/pom.xml index 8a4c2bfb..fca5e973 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.2 + 3.1.5 @@ -23,7 +23,7 @@ - 17 + 21 org.sqlite.JDBC jdbc:sqlite:file:${project.build.directory}/jooq_baywatch.db diff --git a/sandside/src/main/java/fr/ght1pc9kc/baywatch/techwatch/infra/config/TechwatchJacksonMappingConfiguration.java b/sandside/src/main/java/fr/ght1pc9kc/baywatch/techwatch/infra/config/TechwatchJacksonMappingConfiguration.java index 6600a7aa..84de93f7 100644 --- a/sandside/src/main/java/fr/ght1pc9kc/baywatch/techwatch/infra/config/TechwatchJacksonMappingConfiguration.java +++ b/sandside/src/main/java/fr/ght1pc9kc/baywatch/techwatch/infra/config/TechwatchJacksonMappingConfiguration.java @@ -1,9 +1,7 @@ package fr.ght1pc9kc.baywatch.techwatch.infra.config; -import fr.ght1pc9kc.baywatch.techwatch.api.model.Feed; import fr.ght1pc9kc.baywatch.techwatch.api.model.News; import fr.ght1pc9kc.baywatch.techwatch.api.model.State; -import fr.ght1pc9kc.baywatch.techwatch.infra.model.FeedMixin; import fr.ght1pc9kc.baywatch.techwatch.infra.model.NewsMixin; import fr.ght1pc9kc.baywatch.techwatch.infra.model.StateMixin; import lombok.extern.slf4j.Slf4j; @@ -19,7 +17,6 @@ public Jackson2ObjectMapperBuilderCustomizer techwatchJacksonMapperCustomizer() return builder -> { log.debug("Configure Techwatch Jackson Mapper"); builder.mixIn(News.class, NewsMixin.class); - builder.mixIn(Feed.class, FeedMixin.class); builder.mixIn(State.class, StateMixin.class); }; }