Merge pull request #230 from adorsys/jdk-17

Jdk 17
adorsys · Sep 28, 2023 · 7af7fbd · 7af7fbd
2 parents 6339d7f + 67ce8f6
commit 7af7fbd
Show file tree

Hide file tree

Showing 45 changed files with 1,249 additions and 550 deletions.
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -0,0 +1,22 @@
+# Builds Pull-requests to key branches
+name: Pull request CI
+
+on:
+ pull_request:
+ branches:
+ - develop
+ - master
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up JDK 17
+ uses: actions/setup-java@v3
+ with:
+ java-version: 17
+ distribution: 'adopt'
+
+ - name: Build project and run default test suite
+ run: mvn clean verify -ntp
diff --git a/datasafe-business/pom.xml b/datasafe-business/pom.xml
@@ -168,7 +168,6 @@
  <dependency>
  <groupId>org.testcontainers</groupId>
  <artifactId>testcontainers</artifactId>
- <version>1.11.2</version>
  </dependency>
  <dependency>
  <groupId>org.awaitility</groupId>
@@ -180,7 +179,10 @@
  <artifactId>h2</artifactId>
  <scope>test</scope>
  </dependency>
-
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
  </dependencies>
 
  <build>
@@ -219,14 +221,19 @@
  <ignoredUnusedDeclaredDependencies>
  <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-simple</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>org.mockito:mockito-core</ignoredUnusedDeclaredDependency>
  <ignoredUnusedDeclaredDependency>com.h2database:h2</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>javax.xml.bind:jaxb-api:jar</ignoredUnusedDeclaredDependency>
  </ignoredUnusedDeclaredDependencies>
  <ignoredUsedUndeclaredDependencies>
  <ignoredUsedUndeclaredDependency>javax.inject:javax.inject</ignoredUsedUndeclaredDependency>
  <ignoredUsedUndeclaredDependency>com.amazonaws</ignoredUsedUndeclaredDependency>
  <ignoredUsedUndeclaredDependency>org.bouncycastle</ignoredUsedUndeclaredDependency>
  </ignoredUsedUndeclaredDependencies>
+ <ignoredNonTestScopedDependencies>
+ <ignoredNonTestScopedDependency>org.bouncycastle</ignoredNonTestScopedDependency>
+ <ignoredNonTestScopedDependency>org.slf4j</ignoredNonTestScopedDependency>
+ <ignoredNonTestScopedDependency>org.projectlombok</ignoredNonTestScopedDependency>
+ </ignoredNonTestScopedDependencies>
  </configuration>
  </execution>
  </executions>

diff --git a/...est/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTest.java b/...est/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTest.java
@@ -58,7 +58,7 @@
 @Slf4j
 class BasicFunctionalityWithConcurrencyTest extends BaseE2ETest {
 
- private static final int TIMEOUT_S = 15;
+ private static final int TIMEOUT_S = 30;
 
  private static int NUMBER_OF_TEST_USERS = 3;
  private static int NUMBER_OF_TEST_FILES = 5;

diff --git a/...business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareTest.java b/...business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareTest.java
@@ -16,7 +16,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.testcontainers.shaded.org.apache.commons.lang.time.StopWatch;
+import org.testcontainers.shaded.org.apache.commons.lang3.time.StopWatch;
 
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/...siness/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java b/...siness/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java
@@ -1,7 +1,6 @@
 package de.adorsys.datasafe.business.impl.e2e;
 
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import dagger.Lazy;
 import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices;
@@ -95,7 +94,7 @@ class MultiDFSFunctionalityTest extends BaseMockitoTest {
  static void initDistributedMinios() {
  // Create all required minio-backed S3 buckets:
  Stream.of(CREDENTIALS, KEYSTORE, FILES_ONE, FILES_TWO, INBOX).forEach(it -> {
- GenericContainer minio = new GenericContainer("minio/minio")
+ GenericContainer minio = new GenericContainer("minio/minio:RELEASE.2019-08-01T22-18-54Z")
  .withExposedPorts(9000)
  .withEnv("MINIO_ACCESS_KEY", accessKey(it))
  .withEnv("MINIO_SECRET_KEY", secretKey(it))

diff --git a/datasafe-encryption/datasafe-encryption-impl/pom.xml b/datasafe-encryption/datasafe-encryption-impl/pom.xml
@@ -102,7 +102,7 @@
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>
  <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson-databind.version}</version>
  <scope>test</scope>
  </dependency>
  <dependency>
@@ -117,6 +117,12 @@
  <version>${jackson.version}</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
  </dependencies>
 
  <build>

diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml
@@ -14,13 +14,13 @@
  <description>Spring Boot DataSafe Application</description>
 
  <properties>
- <java.version>1.8</java.version>
- <spring-boot.version>2.1.5.RELEASE</spring-boot.version>
+ <spring-boot.version>3.1.2</spring-boot.version>
  <springfox-swagger.version>2.9.2</springfox-swagger.version>
  <jjwt.version>0.10.5</jjwt.version>
- <spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version>
- <asciidoctor-maven-plugin.version>1.5.3</asciidoctor-maven-plugin.version>
+ <spring-restdocs.version>3.0.0</spring-restdocs.version>
+ <asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
  <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+ <jakarta.validation-api.varsion>3.0.2</jakarta.validation-api.varsion>
  </properties>
 
  <dependencies>
@@ -60,6 +60,11 @@
  <artifactId>spring-boot-starter-web</artifactId>
  <version>${spring-boot.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>2.1</version>
+ </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-actuator</artifactId>
@@ -78,24 +83,14 @@
  <optional>true</optional>
  </dependency>
  <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${springfox-swagger.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${springfox-swagger.version}</version>
- </dependency>
- <dependency>
- <groupId>com.internetitem</groupId>
- <artifactId>logback-elasticsearch-appender</artifactId>
- <version>1.6</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>${jakarta.validation-api.varsion}</version>
  </dependency>
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>
  <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson-databind.version}</version>
  </dependency>
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>
@@ -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>
 
@@ -144,8 +139,8 @@
  <scope>test</scope>
  <exclusions>
  <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
  </exclusion>
  </exclusions>
  </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/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java
diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/SwaggerConfig.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/SwaggerConfig.java