Skip to content

Commit

Permalink
Merge pull request #340 from adorsys/fix-dependency-plugin-warnings
Browse files Browse the repository at this point in the history 
fix maven dependency plugin warnings
  • Loading branch information
@francis-pouatcha
francis-pouatcha authored Sep 26, 2024
2 parents 32d36bc + 353a076 commit c23e1ef
Show file tree
Hide file tree
Showing 8 changed files with 346 additions and 48 deletions.
224 changes: 212 additions & 12 deletions datasafe-rest-impl/pom.xml
View file

Large diffs are not rendered by default.

83 changes: 78 additions & 5 deletions datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>datasafe-simple-adapter-impl</artifactId>

<properties>
<bouncycastle.bcprov.version>1.78.1</bouncycastle.bcprov.version>
<jetbrains.annotations.version>17.0.0</jetbrains.annotations.version>
</properties>

<dependencies>
<dependency>
<groupId>de.adorsys</groupId>
Expand Down Expand Up @@ -40,6 +46,51 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j-simple.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>${bouncycastle.bcprov.version}</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
<version>${dagger.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${jsr-305.version}</version>
</dependency>
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>siv-mode</artifactId>
<version>${siv-mode.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${amazon.aws.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>${amazon.aws.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>${jetbrains.annotations.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>de.adorsys</groupId>
Expand Down Expand Up @@ -78,18 +129,40 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven.dependency.plugin.version}</version>
<configuration>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-encryption-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-inbox-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>javax.inject:javax.inject</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys.keymanagement:api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-storage-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-privatestore-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-privatestore-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-directory-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-directory-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-inbox-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-types-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-encryption-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.projectlombok:lombok</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>org.slf4j:slf4j-simple</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.mockito:mockito-core</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredNonTestScopedDependencies>
<ignoredNonTestScopedDependency>org.bouncycastle:bcprov-jdk18on</ignoredNonTestScopedDependency>
</ignoredNonTestScopedDependencies>

</configuration>
<executions>
<execution>
<id>analyze</id>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<failOnWarning>false</failOnWarning>
<outputXML>true</outputXML>
</configuration>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -127,4 +200,4 @@
</plugins>
</build>

</project>
</project>
4 changes: 2 additions & 2 deletions ...-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleAdapterFeatureTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
19 changes: 7 additions & 12 deletions datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<properties>
<spring.framework.version>6.1.10</spring.framework.version>
<spring.framework.boot.version>3.3.1</spring.framework.boot.version>
<snakeyaml.version>2.2</snakeyaml.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -88,11 +87,6 @@
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -135,11 +129,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand All @@ -160,8 +149,14 @@
</goals>
<configuration>
<failOnWarning>false</failOnWarning>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>org.jetbrains:annotations</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-storage-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-types-api</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-test</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>de.adorsys:datasafe-business</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
Expand All @@ -173,4 +168,4 @@
</build>


</project>
</project>
2 changes: 1 addition & 1 deletion ...e-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions datasafe-storage/datasafe-storage-impl-s3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand Down
7 changes: 5 additions & 2 deletions last-module-codecoverage-check/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,12 @@
<version>${project.version}</version>
</dependency>


<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>


</dependencies>


Expand Down Expand Up @@ -244,6 +242,11 @@
<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>
<ignoredUnusedDeclaredDependency>de.adorsys:datasafe-simple-adapter-api</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>de.adorsys:datasafe-runtime-delegate</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-api</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>

</configuration>
Expand Down
51 changes: 41 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.16.1</jackson.version>
<jackson.version>2.17.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>
Expand All @@ -129,14 +129,6 @@
<spotbugs.version>4.8.6</spotbugs.version>
</properties>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -472,12 +464,39 @@
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>javax.inject:javax.inject</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>org.projectlombok:lombok</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>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-privatestore-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-directory-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-inbox-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-encryption-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-encryption-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-inbox-impl</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys.keymanagement:api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-storage-api</ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>de.adorsys:datasafe-directory-api</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>
<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-devtools</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>io.jsonwebtoken:jjwt-impl</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>io.jsonwebtoken:jjwt-jackson</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.mysql:mysql-connector-j</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-test</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>jakarta.servlet:jakarta.servlet-api</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.fasterxml.jackson.core:jackson-annotations</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.fasterxml.jackson.core:jackson-databind</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-security</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-web</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-starter-actuator</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springframework.boot:spring-boot-configuration-processor</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.springdoc:springdoc-openapi-starter-webmvc-ui</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredNonTestScopedDependencies>
<ignoredNonTestScopedDependency>org.bouncycastle:bcprov-jdk15on</ignoredNonTestScopedDependency>
Expand All @@ -496,6 +515,18 @@
<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>de.adorsys:datasafe-storage-impl-s3</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.testcontainers:testcontainers</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>de.adorsys:datasafe-storage-impl-fs</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>com.amazonaws:aws-java-sdk-s3</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>com.amazonaws:aws-java-sdk-core</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.junit.jupiter:junit-jupiter-params</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.springframework:spring-beans</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>de.adorsys:datasafe-inbox-impl</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>de.adorsys:datasafe-privatestore-impl</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>com.fasterxml.jackson.core:jackson-databind</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>org.bouncycastle:bcprov-jdk18on</ignoredNonTestScopedDependency>
</ignoredNonTestScopedDependencies>
</configuration>
</execution>
Expand Down

0 comments on commit c23e1ef

Please sign in to comment.