Update dependencies to fix test failures

adorsys · Jul 25, 2024 · 2ed1255 · 2ed1255
1 parent 44906fd
commit 2ed1255
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 19 deletions.
diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml
@@ -19,13 +19,12 @@
  <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>
- <spring.framework.security.version>6.1.2</spring.framework.security.version>
+ <spring.framework.security.version>6.1.2</spring.framework.security.version>
  <slf4j.version>2.0.7</slf4j.version>
  <spring.framework.version>6.1.10</spring.framework.version>
  <spring.framework.restdocs.version>3.0.0</spring.framework.restdocs.version>
  <jackson.version>2.17.1</jackson.version>
  <tomcat.version>10.1.11</tomcat.version>
- <amazon.aws.version>1.12.646</amazon.aws.version>
  <guava.version>32.1.1-jre</guava.version>
  <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
  <dagger.version>2.50</dagger.version>
@@ -111,7 +110,7 @@
  <artifactId>mysql-connector-j</artifactId>
  <version>${mysql.version}</version>
  </dependency>
- <dependency>
+ <dependency>
  <groupId>org.springframework.security</groupId>
  <artifactId>spring-security-config</artifactId>
  <version>${spring.framework.security.version}</version>
@@ -245,7 +244,7 @@
  <scope>test</scope>
  <version>${spring-restdocs.version}</version>
  </dependency>
- <dependency>
+ <dependency>
  <groupId>org.assertj</groupId>
  <artifactId>assertj-core</artifactId>
  <version>${assertj.version}</version>
@@ -280,7 +279,7 @@
  <artifactId>mockito-core</artifactId>
  <version>${mockito.version}</version>
  <scope>test</scope>
- </dependency>
+ </dependency>
  </dependencies>
 
  <profiles>

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml
@@ -13,7 +13,6 @@
 
  <properties>
  <junit.version>4.13.2</junit.version>
- <amazon.aws.version>1.12.646</amazon.aws.version>
  <guava.version>32.1.1-jre</guava.version>
  <jetbrains.annotations.version>17.0.0</jetbrains.annotations.version>
  <bouncycastle.bcprov.version>1.78.1</bouncycastle.bcprov.version>
@@ -52,7 +51,7 @@
  <artifactId>slf4j-api</artifactId>
  <version>${slf4j-simple.version}</version>
  </dependency>
- <dependency>
+ <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-java-sdk-s3</artifactId>
  <version>${amazon.aws.version}</version>
@@ -120,7 +119,7 @@
  <artifactId>assertj-core</artifactId>
  <scope>test</scope>
  </dependency>
- <dependency>
+ <dependency>
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
  <version>${junit.version}</version>
@@ -132,7 +131,7 @@
  <version>${jetbrains.annotations.version}</version>
  <scope>test</scope>
  </dependency>
- <dependency>
+ <dependency>
  <groupId>org.testcontainers</groupId>
  <artifactId>testcontainers</artifactId>
  </dependency>
@@ -190,4 +189,4 @@
  </plugins>
  </build>
 
-</project>
+</project>
diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml
@@ -14,7 +14,7 @@
  <properties>
  <spring.framework.version>6.1.10</spring.framework.version>
  <spring.framework.boot.version>3.3.1</spring.framework.boot.version>
- <junit.version>4.13.2</junit.version>
+ <junit.version>4.13.2</junit.version>
  <jetbrains.annotations.version>17.0.0</jetbrains.annotations.version>
  </properties>
 
@@ -95,6 +95,13 @@
  <version>${jupiter.version}</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>de.adorsys</groupId>
+ <artifactId>datasafe-business</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-types-api</artifactId>
@@ -128,7 +135,7 @@
  <groupId>jakarta.annotation</groupId>
  <artifactId>jakarta.annotation-api</artifactId>
  </dependency>
- <dependency>
+ <dependency>
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
  <version>${junit.version}</version>
@@ -158,6 +165,7 @@
  <failOnWarning>false</failOnWarning>
  <ignoredUnusedDeclaredDependencies>
  <ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-test</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-business</ignoredUnusedDeclaredDependency>
  </ignoredUnusedDeclaredDependencies>
  </configuration>
  </execution>
@@ -169,4 +177,4 @@
  </build>
 
 
-</project>
+</project>
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>
@@ -43,6 +55,7 @@
  <artifactId>datasafe-storage-impl-s3</artifactId>
  <version>${project.version}</version>
  </dependency>
+
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml
@@ -111,7 +111,18 @@
  <artifactId>datasafe-types-api</artifactId>
  <version>${project.version}</version>
  </dependency>
-
+
+ <dependency>
+ <groupId>de.adorsys</groupId>
+ <artifactId>datasafe-simple-adapter-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.adorsys</groupId>
+ <artifactId>datasafe-simple-adapter-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
  </dependencies>
 
 
@@ -214,6 +225,8 @@
  <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-storage-impl-s3</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-types-api</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-simple-adapter-impl</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-simple-adapter-spring</ignoredUnusedDeclaredDependency>
  </ignoredUnusedDeclaredDependencies>
 
  </configuration>

diff --git a/pom.xml b/pom.xml
@@ -110,7 +110,7 @@
  <mysql.version>8.4.0</mysql.version>
  <liquibase>4.23.1</liquibase>
  <siv-mode.version>1.4.4</siv-mode.version>
- <jackson.version>2.17.1</jackson.version>
+ <jackson.version>2.16.1</jackson.version>
  <keymanagement.version>0.0.11</keymanagement.version>
  <jakarta.annotation-api.varsion>2.1.1</jakarta.annotation-api.varsion>
  <jaxb-api.version>2.3.1</jaxb-api.version>
@@ -397,7 +397,7 @@
  <ignoredUsedUndeclaredDependencies>
  <ignoredUsedUndeclaredDependency>javax.inject:javax.inject</ignoredUsedUndeclaredDependency>
  <ignoredUsedUndeclaredDependency>org.projectlombok:lombok</ignoredUsedUndeclaredDependency>
- <ignoredUsedUndeclaredDependency>de.adorsys:datasafe-privatestore-api</ignoredUsedUndeclaredDependency>
+  <ignoredUsedUndeclaredDependency>de.adorsys:datasafe-privatestore-api</ignoredUsedUndeclaredDependency>
  <ignoredUsedUndeclaredDependency>de.adorsys:datasafe-directory-api</ignoredUsedUndeclaredDependency>
  <ignoredUsedUndeclaredDependency>de.adorsys:datasafe-types-api</ignoredUsedUndeclaredDependency>
  <ignoredUsedUndeclaredDependency>de.adorsys:datasafe-inbox-impl</ignoredUsedUndeclaredDependency>
@@ -415,8 +415,8 @@
  <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-simple</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>org.mockito:mockito-core</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-runtime-delegate</ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-validation</ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-business</ignoredUnusedDeclaredDependency>
+  <ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-validation</ignoredUnusedDeclaredDependency>
+  <ignoredUnusedDeclaredDependency>de.adorsys:datasafe-business</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-devtools</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>io.jsonwebtoken:jjwt-impl</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>io.jsonwebtoken:jjwt-jackson</ignoredUnusedDeclaredDependency>
@@ -443,7 +443,7 @@
  <ignoredNonTestScopedDependency>com.google.guava:guava</ignoredNonTestScopedDependency>
  <ignoredNonTestScopedDependency>com.google.code.gson:gson</ignoredNonTestScopedDependency>
  <ignoredNonTestScopedDependency>de.adorsys.keymanagement:juggler-bouncycastle</ignoredNonTestScopedDependency>
- <ignoredNonTestScopedDependency>org.junit.jupiter:junit-jupiter-api</ignoredNonTestScopedDependency>
+  <ignoredNonTestScopedDependency>org.junit.jupiter:junit-jupiter-api</ignoredNonTestScopedDependency>
  <ignoredNonTestScopedDependency>de.adorsys:datasafe-storage-impl-s3</ignoredNonTestScopedDependency>
  <ignoredNonTestScopedDependency>org.testcontainers:testcontainers</ignoredNonTestScopedDependency>
  <ignoredNonTestScopedDependency>de.adorsys:datasafe-storage-impl-fs</ignoredNonTestScopedDependency>