From feddc43c776cdd64424d4c246f1474edb57ba44e Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Wed, 10 Jul 2024 17:13:35 +0100 Subject: [PATCH 1/2] fix: Resolve Maven Dependency Plugin warnings --- datasafe-rest-impl/pom.xml | 226 ++++++++++++++---- .../datasafe-simple-adapter-impl/pom.xml | 54 +++++ .../datasafe-simple-adapter-spring/pom.xml | 25 +- .../datasafe-storage-impl-s3/pom.xml | 4 - last-module-codecoverage-check/pom.xml | 34 --- pom.xml | 46 +++- 6 files changed, 279 insertions(+), 110 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 33dd14c4b..949a90848 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -24,11 +24,11 @@ - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi-starter-webmvc-ui.version} - + + + + + de.adorsys datasafe-business @@ -60,28 +60,28 @@ ${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 - + + + + + + + + + + + + + + + + + + + + + + jakarta.validation @@ -93,33 +93,33 @@ jjwt-api ${jjwt.version} - - io.jsonwebtoken - jjwt-impl - ${jjwt.version} - runtime - - - io.jsonwebtoken - jjwt-jackson - ${jjwt.version} - runtime - - - org.springframework.boot - spring-boot-starter-security - ${spring-boot.version} - + + + + + + + + + + + + + + + + + de.adorsys datasafe-storage-impl-db ${project.version} - - com.mysql - mysql-connector-j - ${mysql.version} - + + + + + @@ -154,6 +154,134 @@ test ${spring-restdocs.version} + + org.springframework + spring-web + ${spring.framework.version} + compile + + + org.slf4j + slf4j-api + ${slf4j-simple.version} + + + org.springframework + spring-test + ${spring.framework.version} + test + + + org.assertj + assertj-core + ${assertj.version} + test + + + org.springframework.restdocs + spring-restdocs-core + ${spring-restdocs-core.version} + test + + + org.springframework.security + spring-security-core + ${spring.framework.security.version} + + + org.springframework + spring-context + ${spring.framework.version} + + + com.google.dagger + dagger + ${dagger.version} + + + org.springframework.boot + spring-boot + ${spring.framework.boot.version} + + + org.springframework.boot + spring-boot-test-autoconfigure + ${spring.framework.boot.version} + test + + + com.google.code.gson + gson + ${gson.version} + + + org.springframework + spring-beans + ${spring.framework.version} + + + + + + + + org.springframework + spring-webmvc + ${spring.framework.version} + + + org.springframework.security + spring-security-web + ${spring.framework.security.version} + + + org.springframework.security + spring-security-config + ${spring.framework.security.version} + + + org.springframework.boot + spring-boot-autoconfigure + ${spring.framework.boot.version} + + + org.springframework.boot + spring-boot-test + ${spring.framework.boot.version} + test + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + org.springframework + spring-core + ${spring.framework.version} + + + org.mockito + mockito-core + ${mockito.version} + test + + + com.google.guava + guava + ${guava.version} + + + org.springframework.security + spring-security-crypto + ${spring.framework.security.version} + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided + diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml index af98b24da..889bc3e07 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml @@ -73,6 +73,60 @@ assertj-core test + + de.adorsys + datasafe-encryption-impl + ${project.version} + + + de.adorsys.keymanagement + api + ${keymanagement.version} + + + junit + junit + ${junit.version} + test + + + org.testcontainers + testcontainers + ${testcontainers.version} + test + + + org.bouncycastle + bcprov-jdk18on + ${bouncycastle.bcprov-jdk18on.version} + test + + + com.google.code.findbugs + jsr305 + ${jsr-305.version} + + + org.cryptomator + siv-mode + ${siv-mode.version} + + + org.jetbrains + annotations + ${jetbrains-annotations.version} + test + + + com.google.dagger + dagger + ${dagger.version} + + + com.google.guava + guava + ${guava.version} + diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml index 853af91b2..57d12c141 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml @@ -82,24 +82,12 @@ test - - org.yaml - snakeyaml - 2.1 - org.junit.jupiter junit-jupiter-api ${jupiter.version} test - - de.adorsys - datasafe-business - ${project.version} - test-jar - test - de.adorsys datasafe-types-api @@ -133,7 +121,18 @@ 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 4f16cd52d..02f6b811d 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..4701582c4 100644 --- a/last-module-codecoverage-check/pom.xml +++ b/last-module-codecoverage-check/pom.xml @@ -62,11 +62,6 @@ ${project.version} - - de.adorsys - datasafe-metainfo-version-api - ${project.version} - de.adorsys datasafe-metainfo-version-impl @@ -112,35 +107,6 @@ ${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 daf7f6932..48df035ce 100644 --- a/pom.xml +++ b/pom.xml @@ -125,16 +125,15 @@ 3.1.0 3.0.1 1.6.13 + 3.0.0 + 6.1.2 + 10.1.11 + 2.12.7.1 + 4.13.2 + 17.0.0 + 1.78.1 - - - org.junit.jupiter - junit-jupiter-engine - test - - - @@ -333,6 +332,11 @@ jaxb-api ${jaxb-api.version} + + + + + @@ -396,15 +400,26 @@ javax.inject:javax.inject org.projectlombok:lombok + de.adorsys:datasafe-privatestore-api + de.adorsys:datasafe-directory-api + de.adorsys:datasafe-inbox-impl + de.adorsys:datasafe-privatestore-impl + com.amazonaws:aws-java-sdk-s3 + com.amazonaws:aws-java-sdk-core + de.adorsys:datasafe-directory-impl + de.adorsys:datasafe-inbox-api + de.adorsys:datasafe-encryption-api + de.adorsys:datasafe-storage-api + de.adorsys:datasafe-types-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-test - org.bouncycastle:bcprov-jdk15on + org.slf4j:slf4j-api:jar org.projectlombok:lombok de.adorsys:datasafe-business @@ -420,6 +435,17 @@ com.google.guava:guava com.google.code.gson:gson de.adorsys.keymanagement:juggler-bouncycastle + org.junit.jupiter:junit-jupiter-api + org.testcontainers:testcontainers + org.junit.jupiter:junit-jupiter-params + de.adorsys:datasafe-storage-impl-s3 + de.adorsys:datasafe-storage-impl-fs + com.amazonaws:aws-java-sdk-s3 + com.amazonaws:aws-java-sdk-core + org.springframework:spring-beans + de.adorsys:datasafe-inbox-impl + de.adorsys:datasafe-privatestore-impl + com.fasterxml.jackson.core:jackson-databind From 50872debb17839e22b332521487c67621c9733e9 Mon Sep 17 00:00:00 2001 From: Awambeng Rodrick Date: Wed, 10 Jul 2024 17:27:11 +0100 Subject: [PATCH 2/2] chore: remove unnecessary commented lines from pom.xml --- datasafe-rest-impl/pom.xml | 56 -------------------------------------- pom.xml | 6 ---- 2 files changed, 62 deletions(-) diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index 949a90848..10ae753e6 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -24,11 +24,6 @@ - - - - - de.adorsys datasafe-business @@ -59,30 +54,6 @@ datasafe-metainfo-version-impl ${project.version} - - - - - - - - - - - - - - - - - - - - - - - - jakarta.validation jakarta.validation-api @@ -93,33 +64,11 @@ jjwt-api ${jjwt.version} - - - - - - - - - - - - - - - - - de.adorsys datasafe-storage-impl-db ${project.version} - - - - - @@ -219,11 +168,6 @@ spring-beans ${spring.framework.version} - - - - - org.springframework spring-webmvc diff --git a/pom.xml b/pom.xml index 48df035ce..8667a6b4c 100644 --- a/pom.xml +++ b/pom.xml @@ -332,11 +332,6 @@ jaxb-api ${jaxb-api.version} - - - - - @@ -419,7 +414,6 @@ org.springframework.boot:spring-boot-starter-test - org.slf4j:slf4j-api:jar org.projectlombok:lombok de.adorsys:datasafe-business