From 516644f36037ecff7ba035fe5aa298f193d9d0f3 Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Wed, 24 Jul 2024 15:10:31 +0100 Subject: [PATCH 01/14] fix: remove all unused declared dependencies fix: add used undeclared dependencies to solve warning --- datasafe-rest-impl/pom.xml | 177 +++++++++++++++--- .../datasafe-simple-adapter-impl/pom.xml | 66 +++++++ .../datasafe-simple-adapter-spring/pom.xml | 32 ++-- .../datasafe-storage-impl-s3/pom.xml | 4 - datasafe-test-storages/pom.xml | 13 -- last-module-codecoverage-check/pom.xml | 32 +--- pom.xml | 46 ++++- 7 files changed, 266 insertions(+), 104 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 6c63ebf53..d4609fa4e 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -19,16 +19,23 @@ 3.0.0 2.2.4 1.6.0 - 2.3.0 + 6.1.2 + 2.0.7 + 6.1.10 + 3.0.0 + 2.17.1 + 10.1.11 + 1.12.646 + 32.1.1-jre + 3.0.2 + 2.50 + 5.5.0 + 3.12.2 + 2.8.9 true - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi-starter-webmvc-ui.version} - de.adorsys datasafe-business @@ -59,29 +66,12 @@ datasafe-metainfo-version-impl ${project.version} - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-actuator - ${spring-boot.version} - org.springframework.boot spring-boot-devtools ${spring-boot.version} runtime - - org.springframework.boot - spring-boot-configuration-processor - ${spring-boot.version} - true - org.springframework.boot spring-boot-starter-validation @@ -111,11 +101,6 @@ runtime - - org.springframework.boot - spring-boot-starter-security - ${spring-boot.version} - de.adorsys datasafe-storage-impl-db @@ -126,6 +111,106 @@ mysql-connector-j ${mysql.version} + + org.springframework.security + spring-security-config + ${spring.framework.security.version} + + + org.springframework.security + spring-security-web + ${spring.framework.security.version} + + + org.springframework + spring-web + ${spring.framework.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.springframework.boot + spring-boot + ${spring-boot.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + org.springframework + spring-core + ${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.security + spring-security-core + ${spring.framework.security.version} + + + org.springframework.boot + spring-boot-autoconfigure + ${spring-boot.version} + + + org.springframework + spring-beans + ${spring.framework.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + com.amazonaws + aws-java-sdk-s3 + ${amazon.aws.version} + + + com.amazonaws + aws-java-sdk-core + ${amazon.aws.version} + + + org.springframework + spring-webmvc + ${spring.framework.version} + + + com.google.guava + guava + ${guava.version} + + + jakarta.validation + jakarta.validation-api + ${jakarta.validation-api.version} + @@ -160,6 +245,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 + diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index af98b24da..8a0ae047f 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -10,6 +10,19 @@ 4.0.0 datasafe-simple-adapter-impl + + + 4.13.2 + 1.12.646 + 32.1.1-jre + 17.0.0 + 1.19.8 + 1.78.1 + 2.50 + 1.4.4 + 3.0.0 + + de.adorsys @@ -40,6 +53,41 @@ slf4j-api ${slf4j-simple.version} + + com.amazonaws + aws-java-sdk-s3 + ${amazon.aws.version} + + + com.amazonaws + aws-java-sdk-core + ${amazon.aws.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} + de.adorsys @@ -73,6 +121,24 @@ assertj-core test + + junit + junit + ${junit.version} + test + + + org.jetbrains + annotations + ${jetbrains.annotations.version} + test + + + org.testcontainers + testcontainers + ${testcontainers.version} + test + diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index bef17150f..85fca485c 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml @@ -14,7 +14,8 @@ 6.1.10 3.3.1 - 2.2 + 4.13.2 + 17.0.0 @@ -88,24 +89,12 @@ test - - org.yaml - snakeyaml - ${snakeyaml.version} - org.junit.jupiter junit-jupiter-api ${jupiter.version} test - - de.adorsys - datasafe-business - ${project.version} - test-jar - test - de.adorsys datasafe-types-api @@ -135,15 +124,22 @@ test-jar test - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - jakarta.annotation jakarta.annotation-api + + junit + junit + ${junit.version} + test + + + org.jetbrains + annotations + ${jetbrains.annotations.version} + test + 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/datasafe-test-storages/pom.xml b/datasafe-test-storages/pom.xml index 5dc5a6d33..bf47838db 100644 --- a/datasafe-test-storages/pom.xml +++ b/datasafe-test-storages/pom.xml @@ -28,18 +28,6 @@ testcontainers compile - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - compile - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - compile - de.adorsys datasafe-storage-api @@ -55,7 +43,6 @@ datasafe-storage-impl-s3 ${project.version} - org.junit.jupiter junit-jupiter-api diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml index fdaeb0053..6d6e550b5 100644 --- a/last-module-codecoverage-check/pom.xml +++ b/last-module-codecoverage-check/pom.xml @@ -111,37 +111,7 @@ datasafe-types-api ${project.version} - - - de.adorsys - datasafe-simple-adapter-api - ${project.version} - - - de.adorsys - datasafe-simple-adapter-impl - ${project.version} - - - de.adorsys - datasafe-simple-adapter-spring - ${project.version} - - - - de.adorsys - datasafe-runtime-delegate - ${project.version} - - - - - org.junit.jupiter - junit-jupiter-api - test - - - + diff --git a/pom.xml b/pom.xml index 929b355c6..6dc169149 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,34 @@ 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.bouncycastle:bcprov-jdk15on @@ -429,6 +443,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 From aef4aca5979a44967b64ad7b05f9b1b09be5a27e Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Wed, 24 Jul 2024 16:15:42 +0100 Subject: [PATCH 02/14] update pom.xml --- datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index 8a0ae047f..c01c0b577 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -16,11 +16,11 @@ 1.12.646 32.1.1-jre 17.0.0 - 1.19.8 1.78.1 2.50 1.4.4 3.0.0 + 1.19.8 From b389ede209b48b272efeab5421883dc9745cd134 Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Wed, 24 Jul 2024 16:51:12 +0100 Subject: [PATCH 03/14] update testcontainer version --- datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index c01c0b577..9a395663b 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -20,7 +20,7 @@ 2.50 1.4.4 3.0.0 - 1.19.8 + 1.18.3 From 44906fd389a3522a302a172751319eca69b7ba0b Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Wed, 24 Jul 2024 17:25:48 +0100 Subject: [PATCH 04/14] update pom.xml --- datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index 9a395663b..b661385fc 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -20,7 +20,6 @@ 2.50 1.4.4 3.0.0 - 1.18.3 @@ -136,8 +135,6 @@ org.testcontainers testcontainers - ${testcontainers.version} - test From 2ed125534b5c2befced75619fc5ea4b8f1e36354 Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Thu, 25 Jul 2024 13:35:00 +0100 Subject: [PATCH 05/14] Update dependencies to fix test failures --- datasafe-rest-impl/pom.xml | 9 ++++----- .../datasafe-simple-adapter-impl/pom.xml | 9 ++++----- .../datasafe-simple-adapter-spring/pom.xml | 14 +++++++++++--- datasafe-test-storages/pom.xml | 13 +++++++++++++ last-module-codecoverage-check/pom.xml | 15 ++++++++++++++- pom.xml | 10 +++++----- 6 files changed, 51 insertions(+), 19 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index d4609fa4e..63c2634ca 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -19,13 +19,12 @@ 3.0.0 2.2.4 1.6.0 - 6.1.2 + 6.1.2 2.0.7 6.1.10 3.0.0 2.17.1 10.1.11 - 1.12.646 32.1.1-jre 3.0.2 2.50 @@ -111,7 +110,7 @@ mysql-connector-j ${mysql.version} - + org.springframework.security spring-security-config ${spring.framework.security.version} @@ -245,7 +244,7 @@ test ${spring-restdocs.version} - + org.assertj assertj-core ${assertj.version} @@ -280,7 +279,7 @@ mockito-core ${mockito.version} test - + diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index b661385fc..bb4f8823e 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -13,7 +13,6 @@ 4.13.2 - 1.12.646 32.1.1-jre 17.0.0 1.78.1 @@ -52,7 +51,7 @@ slf4j-api ${slf4j-simple.version} - + com.amazonaws aws-java-sdk-s3 ${amazon.aws.version} @@ -120,7 +119,7 @@ assertj-core test - + junit junit ${junit.version} @@ -132,7 +131,7 @@ ${jetbrains.annotations.version} test - + org.testcontainers testcontainers @@ -190,4 +189,4 @@ - + \ No newline at end of file diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index 85fca485c..85c281d5b 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml @@ -14,7 +14,7 @@ 6.1.10 3.3.1 - 4.13.2 + 4.13.2 17.0.0 @@ -95,6 +95,13 @@ ${jupiter.version} test + + de.adorsys + datasafe-business + ${project.version} + test-jar + test + de.adorsys datasafe-types-api @@ -128,7 +135,7 @@ jakarta.annotation jakarta.annotation-api - + junit junit ${junit.version} @@ -158,6 +165,7 @@ false org.springframework.boot:spring-boot-starter-test + de.adorsys:datasafe-business @@ -169,4 +177,4 @@ - + \ No newline at end of file diff --git a/datasafe-test-storages/pom.xml b/datasafe-test-storages/pom.xml index bf47838db..5dc5a6d33 100644 --- a/datasafe-test-storages/pom.xml +++ b/datasafe-test-storages/pom.xml @@ -28,6 +28,18 @@ testcontainers compile + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + compile + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + compile + de.adorsys datasafe-storage-api @@ -43,6 +55,7 @@ datasafe-storage-impl-s3 ${project.version} + org.junit.jupiter junit-jupiter-api diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml index 6d6e550b5..036e6b7c6 100644 --- a/last-module-codecoverage-check/pom.xml +++ b/last-module-codecoverage-check/pom.xml @@ -111,7 +111,18 @@ datasafe-types-api ${project.version} - + + + de.adorsys + datasafe-simple-adapter-impl + ${project.version} + + + de.adorsys + datasafe-simple-adapter-spring + ${project.version} + + @@ -214,6 +225,8 @@ 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 diff --git a/pom.xml b/pom.xml index 6dc169149..1c48c1315 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 8.4.0 4.23.1 1.4.4 - 2.17.1 + 2.16.1 0.0.11 2.1.1 2.3.1 @@ -397,7 +397,7 @@ javax.inject:javax.inject org.projectlombok:lombok - de.adorsys:datasafe-privatestore-api + de.adorsys:datasafe-privatestore-api de.adorsys:datasafe-directory-api de.adorsys:datasafe-types-api de.adorsys:datasafe-inbox-impl @@ -415,8 +415,8 @@ 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-starter-validation + de.adorsys:datasafe-business org.springframework.boot:spring-boot-devtools io.jsonwebtoken:jjwt-impl io.jsonwebtoken:jjwt-jackson @@ -443,7 +443,7 @@ com.google.guava:guava com.google.code.gson:gson de.adorsys.keymanagement:juggler-bouncycastle - org.junit.jupiter:junit-jupiter-api + org.junit.jupiter:junit-jupiter-api de.adorsys:datasafe-storage-impl-s3 org.testcontainers:testcontainers de.adorsys:datasafe-storage-impl-fs From cd08361790c9d05766c32d62e305aad62b889b31 Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Fri, 26 Jul 2024 08:23:05 +0100 Subject: [PATCH 06/14] Replaced all JUnit 4 imports and assertions with their JUnit 5 (Jupiter) equivalents --- .../simple/adapter/impl/SimpleAdapterFeatureTest.java | 4 ++-- .../adorsys/datasafe/simple/adapter/spring/InjectionIT.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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 From c2bd55a4503d3a5905cb1347784ca03a9b5a81e9 Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Fri, 26 Jul 2024 08:24:37 +0100 Subject: [PATCH 07/14] remove unused dependency (junit) --- datasafe-rest-impl/pom.xml | 5 +++++ .../datasafe-simple-adapter-impl/pom.xml | 7 ------- .../datasafe-simple-adapter-spring/pom.xml | 7 ------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 63c2634ca..985abc496 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -100,6 +100,11 @@ runtime + + org.springframework.boot + spring-boot-starter-security + ${spring-boot.version} + de.adorsys datasafe-storage-impl-db diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index bb4f8823e..41f341353 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -12,7 +12,6 @@ datasafe-simple-adapter-impl - 4.13.2 32.1.1-jre 17.0.0 1.78.1 @@ -119,12 +118,6 @@ assertj-core test - - junit - junit - ${junit.version} - test - org.jetbrains annotations diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index 85c281d5b..dbf1f5a9d 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 - 4.13.2 17.0.0 @@ -135,12 +134,6 @@ jakarta.annotation jakarta.annotation-api - - junit - junit - ${junit.version} - test - org.jetbrains annotations From fe410824943afbfe17f5608a2a8fdda5426a728e Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Fri, 26 Jul 2024 08:25:40 +0100 Subject: [PATCH 08/14] update pom.xml to add modules for test coverage --- last-module-codecoverage-check/pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml index 036e6b7c6..39c9b9273 100644 --- a/last-module-codecoverage-check/pom.xml +++ b/last-module-codecoverage-check/pom.xml @@ -112,6 +112,11 @@ ${project.version} + + de.adorsys + datasafe-simple-adapter-api + ${project.version} + de.adorsys datasafe-simple-adapter-impl @@ -123,6 +128,18 @@ ${project.version} + + de.adorsys + datasafe-runtime-delegate + ${project.version} + + + + org.junit.jupiter + junit-jupiter-api + test + + @@ -227,6 +244,9 @@ 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 From 7927ad5f0a2a9fe9fdbdc5f04c5bee5ff70b1f7d Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Fri, 26 Jul 2024 08:26:58 +0100 Subject: [PATCH 09/14] update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 1c48c1315..9c2b15bd9 100644 --- a/pom.xml +++ b/pom.xml @@ -425,6 +425,7 @@ 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.bouncycastle:bcprov-jdk15on From 026fec291d211456028d552f5370535d810e9264 Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Tue, 30 Jul 2024 12:20:47 +0100 Subject: [PATCH 10/14] Optimize dependencies and remove unnecessary ones --- datasafe-rest-impl/pom.xml | 52 ++++++------------- .../datasafe-simple-adapter-impl/pom.xml | 17 ------ .../datasafe-simple-adapter-spring/pom.xml | 12 ++--- pom.xml | 13 +++++ 4 files changed, 35 insertions(+), 59 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 985abc496..49017a9d0 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -65,12 +65,29 @@ datasafe-metainfo-version-impl ${project.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-actuator + ${spring-boot.version} + org.springframework.boot spring-boot-devtools ${spring-boot.version} runtime + + org.springframework.boot + spring-boot-configuration-processor + ${spring-boot.version} + true + org.springframework.boot spring-boot-starter-validation @@ -115,21 +132,6 @@ mysql-connector-j ${mysql.version} - - org.springframework.security - spring-security-config - ${spring.framework.security.version} - - - org.springframework.security - spring-security-web - ${spring.framework.security.version} - - - org.springframework - spring-web - ${spring.framework.version} - org.slf4j slf4j-api @@ -165,31 +167,16 @@ gson ${gson.version} - - org.springframework.security - spring-security-core - ${spring.framework.security.version} - org.springframework.boot spring-boot-autoconfigure ${spring-boot.version} - - org.springframework - spring-beans - ${spring.framework.version} - org.apache.tomcat.embed tomcat-embed-core ${tomcat.version} - - org.springframework - spring-context - ${spring.framework.version} - com.amazonaws aws-java-sdk-s3 @@ -200,11 +187,6 @@ aws-java-sdk-core ${amazon.aws.version} - - org.springframework - spring-webmvc - ${spring.framework.version} - com.google.guava guava diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index 41f341353..c8440e7b1 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -13,7 +13,6 @@ 32.1.1-jre - 17.0.0 1.78.1 2.50 1.4.4 @@ -50,16 +49,6 @@ slf4j-api ${slf4j-simple.version} - - com.amazonaws - aws-java-sdk-s3 - ${amazon.aws.version} - - - com.amazonaws - aws-java-sdk-core - ${amazon.aws.version} - org.bouncycastle bcprov-jdk18on @@ -118,12 +107,6 @@ assertj-core test - - org.jetbrains - annotations - ${jetbrains.annotations.version} - test - org.testcontainers testcontainers diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index dbf1f5a9d..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 - 17.0.0 @@ -134,12 +133,6 @@ jakarta.annotation jakarta.annotation-api - - org.jetbrains - annotations - ${jetbrains.annotations.version} - test - @@ -156,6 +149,11 @@ 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 diff --git a/pom.xml b/pom.xml index 9c2b15bd9..42f7ef653 100644 --- a/pom.xml +++ b/pom.xml @@ -410,6 +410,16 @@ de.adorsys.keymanagement:api de.adorsys:datasafe-storage-api de.adorsys:datasafe-directory-api + com.amazonaws:aws-java-sdk-s3 + com.amazonaws:aws-java-sdk-core + org.jetbrains:annotations + org.springframework.security:spring-security-config + org.springframework.security:spring-security-web + org.springframework:spring-web + org.springframework.security:spring-security-core + org.springframework:spring-beans + org.springframework:spring-context + org.springframework:spring-webmvc org.slf4j:slf4j-simple @@ -426,6 +436,9 @@ 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.bouncycastle:bcprov-jdk15on From e155d15522da51b0083c59f017ca55f3926602da Mon Sep 17 00:00:00 2001 From: Awambeng Date: Sun, 4 Aug 2024 12:57:48 +0100 Subject: [PATCH 11/14] Centralize dependency management in main pom.xml --- datasafe-rest-impl/pom.xml | 15 +++++++-------- .../datasafe-simple-adapter-impl/pom.xml | 4 ---- pom.xml | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 49017a9d0..b521a0026 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -20,21 +20,20 @@ 2.2.4 1.6.0 6.1.2 - 2.0.7 6.1.10 3.0.0 - 2.17.1 10.1.11 - 32.1.1-jre 3.0.2 - 2.50 - 5.5.0 - 3.12.2 - 2.8.9 + 2.3.0 true + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc-openapi-starter-webmvc-ui.version} + de.adorsys datasafe-business @@ -135,7 +134,7 @@ org.slf4j slf4j-api - ${slf4j.version} + ${slf4j-simple.version} org.springframework.boot diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index c8440e7b1..36d3aaa17 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -12,11 +12,7 @@ datasafe-simple-adapter-impl - 32.1.1-jre 1.78.1 - 2.50 - 1.4.4 - 3.0.0 diff --git a/pom.xml b/pom.xml index 42f7ef653..7236268f2 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 From 687d4985dcd906912641d02a23dd6996142c3765 Mon Sep 17 00:00:00 2001 From: Awambeng Date: Sun, 4 Aug 2024 19:02:13 +0100 Subject: [PATCH 12/14] Optimize dependency management by excluding unused transitive dependencies --- datasafe-rest-impl/pom.xml | 149 +++++++++++++++++- .../datasafe-simple-adapter-impl/pom.xml | 41 ++++- pom.xml | 13 +- 3 files changed, 181 insertions(+), 22 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index b521a0026..62336b1af 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -19,12 +19,12 @@ 3.0.0 2.2.4 1.6.0 - 6.1.2 + 6.3.1 6.1.10 3.0.0 10.1.11 3.0.2 - 2.3.0 + 2.6.0 true @@ -53,6 +53,16 @@ de.adorsys datasafe-storage-impl-s3 ${project.version} + + + com.amazonaws + aws-java-sdk-s3 + + + com.amazonaws + aws-java-sdk-core + + de.adorsys @@ -69,17 +79,67 @@ org.springframework.boot spring-boot-starter-web ${spring-boot.version} + + + org.springframework + spring-web + + + org.springframework + spring-test + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-webmvc + + + org.apache.tomcat.embed + tomcat-embed-core + + + com.fasterxml.jackson.core + jackson-databind + + org.springframework.boot spring-boot-starter-actuator ${spring-boot.version} + + + org.springframework.boot + spring-boot-actuator-autoconfigure + + org.springframework.boot spring-boot-devtools ${spring-boot.version} runtime + + + org.springframework.boot + spring-boot-autoconfigure + + + org.springframework.boot + spring-boot + + org.springframework.boot @@ -91,6 +151,12 @@ org.springframework.boot spring-boot-starter-validation ${spring-boot.version} + + + jakarta.validation + jakarta.validation-api + + @@ -120,6 +186,24 @@ org.springframework.boot spring-boot-starter-security ${spring-boot.version} + + + org.springframework.security + spring-security-config + + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-crypto + + + org.springframework.security + spring-security-core + + de.adorsys @@ -136,11 +220,6 @@ slf4j-api ${slf4j-simple.version} - - org.springframework.boot - spring-boot - ${spring-boot.version} - com.fasterxml.jackson.core jackson-databind @@ -151,6 +230,27 @@ 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 @@ -196,6 +296,27 @@ 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} + + @@ -209,6 +330,14 @@ org.springframework.boot spring-boot-starter-logging + + org.springframework.boot + spring-boot-test-autoconfigure + + + org.springframework.boot + spring-boot-test + @@ -229,6 +358,12 @@ spring-restdocs-mockmvc test ${spring-restdocs.version} + + + org.springframework.restdocs + spring-restdocs-core + + org.assertj diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index 36d3aaa17..dc8f120e9 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -13,6 +13,7 @@ 1.78.1 + 17.0.0 @@ -33,6 +34,16 @@ datasafe-storage-impl-s3 ${project.version} compile + + + com.amazonaws + aws-java-sdk-s3 + + + com.amazonaws + aws-java-sdk-core + + de.adorsys @@ -70,6 +81,26 @@ 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 @@ -102,10 +133,12 @@ org.assertj assertj-core test - - - org.testcontainers - testcontainers + + + org.jetbrains + annotations + + diff --git a/pom.xml b/pom.xml index 7236268f2..20e0c388e 100644 --- a/pom.xml +++ b/pom.xml @@ -410,16 +410,6 @@ de.adorsys.keymanagement:api de.adorsys:datasafe-storage-api de.adorsys:datasafe-directory-api - com.amazonaws:aws-java-sdk-s3 - com.amazonaws:aws-java-sdk-core - org.jetbrains:annotations - org.springframework.security:spring-security-config - org.springframework.security:spring-security-web - org.springframework:spring-web - org.springframework.security:spring-security-core - org.springframework:spring-beans - org.springframework:spring-context - org.springframework:spring-webmvc org.slf4j:slf4j-simple @@ -429,7 +419,7 @@ de.adorsys:datasafe-business org.springframework.boot:spring-boot-devtools io.jsonwebtoken:jjwt-impl - io.jsonwebtoken:jjwt-jackson + Optimize dependency management by excluding unused transitive dependencies io.jsonwebtoken:jjwt-jackson com.mysql:mysql-connector-j org.springframework.boot:spring-boot-starter-test jakarta.servlet:jakarta.servlet-api @@ -439,6 +429,7 @@ 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 From 89411ac6210fa15baaa047a02fe777b1c64989ca Mon Sep 17 00:00:00 2001 From: Awambeng Date: Sun, 4 Aug 2024 19:07:08 +0100 Subject: [PATCH 13/14] update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 20e0c388e..4e377b712 100644 --- a/pom.xml +++ b/pom.xml @@ -419,7 +419,7 @@ de.adorsys:datasafe-business org.springframework.boot:spring-boot-devtools io.jsonwebtoken:jjwt-impl - Optimize dependency management by excluding unused transitive dependencies io.jsonwebtoken:jjwt-jackson + io.jsonwebtoken:jjwt-jackson com.mysql:mysql-connector-j org.springframework.boot:spring-boot-starter-test jakarta.servlet:jakarta.servlet-api From 353a07690c986418571b4d55496e1e58919aaf64 Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Tue, 3 Sep 2024 14:52:57 +0100 Subject: [PATCH 14/14] Fix maven dependency plugin warnings by adding used undeclared and removing unused declared dependencies --- datasafe-rest-impl/pom.xml | 177 +++++++----------- .../datasafe-simple-adapter-impl/pom.xml | 46 +++-- 2 files changed, 94 insertions(+), 129 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 62336b1af..ee83595f0 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -53,16 +53,6 @@ de.adorsys datasafe-storage-impl-s3 ${project.version} - - - com.amazonaws - aws-java-sdk-s3 - - - com.amazonaws - aws-java-sdk-core - - de.adorsys @@ -79,67 +69,17 @@ org.springframework.boot spring-boot-starter-web ${spring-boot.version} - - - org.springframework - spring-web - - - org.springframework - spring-test - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-webmvc - - - org.apache.tomcat.embed - tomcat-embed-core - - - com.fasterxml.jackson.core - jackson-databind - - org.springframework.boot spring-boot-starter-actuator ${spring-boot.version} - - - org.springframework.boot - spring-boot-actuator-autoconfigure - - org.springframework.boot spring-boot-devtools ${spring-boot.version} runtime - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot - - org.springframework.boot @@ -151,12 +91,6 @@ org.springframework.boot spring-boot-starter-validation ${spring-boot.version} - - - jakarta.validation - jakarta.validation-api - - @@ -186,24 +120,6 @@ org.springframework.boot spring-boot-starter-security ${spring-boot.version} - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-web - - - org.springframework.security - spring-security-crypto - - - org.springframework.security - spring-security-core - - de.adorsys @@ -330,14 +246,6 @@ org.springframework.boot spring-boot-starter-logging - - org.springframework.boot - spring-boot-test-autoconfigure - - - org.springframework.boot - spring-boot-test - @@ -358,12 +266,6 @@ spring-restdocs-mockmvc test ${spring-restdocs.version} - - - org.springframework.restdocs - spring-restdocs-core - - org.assertj @@ -411,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 dc8f120e9..61acaa8ac 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -34,16 +34,6 @@ datasafe-storage-impl-s3 ${project.version} compile - - - com.amazonaws - aws-java-sdk-s3 - - - com.amazonaws - aws-java-sdk-core - - de.adorsys @@ -133,30 +123,46 @@ org.assertj assertj-core test - - - org.jetbrains - annotations - - + 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 -