diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 6aa917492..0891234c0 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -19,4 +19,4 @@ jobs: distribution: 'adopt' - name: Build project and run default test suite - run: mvn verify + run: mvn clean verify -ntp diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml index f734f1448..029961b5d 100644 --- a/datasafe-rest-impl/pom.xml +++ b/datasafe-rest-impl/pom.xml @@ -87,11 +87,6 @@ jakarta.validation-api ${jakarta.validation-api.varsion} - - com.internetitem - logback-elasticsearch-appender - 1.6 - com.fasterxml.jackson.core jackson-databind @@ -130,8 +125,8 @@ ${project.version} - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.version} diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java index 6fb6e0dc4..cf581b75a 100644 --- a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java +++ b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java @@ -10,9 +10,8 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; -@SpringBootApplication +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) @EnableConfigurationProperties({DatasafeProperties.class, SecurityProperties.class}) -@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) public class DatasafeRestApplication { public static void main(String[] args) { diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/ReadKeyPasswordHelper.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/ReadKeyPasswordHelper.java index c0eae5298..cd5822d08 100644 --- a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/ReadKeyPasswordHelper.java +++ b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/ReadKeyPasswordHelper.java @@ -1,16 +1,11 @@ package de.adorsys.datasafe.rest.impl.controller; import de.adorsys.datasafe.types.api.types.ReadKeyPassword; +import lombok.experimental.UtilityClass; -import java.util.function.Supplier; - +@UtilityClass public class ReadKeyPasswordHelper { public static ReadKeyPassword getForString(String a) { - return new ReadKeyPassword(new Supplier() { - @Override - public char[] get() { - return a.toCharArray(); - } - }); + return new ReadKeyPassword(a::toCharArray); } } diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml index 9abff3f6e..460582e2c 100644 --- a/last-module-codecoverage-check/pom.xml +++ b/last-module-codecoverage-check/pom.xml @@ -144,7 +144,7 @@ maven-resources-plugin - 2.7 + 3.3.1 package diff --git a/pom.xml b/pom.xml index bc09f0b75..e21c6e91d 100644 --- a/pom.xml +++ b/pom.xml @@ -113,11 +113,11 @@ 3.3.0 3.3.1 2.2.220 - 8.0.16 + 8.1.0 4.23.1 6.0.11 3.1.2 - 1.3.1 + 1.4.4 2.12.7 2.12.7.1 0.0.7 @@ -376,7 +376,7 @@ maven-surefire-plugin ${surefire.version} - + ${surefireArgLine} --add-opens java.base/java.lang=ALL-UNNAMED,