fix MultiDFS test

adorsys · Aug 30, 2023 · 8bbb92a · 8bbb92a
1 parent 9834557
commit 8bbb92a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/...siness/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java b/...siness/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java
@@ -1,7 +1,6 @@
 package de.adorsys.datasafe.business.impl.e2e;
 
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import dagger.Lazy;
 import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices;
@@ -44,6 +43,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -95,7 +95,7 @@ class MultiDFSFunctionalityTest extends BaseMockitoTest {
  static void initDistributedMinios() {
  // Create all required minio-backed S3 buckets:
  Stream.of(CREDENTIALS, KEYSTORE, FILES_ONE, FILES_TWO, INBOX).forEach(it -> {
- GenericContainer minio = new GenericContainer("minio/minio")
+ GenericContainer minio = new GenericContainer("minio/minio:RELEASE.2019-08-01T22-18-54Z")
  .withExposedPorts(9000)
  .withEnv("MINIO_ACCESS_KEY", accessKey(it))
  .withEnv("MINIO_SECRET_KEY", secretKey(it))

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml
@@ -74,8 +74,19 @@
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-test</artifactId>
  <version>${spring.framework.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>2.1</version>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,7 @@
  <h2.database>1.4.199</h2.database>
  <mysql.version>8.0.16</mysql.version>
  <liquibase>3.6.1</liquibase>
- <spring.framework.version>5.1.7.RELEASE</spring.framework.version>
+ <spring.framework.version>6.0.11</spring.framework.version>
  <spring.framework.boot.version>3.1.2</spring.framework.boot.version>
  <siv-mode.version>1.3.1</siv-mode.version>
  <jackson.version>2.12.7</jackson.version>