fix jacoco report

adorsys · Sep 20, 2023 · af8cade · af8cade
1 parent 4081bb0
commit af8cade
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 22 deletions.
diff --git 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
@@ -87,11 +87,6 @@
  <artifactId>jakarta.validation-api</artifactId>
  <version>${jakarta.validation-api.varsion}</version>
  </dependency>
- <dependency>
- <groupId>com.internetitem</groupId>
- <artifactId>logback-elasticsearch-appender</artifactId>
- <version>1.6</version>
- </dependency>
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>
  <artifactId>jackson-databind</artifactId>
@@ -130,8 +125,8 @@
  <version>${project.version}</version>
  </dependency>
  <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
  <version>${mysql.version}</version>
  </dependency>
 

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
@@ -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/...st-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/ReadKeyPasswordHelper.java b/...st-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<char[]>() {
- @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
@@ -144,7 +144,7 @@
  <plugins>
  <plugin>
  <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
+ <version>3.3.1</version>
  <executions>
  <execution>
  <phase>package</phase>

diff --git a/pom.xml b/pom.xml
@@ -113,11 +113,11 @@
  <maven.jar.plugin>3.3.0</maven.jar.plugin>
  <hikari.cp>3.3.1</hikari.cp>
  <h2.database>2.2.220</h2.database>
- <mysql.version>8.0.16</mysql.version>
+ <mysql.version>8.1.0</mysql.version>
  <liquibase>4.23.1</liquibase>
  <spring.framework.version>6.0.11</spring.framework.version>
  <spring.framework.boot.version>3.1.2</spring.framework.boot.version>
- <siv-mode.version>1.3.1</siv-mode.version>
+ <siv-mode.version>1.4.4</siv-mode.version>
  <jackson.version>2.12.7</jackson.version>
  <jackson-databind.version>2.12.7.1</jackson-databind.version>
  <keymanagement.version>0.0.7</keymanagement.version>
@@ -376,7 +376,7 @@
  <artifactId>maven-surefire-plugin</artifactId>
  <version>${surefire.version}</version>
  <configuration>
-<!-- <argLine>${surefireArgLine}</argLine>-->
+ <argLine>${surefireArgLine}</argLine>
  <argLine>
  --add-opens java.base/java.lang=ALL-UNNAMED,