Merge branch 'develop' into maintenance/documentation

adorsys · Dec 13, 2023 · 9a67ae8 · 9a67ae8
2 parents 374fb08 + 568e5ab
commit 9a67ae8
Show file tree

Hide file tree

Showing 81 changed files with 1,389 additions and 12,766 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
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -113,6 +113,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>
@@ -179,7 +180,10 @@
  <artifactId>h2</artifactId>
  <scope>test</scope>
  </dependency>
-
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
  </dependencies>
 
  <build>
@@ -218,14 +222,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/...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-cli/pom.xml b/datasafe-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
 
  <artifactId>datasafe-cli</artifactId>

diff --git a/datasafe-directory/datasafe-directory-api/pom.xml b/datasafe-directory/datasafe-directory-api/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-directory-api</artifactId>
  <dependencies>

diff --git a/datasafe-directory/datasafe-directory-impl/pom.xml b/datasafe-directory/datasafe-directory-impl/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-directory-impl</artifactId>
  <dependencies>

diff --git a/datasafe-directory/pom.xml b/datasafe-directory/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-encryption/datasafe-encryption-api/pom.xml b/datasafe-encryption/datasafe-encryption-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-encryption-api</artifactId>
  <dependencies>

diff --git a/datasafe-encryption/datasafe-encryption-impl/pom.xml b/datasafe-encryption/datasafe-encryption-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-encryption-impl</artifactId>
  <dependencies>
@@ -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/...main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java b/...main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java
@@ -36,7 +36,7 @@
 /**
  * Cryptographic message syntax document encoder/decoder - see
  *
- * @see <a href=https://en.wikipedia.org/wiki/Cryptographic_Message_Syntax">CMS
+ * @see <a href="https://en.wikipedia.org/wiki/Cryptographic_Message_Syntax">CMS
  * wiki</a>
  */
 @Slf4j

diff --git a/.../de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java b/.../de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java
@@ -24,7 +24,7 @@
  * It means that path/to/file is encrypted to cipher(path)/cipher(to)/cipher(file) and each invocation of example:
  * cipher(path) will yield same string, but cipher(path)/cipher(path) will not yield same segments -
  * it will be more like abc/cde and not like abc/abc.
- * Additionally each segment is authenticated against its parent path hash, so attacker can't
+ * Additionally, each segment is authenticated against its parent path hash, so attacker can't
  * move a/file to b/file without being detected.
  */
 @Slf4j

diff --git a/datasafe-encryption/pom.xml b/datasafe-encryption/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-examples/datasafe-examples-business/pom.xml b/datasafe-examples/datasafe-examples-business/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-business</artifactId>
  <dependencies>

diff --git a/datasafe-examples/datasafe-examples-customize-dagger/pom.xml b/datasafe-examples/datasafe-examples-customize-dagger/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-customize-dagger</artifactId>
  <dependencies>

diff --git a/.../java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java b/.../java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java
@@ -23,7 +23,7 @@
 
 /**
  * This is Datasafe services customized implementation.
- * Note, that despite is has {@code @Singleton} annotation, it is not real singleton, the only shared thing
+ * Note, that despite it has {@code @Singleton} annotation, it is not real singleton, the only shared thing
  * across all services instantiated using build() is bindings with {@code Singleton} in its Module.
  */
 @Singleton

diff --git a/datasafe-examples/datasafe-examples-multidfs/pom.xml b/datasafe-examples/datasafe-examples-multidfs/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-multidfs</artifactId>
  <dependencies>

diff --git a/datasafe-examples/datasafe-examples-versioned-s3/pom.xml b/datasafe-examples/datasafe-examples-versioned-s3/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-versioned-s3</artifactId>
  <dependencies>

diff --git a/datasafe-examples/pom.xml b/datasafe-examples/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-inbox/datasafe-inbox-api/pom.xml b/datasafe-inbox/datasafe-inbox-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-inbox-api</artifactId>
  <dependencies>

diff --git a/datasafe-inbox/datasafe-inbox-impl/pom.xml b/datasafe-inbox/datasafe-inbox-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-inbox-impl</artifactId>
  <dependencies>

diff --git a/datasafe-inbox/pom.xml b/datasafe-inbox/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml b/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml
@@ -5,16 +5,12 @@
  <parent>
  <artifactId>datasafe-long-run-tests</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>datasafe-business-tests-random-actions</artifactId>
 
- <properties>
- <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
- </properties>
-
  <dependencies>
  <dependency>
  <groupId>de.adorsys</groupId>
@@ -110,6 +106,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>
@@ -185,9 +182,8 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven.surefire.plugin.version}</version>
+ <version>${surefire.version}</version>
  <configuration>
- <forkMode>once</forkMode>
  <argLine>${testArgs}</argLine>
  </configuration>
  </plugin>

diff --git a/datasafe-long-run-tests/pom.xml b/datasafe-long-run-tests/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-metainfo/datasafe-metainfo-version-api/pom.xml b/datasafe-metainfo/datasafe-metainfo-version-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-metainfo-version-api</artifactId>
  <dependencies>

diff --git a/datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml b/datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-metainfo-version-impl</artifactId>
  <dependencies>

diff --git a/datasafe-metainfo/pom.xml b/datasafe-metainfo/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/datasafe-privatestore-api/pom.xml b/datasafe-privatestore/datasafe-privatestore-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/datasafe-privatestore-impl/pom.xml b/datasafe-privatestore/datasafe-privatestore-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/pom.xml b/datasafe-privatestore/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>