Merge branch 'release-2.0.0'

.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

.travis.yml

@@ -133,3 +133,7 @@ matrix:
  - echo 'Nothing to do' # Override primary build logic
 
  # No WINDOWS here because it is in beta status yet.
+
+cache:
+ directories:
+ - $HOME/.m2

README.md

@@ -3,6 +3,24 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/06ae7d4cafc3012cee85/maintainability)](https://codeclimate.com/github/adorsys/datasafe/maintainability)
 
 
+# Licensing model change to dual license: _AGPL v.3_ or _commercial license_
+
+**Attention: this open-source project will change its licensing model as of _01.01.2022_!**
+
+Constantly evolving and extending scope, production traffic and support in open banking world call for high maintenance 
+and service investments on our part. 
+
+Henceforth, Adorsys will offer all versions higher than v1.0.0.1 of Datasafe under a dual-license model. 
+Thus, this repository will be available either under Affero GNU General Public License v.3 (AGPL v.3) or 
+alternatively under a commercial license agreement.
+
+We would like to thank all our users for their trust so far and are convinced that we will be able to provide an even 
+better service going forward.
+
+For more information, advice for your implementation project or if your use case requires more time to adapt this 
+change, please contact us at [[email protected]](mailto:[email protected]).
+For additional details please see the section [FAQ on Licensing Change](#faq-on-licensing-change).
+
 # General information
 Datasafe is a cross-platform library that allows sharing and storing data and documents securely. It encrypts
 your data using **AES-GCM** algorithm and uses **CMS-envelopes** as encrypted content wrapper. CMS-envelope
@@ -775,3 +793,61 @@ You can read JavaDoc [here](https://adorsys.github.io/datasafe/javadoc/latest/in
 * [CodingRules](docs/codingrules/CodingRules.md)
 * [Branching and commiting](docs/branching/branch-and-commit.md)
 * [Deployment to maven central](docs/general/deployment_maven_central.md)
+
+
+# FAQ on Licensing Change
+
+## What is a dual-licensing model?
+Under a dual-licensing model, our product is available under two licenses 
+- [The Affero GNU General Public License v3 (AGPL v3)](https://www.gnu.org/licenses/agpl-3.0.en.html)
+- A proprietary commercial license
+
+If you are a developer or business that would like to review our products in detail, test and implement in your 
+open-source projects and share the changes back to the community, the product repository is freely available under AGPL v3.
+
+If you are a business that would like to implement our products in a commercial setting and would like to protect your 
+individual changes, we offer the option to license our products under a commercial license.
+
+This change will still allow free access and ensure openness under AGPL v3 but with assurance of committing any 
+alterations or extensions back to the project and preventing redistribution of such implementations under commercial license.
+
+## Will there be any differences between the open-source and commercially licensed versions of your products?
+Our public release frequency will be reduced as our focus shifts towards the continuous maintenance of the commercial version. 
+Nevertheless, we are committed to also provide open-source releases of our products on a regular basis as per our release policy.
+
+For customers with a commercial license, we will offer new intermediate releases in a more frequent pace.
+
+## Does this mean that this product is no longer open source?
+No, the product will still be published and available on GitHub under an OSI-approved open-source license (AGPL v3).
+
+## What about adorsys’ commitment to open source? Will adorsys provide future product releases on GitHub?
+We at adorsys are committed to continue actively participating in the open-source community. Our products remain 
+licensed under OSI-approved open-source licenses, and we are looking forward to expanding our product portfolio on GitHub even further.
+
+## How does the change impact me if I already use the open-source edition of your product?
+All currently published versions until v1.0.0.1 will remain under their current Apache 2.0 license and its respective 
+requirements and you may continue using it as-is. To upgrade to future versions, you will be required to either abide 
+by the requirements of AGPL v3, including documenting and sharing your implemented changes to the product when distributing, 
+or alternatively approach us to obtain a commercial license.
+
+## What if I cannot adjust to the new licensing model until 01.01.2022? Can I extend the deadline?
+We understand that adjustment to licensing changes can take time and therefore are open to discuss extension options 
+on an individual basis. For inquiries please contact us as [[email protected]](mailto:[email protected]).
+
+## Which versions of the product are affected?
+All versions of Datasafe after v1.0.0.1 will be affected by the licensing changes and move to a dual-licensing model.
+
+## What will happen to older, Apache 2.0 licensed product versions?
+All older Apache 2.0 licensed versions prior and including v1.0.0.1 will remain available under their existing license.
+
+## What open-source products from Adorsys are affected by the licensing change?
+The following products are affected:
+- [XS2A Core](https://github.com/adorsys/xs2a)
+- [XS2A Sandbox & ModelBank](https://github.com/adorsys/XS2A-Sandbox)
+- [Open Banking Gateway](https://github.com/adorsys/open-banking-gateway) incl. [XS2A Adapters](https://github.com/adorsys/xs2a-adapter)
+- [SmartAnalytics](https://github.com/adorsys/smartanalytics)
+- [Datasafe](https://github.com/adorsys/datasafe)
+
+## I’m using one of these products indirectly via some software integrator. How does the licensing change affect me?
+The licensing change does not affect you as user, but it is relevant to your provider who has used our product in their 
+solution implementation. In case of uncertainty please contact your service provider or approach us at [[email protected]](mailto:[email protected]).

datasafe-business/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -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>

datasafe-business/src/test/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;

datasafe-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;

datasafe-business/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))

datasafe-cli/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
 
  <artifactId>datasafe-cli</artifactId>

datasafe-directory/datasafe-directory-api/pom.xml

@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-directory-api</artifactId>
  <dependencies>

datasafe-directory/datasafe-directory-impl/pom.xml

@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-directory-impl</artifactId>
  <dependencies>

datasafe-directory/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-encryption/datasafe-encryption-api/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-encryption-api</artifactId>
  <dependencies>

datasafe-encryption/datasafe-encryption-impl/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</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>

datasafe-encryption/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-examples/datasafe-examples-business/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-examples-business</artifactId>
  <dependencies>

datasafe-examples/datasafe-examples-customize-dagger/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-examples-customize-dagger</artifactId>
  <dependencies>

datasafe-examples/datasafe-examples-multidfs/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-examples-multidfs</artifactId>
  <dependencies>

datasafe-examples/datasafe-examples-versioned-s3/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-examples-versioned-s3</artifactId>
  <dependencies>

datasafe-examples/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-inbox/datasafe-inbox-api/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-inbox-api</artifactId>
  <dependencies>

datasafe-inbox/datasafe-inbox-impl/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-inbox-impl</artifactId>
  <dependencies>

datasafe-inbox/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-long-run-tests</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-long-run-tests/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-metainfo/datasafe-metainfo-version-api/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-metainfo-version-api</artifactId>
  <dependencies>

datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>1.0.3</version>
+ <version>2.0.0</version>
  </parent>
  <artifactId>datasafe-metainfo-version-impl</artifactId>
  <dependencies>