Release version 0.0.6 (#317)

catenax-ng · Jul 29, 2022 · 1e8ba6c · 1e8ba6c
1 parent dc4b40c
commit 1e8ba6c
Show file tree

Hide file tree

Showing 22 changed files with 97 additions and 341 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
@@ -92,7 +92,9 @@ jobs:
       -
         name: Load images into KinD
         run: |-
-          kind get clusters | xargs -n1 kind load docker-image edc-controlplane-postgresql-hashicorp-vault:latest edc-dataplane-hashicorp-vault:latest --name
+          docker tag edc-controlplane-postgresql-hashicorp-vault:latest edc-controlplane-postgresql-hashicorp-vault:business-test
+          docker tag edc-dataplane-hashicorp-vault:latest edc-dataplane-hashicorp-vault:business-test
+          kind get clusters | xargs -n1 kind load docker-image edc-controlplane-postgresql-hashicorp-vault:business-test edc-dataplane-hashicorp-vault:business-test --name
 
       ############################################
       ### Prepare And Install Test Environment ###
@@ -115,10 +117,14 @@ jobs:
 
           # Install the all-in-one supporting infrastructure environment (daps, vault, pgsql)
           helm install test-environment edc-tests/src/main/resources/deployment/helm/all-in-one \
-            --set platoedccontrolplane.image.tag=latest \
-            --set sokratesedccontrolplane.image.tag=latest \
-            --set platoedcdataplane.image.tag=latest \
-            --set sokratesedcdataplane.image.tag=latest \
+            --set platoedccontrolplane.image.repository=edc-controlplane-postgresql-hashicorp-vault \
+            --set platoedccontrolplane.image.tag=business-test \
+            --set sokratesedccontrolplane.image.repository=edc-controlplane-postgresql-hashicorp-vault \
+            --set sokratesedccontrolplane.image.tag=business-test \
+            --set platoedcdataplane.image.repository=edc-dataplane-hashicorp-vault \
+            --set platoedcdataplane.image.tag=business-test \
+            --set sokratesedcdataplane.image.repository=edc-dataplane-hashicorp-vault \
+            --set sokratesedcdataplane.image.tag=business-test \
             --set idsdaps.enabled=true \
             --set platovault.enabled=true \
             --set platopostgresql.enabled=true \
@@ -146,10 +152,14 @@ jobs:
 
           # Install the all-in-one Control-/DataPlanes and backend-services
           helm upgrade --install test-environment edc-tests/src/main/resources/deployment/helm/all-in-one \
-            --set platoedccontrolplane.image.tag=latest \
-            --set sokratesedccontrolplane.image.tag=latest \
-            --set platoedcdataplane.image.tag=latest \
-            --set sokratesedcdataplane.image.tag=latest \
+            --set platoedccontrolplane.image.repository=edc-controlplane-postgresql-hashicorp-vault \
+            --set platoedccontrolplane.image.tag=business-test \
+            --set sokratesedccontrolplane.image.repository=edc-controlplane-postgresql-hashicorp-vault \
+            --set sokratesedccontrolplane.image.tag=business-test \
+            --set platoedcdataplane.image.repository=edc-dataplane-hashicorp-vault \
+            --set platoedcdataplane.image.tag=business-test \
+            --set sokratesedcdataplane.image.repository=edc-dataplane-hashicorp-vault \
+            --set sokratesedcdataplane.image.tag=business-test \
             --set idsdaps.enabled=true \
             --set platovault.enabled=true \
             --set platopostgresql.enabled=true \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.6] - 2022-07-29
+
+### Fixed
+
+-   Fixes [release 0.0.5](https://github.com/catenax-ng/product-edc/releases/tag/0.0.5), which introduced classpath issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar) library 
+
 ## [0.0.5] - 2022-07-28
 
 ### Added
@@ -45,7 +51,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.0.5...HEAD
+[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.0.6...HEAD
+
+[0.0.6]: https://github.com/catenax-ng/product-edc/compare/0.0.5...0.0.6
 
 [0.0.5]: https://github.com/catenax-ng/product-edc/compare/0.0.4...0.0.5
 

diff --git a/deployment/helm/edc-controlplane/Chart.yaml b/deployment/helm/edc-controlplane/Chart.yaml
@@ -5,6 +5,6 @@ description: >-
   EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-controlplane
 type: application
-appVersion: "0.0.5"
-version: 0.0.5
+appVersion: "0.0.6"
+version: 0.0.6
 maintainers: []
diff --git a/deployment/helm/edc-controlplane/README.md b/deployment/helm/edc-controlplane/README.md
@@ -1,6 +1,6 @@
 # edc-controlplane
 
-![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.5](https://img.shields.io/badge/AppVersion-0.0.5-informational?style=flat-square)
+![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.6](https://img.shields.io/badge/AppVersion-0.0.6-informational?style=flat-square)
 
 EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 
@@ -9,7 +9,7 @@ EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with res
 ## TL;DR
 ```shell
 $ helm repo add catenax-ng-product-edc https://catenax-ng.github.io/product-edc
-$ helm install my-release catenax-ng-product-edc/edc-controlplane --version 0.0.5
+$ helm install my-release catenax-ng-product-edc/edc-controlplane --version 0.0.6
 ```
 
 ## Values

diff --git a/deployment/helm/edc-dataplane/Chart.yaml b/deployment/helm/edc-dataplane/Chart.yaml
@@ -5,6 +5,6 @@ description: >-
   EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-dataplane
 type: application
-appVersion: "0.0.5"
-version: 0.0.5
+appVersion: "0.0.6"
+version: 0.0.6
 maintainers: []
diff --git a/deployment/helm/edc-dataplane/README.md b/deployment/helm/edc-dataplane/README.md
@@ -1,6 +1,6 @@
 # edc-dataplane
 
-![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.5](https://img.shields.io/badge/AppVersion-0.0.5-informational?style=flat-square)
+![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.6](https://img.shields.io/badge/AppVersion-0.0.6-informational?style=flat-square)
 
 EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 
@@ -9,7 +9,7 @@ EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility o
 ## TL;DR
 ```shell
 $ helm repo add catenax-ng-product-edc https://catenax-ng.github.io/product-edc
-$ helm install my-release catenax-ng-product-edc/edc-dataplane --version 0.0.5
+$ helm install my-release catenax-ng-product-edc/edc-dataplane --version 0.0.6
 ```
 
 ## Values

diff --git a/edc-controlplane/edc-controlplane-base/pom.xml b/edc-controlplane/edc-controlplane-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>edc-controlplane</artifactId>
         <groupId>net.catenax.edc</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-controlplane/edc-controlplane-memory/pom.xml b/edc-controlplane/edc-controlplane-memory/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>edc-controlplane</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/pom.xml b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>edc-controlplane</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-controlplane/edc-controlplane-postgresql/pom.xml b/edc-controlplane/edc-controlplane-postgresql/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>edc-controlplane</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-controlplane/pom.xml b/edc-controlplane/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>product-edc-parent</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-dataplane/edc-dataplane-azure-vault/pom.xml b/edc-dataplane/edc-dataplane-azure-vault/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>edc-dataplane</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-dataplane/edc-dataplane-base/pom.xml b/edc-dataplane/edc-dataplane-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>edc-dataplane</artifactId>
         <groupId>net.catenax.edc</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/pom.xml b/edc-dataplane/edc-dataplane-hashicorp-vault/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>edc-dataplane</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-dataplane/pom.xml b/edc-dataplane/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>product-edc-parent</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
 
     <artifactId>edc-dataplane</artifactId>

diff --git a/edc-extensions/business-partner-validation/pom.xml b/edc-extensions/business-partner-validation/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc.extensions</groupId>
         <artifactId>edc-extensions</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-extensions/hashicorp-vault/pom.xml b/edc-extensions/hashicorp-vault/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc.extensions</groupId>
         <artifactId>edc-extensions</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -185,12 +185,6 @@
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.jodah</groupId>
-            <artifactId>failsafe</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <profiles>

diff --git a/edc-extensions/pom.xml b/edc-extensions/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>product-edc-parent</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-extensions/postgresql-migration/pom.xml b/edc-extensions/postgresql-migration/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>edc-extensions</artifactId>
         <groupId>net.catenax.edc.extensions</groupId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/edc-tests/pom.xml b/edc-tests/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>net.catenax.edc</groupId>
         <artifactId>product-edc-parent</artifactId>
-        <version>0.0.5</version>
+        <version>0.0.6</version>
     </parent>
 
     <groupId>net.catenax.edc.tests</groupId>

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <groupId>net.catenax.edc</groupId>
     <artifactId>product-edc-parent</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <packaging>pom</packaging>
 
     <name>product-edc</name>
@@ -47,7 +47,7 @@
         <!-- plugins -->
         <org.apache.maven.plugins.maven.dependency.plugin.version>3.3.0</org.apache.maven.plugins.maven.dependency.plugin.version>
         <org.apache.maven.plugins.maven.jar.plugin.version>3.2.2</org.apache.maven.plugins.maven.jar.plugin.version>
-        <com.diffplug.spotless.maven.plugin.version>2.23.0</com.diffplug.spotless.maven.plugin.version>
+        <com.diffplug.spotless.maven.plugin.version>2.24.0</com.diffplug.spotless.maven.plugin.version>
         <org.codehaus.mojo.exec.maven.plugin.version>3.1.0</org.codehaus.mojo.exec.maven.plugin.version>
         <org.apache.maven.plugins.javadoc.version>3.4.0</org.apache.maven.plugins.javadoc.version>
         <org.codehaus.mojo.license.maven.plugin>2.0.0</org.codehaus.mojo.license.maven.plugin>
@@ -66,12 +66,12 @@
         <org.eclipse.dataspaceconnector.version>0.0.1-SNAPSHOT</org.eclipse.dataspaceconnector.version>
         <com.azure.sdk.bom.version>1.2.2</com.azure.sdk.bom.version>
         <org.postgresql.version>42.4.0</org.postgresql.version>
-        <org.flywaydb.version>9.0.2</org.flywaydb.version>
+        <org.flywaydb.version>9.0.4</org.flywaydb.version>
 
         <!-- test dependency version -->
         <junit.jupiter.version>5.9.0</junit.jupiter.version>
         <junit.platform.version>1.8.2</junit.platform.version>
-        <cucumber.version>7.4.1</cucumber.version>
+        <cucumber.version>7.5.0</cucumber.version>
         <io.rest.assured.version>5.1.1</io.rest.assured.version>
         <org.junit.platform.surefire.provider.version>1.1.0</org.junit.platform.surefire.provider.version>
         <mockito.version>4.6.1</mockito.version>
@@ -82,7 +82,6 @@
         <org.slf4j.version>2.0.0-alpha1</org.slf4j.version>
         <ch.qos.logback.logback-core.version>1.2.11</ch.qos.logback.logback-core.version>
         <org.hamcrest.hamcrest.version>2.2</org.hamcrest.hamcrest.version>
-        <net.jodah.failsafe.version>2.4.3</net.jodah.failsafe.version>
 
         <!-- TODO: parametrize so that forks can utilize sonar also -->
         <sonar.organization>catenax-ng</sonar.organization>
@@ -1084,13 +1083,6 @@
                 <version>${org.hamcrest.hamcrest.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>net.jodah</groupId>
-                <artifactId>failsafe</artifactId>
-                <version>${net.jodah.failsafe.version}</version>
-                <scope>test</scope>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>