diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 33dd14c4b..a5e1412d1 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -13,7 +13,7 @@ Spring Boot DataSafe Application - 3.1.2 + 3.3.1 2.9.2 0.12.4 3.0.0 @@ -21,6 +21,7 @@ 1.6.0 3.0.2 2.3.0 + true @@ -103,6 +104,12 @@ io.jsonwebtoken jjwt-jackson ${jjwt.version} + + + com.fasterxml.jackson.core + jackson-databind + + runtime diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java index bdb527dc8..3212355da 100644 --- a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java +++ b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java @@ -3,10 +3,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) public class DatasafeRestApplication { public static void main(String[] args) { diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java index a0696d97a..c88c09d56 100644 --- a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java +++ b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java @@ -6,12 +6,12 @@ import org.springframework.lang.NonNull; import org.springframework.util.StringUtils; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Slf4j @Configuration @RequiredArgsConstructor -public class MvcConfig extends WebMvcConfigurationSupport { +public class MvcConfig implements WebMvcConfigurer { private final DatasafeProperties datasafeProperties; diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index 853af91b2..bef17150f 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml @@ -11,6 +11,12 @@ datasafe-simple-adapter-spring + + 6.1.10 + 3.3.1 + 2.2 + + org.springframework.boot @@ -85,7 +91,7 @@ org.yaml snakeyaml - 2.1 + ${snakeyaml.version} org.junit.jupiter @@ -129,6 +135,11 @@ test-jar test + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + jakarta.annotation jakarta.annotation-api diff --git a/datasafe-storage/datasafe-storage-impl-db/pom.xml b/datasafe-storage/datasafe-storage-impl-db/pom.xml index e408805e0..db5401c52 100644 --- a/datasafe-storage/datasafe-storage-impl-db/pom.xml +++ b/datasafe-storage/datasafe-storage-impl-db/pom.xml @@ -11,6 +11,10 @@ datasafe-storage-impl-db + + 6.1.10 + + de.adorsys @@ -26,6 +30,7 @@ org.springframework spring-jdbc + ${spring.framework.version} com.zaxxer diff --git a/pom.xml b/pom.xml index daf7f6932..929b355c6 100644 --- a/pom.xml +++ b/pom.xml @@ -83,14 +83,14 @@ 2.50 32.1.1-jre 4.0.3 - 5.10.0 + 5.11.0-M2 3.12.2 5.5.0 3.1.2 1.26.0 UTF-8 false - 1.18.3 + 1.19.8 0.8.11 2.5 2.0.7 @@ -109,8 +109,6 @@ 2.2.220 8.4.0 4.23.1 - 6.0.11 - 3.1.2 1.4.4 2.16.1 0.0.11 @@ -224,11 +222,27 @@ com.amazonaws aws-java-sdk-s3 ${amazon.aws.version} + + + com.fasterxml.jackson.core + jackson-databind + + com.amazonaws aws-java-sdk-core ${amazon.aws.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + +