#268 bump up spring and spring-boot versions (#333)

* #268 bump up spring and spring-boot versions * #268 add jackson dependency * #268 fix "No target Validator set" after upgrade spring-boot * #268 add jackson dependency for tests * #268 fix tests
adorsys · Jul 16, 2024 · 89da57d · 89da57d
1 parent 824abf7
commit 89da57d
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 22 deletions.
diff --git a/datasafe-examples/datasafe-examples-multidfs/pom.xml b/datasafe-examples/datasafe-examples-multidfs/pom.xml
@@ -27,6 +27,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/datasafe-examples/datasafe-examples-versioned-s3/pom.xml b/datasafe-examples/datasafe-examples-versioned-s3/pom.xml
@@ -27,6 +27,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml
@@ -13,14 +13,14 @@
  <description>Spring Boot DataSafe Application</description>
 
  <properties>
- <spring-boot.version>3.1.2</spring-boot.version>
+ <spring-boot.version>3.3.1</spring-boot.version>
  <springfox-swagger.version>2.9.2</springfox-swagger.version>
  <jjwt.version>0.12.4</jjwt.version>
  <spring-restdocs.version>3.0.0</spring-restdocs.version>
  <asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
  <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
- <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
  <springdoc-openapi-starter-webmvc-ui.version>2.3.0</springdoc-openapi-starter-webmvc-ui.version>
+ <maven.compiler.parameters>true</maven.compiler.parameters>
  </properties>
 
  <dependencies>
@@ -82,12 +82,12 @@
  <version>${spring-boot.version}</version>
  <optional>true</optional>
  </dependency>
-
  <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>${jakarta.validation-api.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ <version>${spring-boot.version}</version>
  </dependency>
+
  <dependency>
  <groupId>io.jsonwebtoken</groupId>
  <artifactId>jjwt-api</artifactId>
@@ -103,6 +103,12 @@
  <groupId>io.jsonwebtoken</groupId>
  <artifactId>jjwt-jackson</artifactId>
  <version>${jjwt.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
  <scope>runtime</scope>
  </dependency>
  <dependency>

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
@@ -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
@@ -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/...afe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/InboxController.java b/...afe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/InboxController.java
@@ -13,7 +13,6 @@
 import de.adorsys.datasafe.types.api.resource.PrivateResource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +29,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml
@@ -11,6 +11,12 @@
 
  <artifactId>datasafe-simple-adapter-spring</artifactId>
 
+ <properties>
+ <spring.framework.version>6.1.10</spring.framework.version>
+ <spring.framework.boot.version>3.3.1</spring.framework.boot.version>
+ <snakeyaml.version>2.2</snakeyaml.version>
+ </properties>
+
  <dependencies>
  <dependency>
  <groupId>org.springframework.boot</groupId>
@@ -85,7 +91,7 @@
  <dependency>
  <groupId>org.yaml</groupId>
  <artifactId>snakeyaml</artifactId>
- <version>2.1</version>
+ <version>${snakeyaml.version}</version>
  </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
@@ -129,6 +135,11 @@
  <type>test-jar</type>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
  <dependency>
  <groupId>jakarta.annotation</groupId>
  <artifactId>jakarta.annotation-api</artifactId>

diff --git a/datasafe-storage/datasafe-storage-impl-db/pom.xml b/datasafe-storage/datasafe-storage-impl-db/pom.xml
@@ -11,6 +11,10 @@
 
  <artifactId>datasafe-storage-impl-db</artifactId>
 
+ <properties>
+ <spring.framework.version>6.1.10</spring.framework.version>
+ </properties>
+
  <dependencies>
  <dependency>
  <groupId>de.adorsys</groupId>
@@ -26,6 +30,7 @@
  <dependency>
  <groupId>org.springframework</groupId>
  <artifactId>spring-jdbc</artifactId>
+ <version>${spring.framework.version}</version>
  </dependency>
  <dependency>
  <groupId>com.zaxxer</groupId>

diff --git a/datasafe-storage/datasafe-storage-impl-s3/pom.xml b/datasafe-storage/datasafe-storage-impl-s3/pom.xml
@@ -55,6 +55,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/datasafe-test-storages/pom.xml b/datasafe-test-storages/pom.xml
@@ -28,6 +28,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>compile</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-storage-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -83,14 +83,14 @@
  <dagger.version>2.50</dagger.version>
  <guava.version>32.1.1-jre</guava.version>
  <picocli.version>4.0.3</picocli.version>
- <jupiter.version>5.10.0</jupiter.version>
+ <jupiter.version>5.11.0-M2</jupiter.version>
  <assertj.version>3.12.2</assertj.version>
  <mockito.version>5.5.0</mockito.version>
  <surefire.version>3.1.2</surefire.version>
  <compress.version>1.26.0</compress.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <deploy.disabled>false</deploy.disabled>
- <testcontainers.version>1.18.3</testcontainers.version>
+ <testcontainers.version>1.19.8</testcontainers.version>
  <jacoco.version>0.8.11</jacoco.version>
  <commons.io.version>2.5</commons.io.version>
  <slf4j-simple.version>2.0.7</slf4j-simple.version>
@@ -109,8 +109,6 @@
  <h2.database>2.2.220</h2.database>
  <mysql.version>8.4.0</mysql.version>
  <liquibase>4.23.1</liquibase>
- <spring.framework.version>6.0.11</spring.framework.version>
- <spring.framework.boot.version>3.1.2</spring.framework.boot.version>
  <siv-mode.version>1.4.4</siv-mode.version>
  <jackson.version>2.16.1</jackson.version>
  <keymanagement.version>0.0.11</keymanagement.version>
@@ -224,11 +222,27 @@
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-java-sdk-s3</artifactId>
  <version>${amazon.aws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-java-sdk-core</artifactId>
  <version>${amazon.aws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
 
  <!--
@@ -318,11 +332,6 @@
  <artifactId>liquibase-core</artifactId>
  <version>${liquibase}</version>
  </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.framework.version}</version>
- </dependency>
  <dependency>
  <groupId>com.zaxxer</groupId>
  <artifactId>HikariCP</artifactId>