diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 6c63ebf53..ee83595f0 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -19,7 +19,12 @@ 3.0.0 2.2.4 1.6.0 - 2.3.0 + 6.3.1 + 6.1.10 + 3.0.0 + 10.1.11 + 3.0.2 + 2.6.0 true @@ -126,6 +131,108 @@ mysql-connector-j ${mysql.version} + + org.slf4j + slf4j-api + ${slf4j-simple.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + org.springframework + spring-core + ${spring.framework.version} + + + org.springframework + spring-beans + ${spring.framework.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + org.springframework + spring-webmvc + ${spring.framework.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + + org.springframework.security + spring-security-crypto + ${spring.framework.security.version} + + + com.google.dagger + dagger + ${dagger.version} + + + com.google.code.gson + gson + ${gson.version} + + + org.springframework.boot + spring-boot-autoconfigure + ${spring-boot.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + + + com.amazonaws + aws-java-sdk-s3 + ${amazon.aws.version} + + + com.amazonaws + aws-java-sdk-core + ${amazon.aws.version} + + + com.google.guava + guava + ${guava.version} + + + jakarta.validation + jakarta.validation-api + ${jakarta.validation-api.version} + + + org.springframework.security + spring-security-config + ${spring.framework.security.version} + + + org.springframework.security + spring-security-web + ${spring.framework.security.version} + + + org.springframework.boot + spring-boot + ${spring-boot.version} + + + org.springframework.security + spring-security-core + ${spring.framework.security.version} + + @@ -160,6 +267,42 @@ test ${spring-restdocs.version} + + org.assertj + assertj-core + ${assertj.version} + test + + + org.springframework.restdocs + spring-restdocs-core + ${spring.framework.restdocs.version} + test + + + org.springframework + spring-test + ${spring.framework.version} + test + + + org.springframework.boot + spring-boot-test-autoconfigure + ${spring-boot.version} + test + + + org.springframework.boot + spring-boot-test + ${spring-boot.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + @@ -170,36 +313,93 @@ + - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.plugin.version} + + + com.amazonaws + org.springframework.security + org.slf4j + org.springframework.boot + de.adorsys + org.springframework.security:spring-security-config + org.springframework.security:spring-security-web + org.slf4j:slf4j-api + org.springframework:spring-web + org.springframework.boot:spring-boot + de.adorsys:datasafe-privatestore-api + org.springframework:spring-core + de.adorsys:datasafe-directory-api + org.springframework.security:spring-security-crypto + com.google.dagger:dagger + de.adorsys:datasafe-types-api + com.fasterxml.jackson.core:jackson-databind + com.google.code.gson:gson + de.adorsys:datasafe-inbox-impl + org.springframework.security:spring-security-core + org.springframework.boot:spring-boot-autoconfigure + de.adorsys:datasafe-privatestore-impl + org.springframework:spring-beans + org.apache.tomcat.embed:tomcat-embed-core + org.springframework:spring-context + de.adorsys:datasafe-directory-impl + de.adorsys:datasafe-inbox-api + org.springframework:spring-webmvc + de.adorsys:datasafe-encryption-api + com.google.guava:guava + org.projectlombok:lombok + jakarta.validation:jakarta.validation-api + + + org.springdoc:springdoc-openapi-starter-webmvc-ui + org.springframework.boot:spring-boot-starter-web + org.springframework.boot:spring-boot-starter-actuator + org.springframework.boot:spring-boot-devtools + org.springframework.boot:spring-boot-configuration-processor + org.springframework.boot:spring-boot-starter-validation + io.jsonwebtoken:jjwt-impl + io.jsonwebtoken:jjwt-jackson + org.springframework.boot:spring-boot-starter-security + com.mysql:mysql-connector-j + org.springframework.boot:spring-boot-starter-test + + + de.adorsys:datasafe-inbox-impl + de.adorsys:datasafe-privatestore-impl + org.springframework:spring-beans + com.fasterxml.jackson.core:jackson-databind + com.google.code.gson:gson + + + + analyze - repackage + analyze-only - maven-dependency-plugin - ${maven.dependency.plugin.version} + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} - analyze - analyze-only + repackage - - false - + api-doc diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index af98b24da..61acaa8ac 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -10,6 +10,12 @@ 4.0.0 datasafe-simple-adapter-impl + + + 1.78.1 + 17.0.0 + + de.adorsys @@ -40,6 +46,51 @@ slf4j-api ${slf4j-simple.version} + + org.bouncycastle + bcprov-jdk18on + ${bouncycastle.bcprov.version} + + + com.google.dagger + dagger + ${dagger.version} + + + com.google.code.findbugs + jsr305 + ${jsr-305.version} + + + org.cryptomator + siv-mode + ${siv-mode.version} + + + com.google.guava + guava + ${guava.version} + + + com.amazonaws + aws-java-sdk-s3 + ${amazon.aws.version} + + + com.amazonaws + aws-java-sdk-core + ${amazon.aws.version} + + + org.testcontainers + testcontainers + + + org.jetbrains + annotations + ${jetbrains.annotations.version} + test + de.adorsys @@ -78,18 +129,40 @@ + org.apache.maven.plugins maven-dependency-plugin ${maven.dependency.plugin.version} + + + de.adorsys:datasafe-encryption-impl + de.adorsys:datasafe-inbox-impl + javax.inject:javax.inject + de.adorsys.keymanagement:api + de.adorsys:datasafe-storage-api + de.adorsys:datasafe-privatestore-api + de.adorsys:datasafe-privatestore-impl + de.adorsys:datasafe-directory-api + de.adorsys:datasafe-directory-impl + de.adorsys:datasafe-inbox-api + de.adorsys:datasafe-types-api + de.adorsys:datasafe-encryption-api + org.projectlombok:lombok + + + org.slf4j:slf4j-simple + org.mockito:mockito-core + + + org.bouncycastle:bcprov-jdk18on + + + analyze analyze-only - - false - true - @@ -127,4 +200,4 @@ - + \ No newline at end of file diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleAdapterFeatureTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleAdapterFeatureTest.java index d1d33c51b..b5852bf1a 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleAdapterFeatureTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleAdapterFeatureTest.java @@ -34,8 +34,8 @@ import java.util.stream.Stream; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; @Slf4j class SimpleAdapterFeatureTest extends BaseMockitoTest { diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index bef17150f..4756fc550 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml @@ -14,7 +14,6 @@ 6.1.10 3.3.1 - 2.2 @@ -88,11 +87,6 @@ test - - org.yaml - snakeyaml - ${snakeyaml.version} - org.junit.jupiter junit-jupiter-api @@ -135,11 +129,6 @@ test-jar test - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - jakarta.annotation jakarta.annotation-api @@ -160,8 +149,14 @@ false + + org.jetbrains:annotations + de.adorsys:datasafe-storage-api + de.adorsys:datasafe-types-api + org.springframework.boot:spring-boot-starter-test + de.adorsys:datasafe-business @@ -173,4 +168,4 @@ - + \ No newline at end of file diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionIT.java b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionIT.java index 76b2c0505..75930fc85 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionIT.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionIT.java @@ -38,7 +38,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertEquals; @Slf4j diff --git a/datasafe-storage/datasafe-storage-impl-s3/pom.xml b/datasafe-storage/datasafe-storage-impl-s3/pom.xml index 8fd486be2..08cb89da5 100644 --- a/datasafe-storage/datasafe-storage-impl-s3/pom.xml +++ b/datasafe-storage/datasafe-storage-impl-s3/pom.xml @@ -33,10 +33,6 @@ com.amazonaws aws-java-sdk-core - - javax.xml.bind - jaxb-api - org.slf4j diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml index fdaeb0053..39c9b9273 100644 --- a/last-module-codecoverage-check/pom.xml +++ b/last-module-codecoverage-check/pom.xml @@ -134,14 +134,12 @@ ${project.version} - org.junit.jupiter junit-jupiter-api test - @@ -244,6 +242,11 @@ de.adorsys:datasafe-storage-impl-s3 de.adorsys:datasafe-types-api org.junit.jupiter:junit-jupiter-engine + de.adorsys:datasafe-simple-adapter-impl + de.adorsys:datasafe-simple-adapter-spring + de.adorsys:datasafe-simple-adapter-api + de.adorsys:datasafe-runtime-delegate + org.junit.jupiter:junit-jupiter-api diff --git a/pom.xml b/pom.xml index 929b355c6..4e377b712 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 8.4.0 4.23.1 1.4.4 - 2.16.1 + 2.17.1 0.0.11 2.1.1 2.3.1 @@ -125,14 +125,6 @@ 1.6.13 - - - org.junit.jupiter - junit-jupiter-engine - test - - - @@ -405,12 +397,39 @@ javax.inject:javax.inject org.projectlombok:lombok + de.adorsys:datasafe-privatestore-api + de.adorsys:datasafe-directory-api + de.adorsys:datasafe-types-api + de.adorsys:datasafe-inbox-impl + de.adorsys:datasafe-privatestore-impl + de.adorsys:datasafe-directory-impl + de.adorsys:datasafe-inbox-api + de.adorsys:datasafe-encryption-api + de.adorsys:datasafe-encryption-impl + de.adorsys:datasafe-inbox-impl + de.adorsys.keymanagement:api + de.adorsys:datasafe-storage-api + de.adorsys:datasafe-directory-api - org.junit.jupiter:junit-jupiter-engine org.slf4j:slf4j-simple org.mockito:mockito-core de.adorsys:datasafe-runtime-delegate + org.springframework.boot:spring-boot-starter-validation + de.adorsys:datasafe-business + org.springframework.boot:spring-boot-devtools + io.jsonwebtoken:jjwt-impl + io.jsonwebtoken:jjwt-jackson + com.mysql:mysql-connector-j + org.springframework.boot:spring-boot-starter-test + jakarta.servlet:jakarta.servlet-api + com.fasterxml.jackson.core:jackson-annotations + com.fasterxml.jackson.core:jackson-databind + org.springframework.boot:spring-boot-starter-security + org.springframework.boot:spring-boot-starter-web + org.springframework.boot:spring-boot-starter-actuator + org.springframework.boot:spring-boot-configuration-processor + org.springdoc:springdoc-openapi-starter-webmvc-ui org.bouncycastle:bcprov-jdk15on @@ -429,6 +448,18 @@ com.google.guava:guava com.google.code.gson:gson de.adorsys.keymanagement:juggler-bouncycastle + org.junit.jupiter:junit-jupiter-api + de.adorsys:datasafe-storage-impl-s3 + org.testcontainers:testcontainers + de.adorsys:datasafe-storage-impl-fs + com.amazonaws:aws-java-sdk-s3 + com.amazonaws:aws-java-sdk-core + org.junit.jupiter:junit-jupiter-params + org.springframework:spring-beans + de.adorsys:datasafe-inbox-impl + de.adorsys:datasafe-privatestore-impl + com.fasterxml.jackson.core:jackson-databind + org.bouncycastle:bcprov-jdk18on