diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml index 0932f6b6a..ffc2a7729 100644 --- a/.github/workflows/business-tests.yaml +++ b/.github/workflows/business-tests.yaml @@ -218,7 +218,7 @@ jobs: { "args": [ "-c", - "cd /product-edc && ./mvnw -s settings.xml -B -Pbusiness-tests -pl edc-tests test -Dtest=net.catenax.edc.tests.features.RunCucumberTest" + "cd /product-edc && ./mvnw -s settings.xml -B -Pbusiness-tests -pl edc-tests test -Dtest=org.eclipse.tractusx.edc.tests.features.RunCucumberTest" ], "command": [ "/bin/sh" diff --git a/CHANGELOG.md b/CHANGELOG.md index fc4e18f99..407dab584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Moved helm charts from `deployment/helm` to `charts` +- Update package structure/namespace from `net.catenax` to `org.eclipse.tractusx` ## [0.1.1] - 2022-09-04 diff --git a/DEPENDENCIES b/DEPENDENCIES index 67be50f14..c4991cc11 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -48,15 +48,15 @@ maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.18, Apache-2.0 maven/mavencentral/io.projectreactor/reactor-core/3.4.17, Apache-2.0, approved, clearlydefined maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302 -maven/mavencentral/net.catenax.edc.extensions/business-partner-validation/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc.extensions/cx-oauth2/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc.extensions/data-encryption/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc.extensions/dataplane-selector-configuration/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc.extensions/hashicorp-vault/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc.extensions/postgresql-migration/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc/edc-controlplane-base/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc/edc-controlplane-postgresql/0.1.1-SNAPSHOT, , restricted, clearlydefined -maven/mavencentral/net.catenax.edc/edc-dataplane-base/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc.extensions/business-partner-validation/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc.extensions/cx-oauth2/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc.extensions/data-encryption/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc.extensions/dataplane-selector-configuration/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc.extensions/hashicorp-vault/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc.extensions/postgresql-migration/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc/edc-controlplane-base/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc/edc-controlplane-postgresql/0.1.1-SNAPSHOT, , restricted, clearlydefined +maven/mavencentral/org.eclipse.tractusx.edc/edc-dataplane-base/0.1.1-SNAPSHOT, , restricted, clearlydefined maven/mavencentral/net.java.dev.jna/jna-platform/5.6.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ22390 maven/mavencentral/net.java.dev.jna/jna/5.5.0, Apache-2.0 or LGPL-2.1, approved, #1508 maven/mavencentral/net.minidev/accessors-smart/2.4.8, Apache-2.0, approved, clearlydefined diff --git a/edc-controlplane/edc-controlplane-base/pom.xml b/edc-controlplane/edc-controlplane-base/pom.xml index 0d4fe04f2..101a457e8 100644 --- a/edc-controlplane/edc-controlplane-base/pom.xml +++ b/edc-controlplane/edc-controlplane-base/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> edc-controlplane - net.catenax.edc + org.eclipse.tractusx.edc 0.1.1-SNAPSHOT 4.0.0 @@ -52,19 +52,19 @@ - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions business-partner-validation - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions dataplane-selector-configuration - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions data-encryption - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions cx-oauth2 diff --git a/edc-controlplane/edc-controlplane-memory/pom.xml b/edc-controlplane/edc-controlplane-memory/pom.xml index d9f574bdd..0b65591dd 100644 --- a/edc-controlplane/edc-controlplane-memory/pom.xml +++ b/edc-controlplane/edc-controlplane-memory/pom.xml @@ -14,7 +14,7 @@ --> - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane 0.1.1-SNAPSHOT @@ -84,7 +84,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-base diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/pom.xml b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/pom.xml index fdb086f50..5b74dc303 100644 --- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/pom.xml +++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/pom.xml @@ -15,7 +15,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane 0.1.1-SNAPSHOT @@ -84,7 +84,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-postgresql @@ -96,7 +96,7 @@ - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions hashicorp-vault diff --git a/edc-controlplane/edc-controlplane-postgresql/pom.xml b/edc-controlplane/edc-controlplane-postgresql/pom.xml index 7f24329a0..e3223759f 100644 --- a/edc-controlplane/edc-controlplane-postgresql/pom.xml +++ b/edc-controlplane/edc-controlplane-postgresql/pom.xml @@ -15,7 +15,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane 0.1.1-SNAPSHOT @@ -85,13 +85,13 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-base - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions postgresql-migration diff --git a/edc-controlplane/pom.xml b/edc-controlplane/pom.xml index 02be5b5ff..7dda3c7a1 100644 --- a/edc-controlplane/pom.xml +++ b/edc-controlplane/pom.xml @@ -15,7 +15,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc product-edc-parent 0.1.1-SNAPSHOT diff --git a/edc-dataplane/edc-dataplane-azure-vault/pom.xml b/edc-dataplane/edc-dataplane-azure-vault/pom.xml index 03cf81d13..458d894e9 100644 --- a/edc-dataplane/edc-dataplane-azure-vault/pom.xml +++ b/edc-dataplane/edc-dataplane-azure-vault/pom.xml @@ -15,7 +15,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane 0.1.1-SNAPSHOT @@ -83,7 +83,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-base diff --git a/edc-dataplane/edc-dataplane-base/pom.xml b/edc-dataplane/edc-dataplane-base/pom.xml index 1d945c123..5850197bd 100644 --- a/edc-dataplane/edc-dataplane-base/pom.xml +++ b/edc-dataplane/edc-dataplane-base/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> edc-dataplane - net.catenax.edc + org.eclipse.tractusx.edc 0.1.1-SNAPSHOT 4.0.0 diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/pom.xml b/edc-dataplane/edc-dataplane-hashicorp-vault/pom.xml index f2544fe5e..24dd9aa3f 100644 --- a/edc-dataplane/edc-dataplane-hashicorp-vault/pom.xml +++ b/edc-dataplane/edc-dataplane-hashicorp-vault/pom.xml @@ -15,7 +15,7 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane 0.1.1-SNAPSHOT @@ -83,13 +83,13 @@ - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-base - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions hashicorp-vault diff --git a/edc-dataplane/pom.xml b/edc-dataplane/pom.xml index 56f293316..bd3db2a77 100644 --- a/edc-dataplane/pom.xml +++ b/edc-dataplane/pom.xml @@ -16,7 +16,7 @@ 4.0.0 - net.catenax.edc + org.eclipse.tractusx.edc product-edc-parent 0.1.1-SNAPSHOT diff --git a/edc-extensions/business-partner-validation/pom.xml b/edc-extensions/business-partner-validation/pom.xml index cf518834e..cd2fe48a5 100644 --- a/edc-extensions/business-partner-validation/pom.xml +++ b/edc-extensions/business-partner-validation/pom.xml @@ -15,7 +15,7 @@ - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions edc-extensions 0.1.1-SNAPSHOT diff --git a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/BusinessPartnerValidationExtension.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java similarity index 88% rename from edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/BusinessPartnerValidationExtension.java rename to edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java index 88caf2121..3a6d3763c 100644 --- a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/BusinessPartnerValidationExtension.java +++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java @@ -12,13 +12,10 @@ * */ -package net.catenax.edc.validation.businesspartner; +package org.eclipse.tractusx.edc.validation.businesspartner; import static org.eclipse.dataspaceconnector.spi.policy.PolicyEngine.ALL_SCOPES; -import net.catenax.edc.validation.businesspartner.functions.BusinessPartnerDutyFunction; -import net.catenax.edc.validation.businesspartner.functions.BusinessPartnerPermissionFunction; -import net.catenax.edc.validation.businesspartner.functions.BusinessPartnerProhibitionFunction; import org.eclipse.dataspaceconnector.policy.model.Duty; import org.eclipse.dataspaceconnector.policy.model.Permission; import org.eclipse.dataspaceconnector.policy.model.Prohibition; @@ -28,6 +25,9 @@ import org.eclipse.dataspaceconnector.spi.system.Requires; import org.eclipse.dataspaceconnector.spi.system.ServiceExtension; import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext; +import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerDutyFunction; +import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerPermissionFunction; +import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerProhibitionFunction; @Requires({RuleBindingRegistry.class, PolicyEngine.class}) public class BusinessPartnerValidationExtension implements ServiceExtension { diff --git a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java similarity index 99% rename from edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java rename to edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java index 47466b2d6..b32ef0848 100644 --- a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java +++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java @@ -13,7 +13,7 @@ * */ -package net.catenax.edc.validation.businesspartner.functions; +package org.eclipse.tractusx.edc.validation.businesspartner.functions; import java.util.Map; import java.util.Objects; diff --git a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java similarity index 94% rename from edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java rename to edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java index dcf0c5050..da6714ef7 100644 --- a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java +++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.validation.businesspartner.functions; +package org.eclipse.tractusx.edc.validation.businesspartner.functions; import org.eclipse.dataspaceconnector.policy.model.Duty; import org.eclipse.dataspaceconnector.policy.model.Operator; diff --git a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java similarity index 94% rename from edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java rename to edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java index a12544248..cd96916fc 100644 --- a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java +++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.validation.businesspartner.functions; +package org.eclipse.tractusx.edc.validation.businesspartner.functions; import org.eclipse.dataspaceconnector.policy.model.Operator; import org.eclipse.dataspaceconnector.policy.model.Permission; diff --git a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java similarity index 94% rename from edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java rename to edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java index faeb4a358..516107581 100644 --- a/edc-extensions/business-partner-validation/src/main/java/net/catenax/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java +++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.validation.businesspartner.functions; +package org.eclipse.tractusx.edc.validation.businesspartner.functions; import org.eclipse.dataspaceconnector.policy.model.Operator; import org.eclipse.dataspaceconnector.policy.model.Prohibition; diff --git a/edc-extensions/business-partner-validation/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/edc-extensions/business-partner-validation/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension index 226b41ab3..76b215750 100644 --- a/edc-extensions/business-partner-validation/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension +++ b/edc-extensions/business-partner-validation/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension @@ -11,4 +11,4 @@ # Mercedes-Benz Tech Innovation GmbH - Initial ServiceExtension file # # -net.catenax.edc.validation.businesspartner.BusinessPartnerValidationExtension +org.eclipse.tractusx.edc.validation.businesspartner.BusinessPartnerValidationExtension diff --git a/edc-extensions/business-partner-validation/src/test/java/net/catenax/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java similarity index 98% rename from edc-extensions/business-partner-validation/src/test/java/net/catenax/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java rename to edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java index 79dd839d8..d0204fc47 100644 --- a/edc-extensions/business-partner-validation/src/test/java/net/catenax/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java +++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.validation.businesspartner; +package org.eclipse.tractusx.edc.validation.businesspartner; import org.eclipse.dataspaceconnector.policy.model.Duty; import org.eclipse.dataspaceconnector.policy.model.Permission; diff --git a/edc-extensions/business-partner-validation/src/test/java/net/catenax/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java similarity index 98% rename from edc-extensions/business-partner-validation/src/test/java/net/catenax/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java rename to edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java index ac8a68ebb..34108b0dc 100644 --- a/edc-extensions/business-partner-validation/src/test/java/net/catenax/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java +++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.validation.businesspartner.functions; +package org.eclipse.tractusx.edc.validation.businesspartner.functions; import java.util.Collections; import java.util.List; diff --git a/edc-extensions/cx-oauth2/pom.xml b/edc-extensions/cx-oauth2/pom.xml index 8ac7cf40e..3769f0dce 100644 --- a/edc-extensions/cx-oauth2/pom.xml +++ b/edc-extensions/cx-oauth2/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> edc-extensions - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions 0.1.1-SNAPSHOT 4.0.0 diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/OAuth2Extension.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/OAuth2Extension.java similarity index 98% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/OAuth2Extension.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/OAuth2Extension.java index abc008b95..6493093f5 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/OAuth2Extension.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/OAuth2Extension.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2; +package org.eclipse.tractusx.edc.oauth2; import java.net.URI; import lombok.NonNull; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/OAuth2IdentityService.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/OAuth2IdentityService.java similarity index 99% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/OAuth2IdentityService.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/OAuth2IdentityService.java index b1c4dac0f..8c4c94479 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/OAuth2IdentityService.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/OAuth2IdentityService.java @@ -16,7 +16,7 @@ * */ -package net.catenax.edc.oauth2; +package org.eclipse.tractusx.edc.oauth2; import java.net.URI; import java.util.LinkedHashMap; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JsonWebKey.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JsonWebKey.java similarity index 95% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JsonWebKey.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JsonWebKey.java index 70712fbd7..2b8fbc5d4 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JsonWebKey.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JsonWebKey.java @@ -12,7 +12,7 @@ * Mercedes-Benz Tech Innovation GmbH - refactoring */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JsonWebKeySet.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JsonWebKeySet.java similarity index 93% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JsonWebKeySet.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JsonWebKeySet.java index a4cc93716..db3b32887 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JsonWebKeySet.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JsonWebKeySet.java @@ -13,7 +13,7 @@ * */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JwkPublicKeyResolver.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JwkPublicKeyResolver.java similarity index 99% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JwkPublicKeyResolver.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JwkPublicKeyResolver.java index 80b31255e..e1362380d 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/JwkPublicKeyResolver.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/JwkPublicKeyResolver.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import java.net.URI; import java.security.PublicKey; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/PublicKeyHolder.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/PublicKeyHolder.java similarity index 93% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/PublicKeyHolder.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/PublicKeyHolder.java index 72edfb19f..f34b6a676 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/PublicKeyHolder.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/PublicKeyHolder.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import java.security.PublicKey; import lombok.Builder; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/PublicKeyReader.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/PublicKeyReader.java similarity index 92% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/PublicKeyReader.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/PublicKeyReader.java index de73e6e3b..30cdb14b3 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/PublicKeyReader.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/PublicKeyReader.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import java.util.Optional; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/RsaPublicKeyReader.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/RsaPublicKeyReader.java similarity index 98% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/RsaPublicKeyReader.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/RsaPublicKeyReader.java index c6098b70b..323e22f11 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwk/RsaPublicKeyReader.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwk/RsaPublicKeyReader.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import java.math.BigInteger; import java.security.GeneralSecurityException; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/DapsJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/DapsJwtDecorator.java similarity index 93% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/DapsJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/DapsJwtDecorator.java index 3469dd075..b983d8e6a 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/DapsJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/DapsJwtDecorator.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/ExpJwtDecorator.java similarity index 95% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/ExpJwtDecorator.java index 4c06d1aea..3c62fcd75 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/ExpJwtDecorator.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IatJwtDecorator.java similarity index 94% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IatJwtDecorator.java index c409ca74f..309daa6b5 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IatJwtDecorator.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java similarity index 93% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java index df9c71a22..6f832b828 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IssJwtDecorator.java similarity index 94% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IssJwtDecorator.java index 54daf908e..16990292a 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IssJwtDecorator.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JtiJwtDecorator.java similarity index 93% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JtiJwtDecorator.java index 6815a4ad5..13d13d84f 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JtiJwtDecorator.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JwtDecoratorExtension.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JwtDecoratorExtension.java similarity index 98% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JwtDecoratorExtension.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JwtDecoratorExtension.java index fdff18d80..eb5061422 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JwtDecoratorExtension.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JwtDecoratorExtension.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImpl.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImpl.java similarity index 95% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImpl.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImpl.java index b57d9737d..70ab48a43 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImpl.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImpl.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import java.util.ArrayList; import java.util.Collection; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/SubJwtDecorator.java similarity index 94% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/SubJwtDecorator.java index d0a9b459c..6b2756589 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/SubJwtDecorator.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/X5tJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/X5tJwtDecorator.java similarity index 96% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/X5tJwtDecorator.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/X5tJwtDecorator.java index 9d34c0307..798d49437 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/X5tJwtDecorator.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/X5tJwtDecorator.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jose.util.Base64URL; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/generator/JwtTokenGenerationService.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/generator/JwtTokenGenerationService.java similarity index 98% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/generator/JwtTokenGenerationService.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/generator/JwtTokenGenerationService.java index e26e461ef..4a2f4811c 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/generator/JwtTokenGenerationService.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/generator/JwtTokenGenerationService.java @@ -14,7 +14,7 @@ * */ -package net.catenax.edc.oauth2.jwt.generator; +package org.eclipse.tractusx.edc.oauth2.jwt.generator; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWSAlgorithm; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/generator/JwtTokenGenerationServiceExtension.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/generator/JwtTokenGenerationServiceExtension.java similarity index 97% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/generator/JwtTokenGenerationServiceExtension.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/generator/JwtTokenGenerationServiceExtension.java index eb869ec32..32a92a0a7 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/generator/JwtTokenGenerationServiceExtension.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/generator/JwtTokenGenerationServiceExtension.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.generator; +package org.eclipse.tractusx.edc.oauth2.jwt.generator; import java.security.PrivateKey; import lombok.NonNull; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/AudValidationRule.java similarity index 97% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/AudValidationRule.java index 3d05e7f75..83d17b3bb 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/AudValidationRule.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/ExpValidationRule.java similarity index 97% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/ExpValidationRule.java index 9f3c2793e..56e14159c 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/ExpValidationRule.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import static java.time.ZoneOffset.UTC; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/IatValidationRule.java similarity index 97% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/IatValidationRule.java index d4959e4e0..05f4a4980 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/IatValidationRule.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import static java.time.ZoneOffset.UTC; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IdsValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/IdsValidationRule.java similarity index 98% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IdsValidationRule.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/IdsValidationRule.java index 5d3220cbd..5f602e6c1 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IdsValidationRule.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/IdsValidationRule.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import com.nimbusds.jwt.SignedJWT; import java.text.ParseException; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/JwtValidationExtension.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/JwtValidationExtension.java similarity index 96% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/JwtValidationExtension.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/JwtValidationExtension.java index 310c979de..c30c7d04e 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/JwtValidationExtension.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/JwtValidationExtension.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import java.net.URI; import java.time.Clock; @@ -23,9 +23,6 @@ import java.util.stream.Stream; import lombok.NonNull; import lombok.Setter; -import net.catenax.edc.oauth2.jwk.JwkPublicKeyResolver; -import net.catenax.edc.oauth2.jwk.PublicKeyReader; -import net.catenax.edc.oauth2.jwk.RsaPublicKeyReader; import okhttp3.OkHttpClient; import org.eclipse.dataspaceconnector.iam.oauth2.spi.Oauth2ValidationRulesRegistry; import org.eclipse.dataspaceconnector.spi.EdcSetting; @@ -35,6 +32,9 @@ import org.eclipse.dataspaceconnector.spi.system.Requires; import org.eclipse.dataspaceconnector.spi.system.ServiceExtension; import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext; +import org.eclipse.tractusx.edc.oauth2.jwk.JwkPublicKeyResolver; +import org.eclipse.tractusx.edc.oauth2.jwk.PublicKeyReader; +import org.eclipse.tractusx.edc.oauth2.jwk.RsaPublicKeyReader; @Provides(TokenValidationService.class) @Requires({OkHttpClient.class, Clock.class}) diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/NbfValidationRule.java similarity index 97% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/NbfValidationRule.java index 8c4ab3429..edef7e694 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/NbfValidationRule.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import static java.time.ZoneOffset.UTC; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/Oauth2ValidationRulesRegistryImpl.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/Oauth2ValidationRulesRegistryImpl.java similarity index 95% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/Oauth2ValidationRulesRegistryImpl.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/Oauth2ValidationRulesRegistryImpl.java index b779a96cc..3d26e3c08 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/Oauth2ValidationRulesRegistryImpl.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/Oauth2ValidationRulesRegistryImpl.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import java.util.ArrayList; import java.util.List; diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/TokenValidationServiceImpl.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/TokenValidationServiceImpl.java similarity index 98% rename from edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/TokenValidationServiceImpl.java rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/TokenValidationServiceImpl.java index 0ca7d3eeb..aba062de7 100644 --- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/TokenValidationServiceImpl.java +++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/jwt/validation/TokenValidationServiceImpl.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.oauth2.jwt.validation; +package org.eclipse.tractusx.edc.oauth2.jwt.validation; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWSHeader; diff --git a/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension index 0303255e4..66c9b662c 100644 --- a/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension +++ b/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension @@ -11,7 +11,7 @@ # Mercedes-Benz Tech Innovation GmbH - Initial ServiceExtension file # # -net.catenax.edc.oauth2.jwt.decorator.JwtDecoratorExtension -net.catenax.edc.oauth2.jwt.validation.JwtValidationExtension -net.catenax.edc.oauth2.jwt.generator.JwtTokenGenerationServiceExtension -net.catenax.edc.oauth2.OAuth2Extension +org.eclipse.tractusx.edc.oauth2.jwt.decorator.JwtDecoratorExtension +org.eclipse.tractusx.edc.oauth2.jwt.validation.JwtValidationExtension +org.eclipse.tractusx.edc.oauth2.jwt.generator.JwtTokenGenerationServiceExtension +org.eclipse.tractusx.edc.oauth2.OAuth2Extension diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwk/JwkPublicKeyResolverTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwk/JwkPublicKeyResolverTest.java similarity index 99% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwk/JwkPublicKeyResolverTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwk/JwkPublicKeyResolverTest.java index 8d90b5000..c55c03ef9 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwk/JwkPublicKeyResolverTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwk/JwkPublicKeyResolverTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwk/RsaPublicKeyReaderTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwk/RsaPublicKeyReaderTest.java similarity index 98% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwk/RsaPublicKeyReaderTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwk/RsaPublicKeyReaderTest.java index b530ba980..6467d4f91 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwk/RsaPublicKeyReaderTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwk/RsaPublicKeyReaderTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.oauth2.jwk; +package org.eclipse.tractusx.edc.oauth2.jwk; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Optional; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/DapsJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/DapsJwtDecoratorTest.java similarity index 95% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/DapsJwtDecoratorTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/DapsJwtDecoratorTest.java index 52921d1f9..4d7f0669c 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/DapsJwtDecoratorTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/DapsJwtDecoratorTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial Test * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java similarity index 96% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java index a5e36561f..e4e33004c 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial Test * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java similarity index 96% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java index 9f37c4338..db86c05f3 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial Test * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java similarity index 95% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java index 8f5ac315b..abfc65c4c 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java similarity index 95% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java index e74d0ea85..369b7f398 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial Test * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java similarity index 94% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java index ccc6e3dc8..9cea28c5f 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial Test * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImplTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImplTest.java similarity index 98% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImplTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImplTest.java index fa81fb35d..7c495ab50 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImplTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/Oauth2JwtDecoratorRegistryRegistryImplTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial Test * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java similarity index 95% rename from edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java rename to edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java index d86ac0f02..55e1e672c 100644 --- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java +++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial Test * */ -package net.catenax.edc.oauth2.jwt.decorator; +package org.eclipse.tractusx.edc.oauth2.jwt.decorator; import com.nimbusds.jose.JWSHeader; import com.nimbusds.jwt.JWTClaimsSet; diff --git a/edc-extensions/data-encryption/pom.xml b/edc-extensions/data-encryption/pom.xml index 79450fe43..4163853de 100644 --- a/edc-extensions/data-encryption/pom.xml +++ b/edc-extensions/data-encryption/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> edc-extensions - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions 0.1.1-SNAPSHOT 4.0.0 diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/DataEncryptionExtension.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtension.java similarity index 91% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/DataEncryptionExtension.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtension.java index 5f9446dfa..1d40037e0 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/DataEncryptionExtension.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtension.java @@ -11,17 +11,11 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption; +package org.eclipse.tractusx.edc.data.encryption; import java.time.Duration; import java.util.List; import java.util.stream.Collectors; -import net.catenax.edc.data.encryption.encrypter.AesDataEncrypterConfiguration; -import net.catenax.edc.data.encryption.encrypter.DataEncrypterFactory; -import net.catenax.edc.data.encryption.key.AesKey; -import net.catenax.edc.data.encryption.key.CryptoKeyFactory; -import net.catenax.edc.data.encryption.key.CryptoKeyFactoryImpl; -import net.catenax.edc.data.encryption.provider.AesKeyProvider; import org.eclipse.dataspaceconnector.spi.EdcException; import org.eclipse.dataspaceconnector.spi.EdcSetting; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; @@ -31,6 +25,12 @@ import org.eclipse.dataspaceconnector.spi.system.ServiceExtension; import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext; import org.eclipse.dataspaceconnector.transfer.dataplane.spi.security.DataEncrypter; +import org.eclipse.tractusx.edc.data.encryption.encrypter.AesDataEncrypterConfiguration; +import org.eclipse.tractusx.edc.data.encryption.encrypter.DataEncrypterFactory; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactory; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactoryImpl; +import org.eclipse.tractusx.edc.data.encryption.provider.AesKeyProvider; @Provides({DataEncrypter.class}) @Requires({Vault.class}) diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/CryptoAlgorithm.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/CryptoAlgorithm.java similarity index 82% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/CryptoAlgorithm.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/CryptoAlgorithm.java index 0bc71c673..866c0bd1d 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/CryptoAlgorithm.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/CryptoAlgorithm.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.algorithms; +package org.eclipse.tractusx.edc.data.encryption.algorithms; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -19,9 +19,9 @@ import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; -import net.catenax.edc.data.encryption.data.DecryptedData; -import net.catenax.edc.data.encryption.data.EncryptedData; -import net.catenax.edc.data.encryption.key.CryptoKey; +import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData; +import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey; public interface CryptoAlgorithm { EncryptedData encrypt(DecryptedData data, T key) diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/AesAlgorithm.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java similarity index 88% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/AesAlgorithm.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java index 8aaddfb85..ee772830b 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/AesAlgorithm.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.algorithms.aes; +package org.eclipse.tractusx.edc.data.encryption.algorithms.aes; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -23,13 +23,13 @@ import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.SecretKeySpec; import lombok.NonNull; -import net.catenax.edc.data.encryption.algorithms.CryptoAlgorithm; -import net.catenax.edc.data.encryption.data.CryptoDataFactory; -import net.catenax.edc.data.encryption.data.DecryptedData; -import net.catenax.edc.data.encryption.data.EncryptedData; -import net.catenax.edc.data.encryption.key.AesKey; -import net.catenax.edc.data.encryption.util.ArrayUtil; import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory; +import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData; +import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; +import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil; public class AesAlgorithm implements CryptoAlgorithm { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java similarity index 92% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java index 03a5cf789..12d52e3d4 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java @@ -11,13 +11,13 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.algorithms.aes; +package org.eclipse.tractusx.edc.data.encryption.algorithms.aes; import java.security.SecureRandom; import java.util.Iterator; import java.util.NoSuchElementException; import lombok.SneakyThrows; -import net.catenax.edc.data.encryption.util.ArrayUtil; +import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil; public class AesInitializationVectorIterator implements Iterator { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/ByteCounter.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java similarity index 96% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/ByteCounter.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java index 4208d4ec6..eeb428184 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/algorithms/aes/ByteCounter.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.algorithms.aes; +package org.eclipse.tractusx.edc.data.encryption.algorithms.aes; /** Big Endian Byte Counter */ public class ByteCounter { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoData.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoData.java similarity index 89% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoData.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoData.java index 697a22ede..852b8795e 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoData.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoData.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.data; +package org.eclipse.tractusx.edc.data.encryption.data; public interface CryptoData { byte[] getBytes(); diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoDataFactory.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactory.java similarity index 93% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoDataFactory.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactory.java index c6abab6e6..277758afa 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoDataFactory.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactory.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.data; +package org.eclipse.tractusx.edc.data.encryption.data; public interface CryptoDataFactory { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoDataFactoryImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java similarity index 97% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoDataFactoryImpl.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java index 07a1e39fe..28964b259 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/CryptoDataFactoryImpl.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.data; +package org.eclipse.tractusx.edc.data.encryption.data; import lombok.Value; import org.bouncycastle.util.encoders.Base64; diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/DecryptedData.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/DecryptedData.java similarity index 89% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/DecryptedData.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/DecryptedData.java index 903823757..20a22c1a0 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/DecryptedData.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/DecryptedData.java @@ -11,6 +11,6 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.data; +package org.eclipse.tractusx.edc.data.encryption.data; public interface DecryptedData extends CryptoData {} diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/EncryptedData.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/EncryptedData.java similarity index 89% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/EncryptedData.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/EncryptedData.java index 033f0ceeb..f468ccfb6 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/data/EncryptedData.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/EncryptedData.java @@ -11,6 +11,6 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.data; +package org.eclipse.tractusx.edc.data.encryption.data; public interface EncryptedData extends CryptoData {} diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java similarity index 91% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java index 3357f7eff..b9a131f1a 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.data.encryption.encrypter; +package org.eclipse.tractusx.edc.data.encryption.encrypter; import java.time.Duration; import lombok.NonNull; diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/AesDataEncrypterImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java similarity index 86% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/AesDataEncrypterImpl.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java index e3ac3e82b..c33c93b7b 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/AesDataEncrypterImpl.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.data.encryption.encrypter; +package org.eclipse.tractusx.edc.data.encryption.encrypter; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -23,16 +23,16 @@ import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import lombok.RequiredArgsConstructor; -import net.catenax.edc.data.encryption.DataEncryptionExtension; -import net.catenax.edc.data.encryption.algorithms.CryptoAlgorithm; -import net.catenax.edc.data.encryption.data.CryptoDataFactory; -import net.catenax.edc.data.encryption.data.DecryptedData; -import net.catenax.edc.data.encryption.data.EncryptedData; -import net.catenax.edc.data.encryption.key.AesKey; -import net.catenax.edc.data.encryption.provider.KeyProvider; import org.eclipse.dataspaceconnector.spi.EdcException; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; import org.eclipse.dataspaceconnector.transfer.dataplane.spi.security.DataEncrypter; +import org.eclipse.tractusx.edc.data.encryption.DataEncryptionExtension; +import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory; +import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData; +import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; +import org.eclipse.tractusx.edc.data.encryption.provider.KeyProvider; @RequiredArgsConstructor public class AesDataEncrypterImpl implements DataEncrypter { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterFactory.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java similarity index 71% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterFactory.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java index 382c8086a..98ec07f77 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterFactory.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java @@ -12,21 +12,21 @@ * */ -package net.catenax.edc.data.encryption.encrypter; +package org.eclipse.tractusx.edc.data.encryption.encrypter; import lombok.RequiredArgsConstructor; -import net.catenax.edc.data.encryption.algorithms.CryptoAlgorithm; -import net.catenax.edc.data.encryption.algorithms.aes.AesAlgorithm; -import net.catenax.edc.data.encryption.data.CryptoDataFactory; -import net.catenax.edc.data.encryption.data.CryptoDataFactoryImpl; -import net.catenax.edc.data.encryption.key.AesKey; -import net.catenax.edc.data.encryption.key.CryptoKeyFactory; -import net.catenax.edc.data.encryption.provider.AesKeyProvider; -import net.catenax.edc.data.encryption.provider.CachingKeyProvider; -import net.catenax.edc.data.encryption.provider.KeyProvider; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; import org.eclipse.dataspaceconnector.spi.security.Vault; import org.eclipse.dataspaceconnector.transfer.dataplane.spi.security.DataEncrypter; +import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm; +import org.eclipse.tractusx.edc.data.encryption.algorithms.aes.AesAlgorithm; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactoryImpl; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactory; +import org.eclipse.tractusx.edc.data.encryption.provider.AesKeyProvider; +import org.eclipse.tractusx.edc.data.encryption.provider.CachingKeyProvider; +import org.eclipse.tractusx.edc.data.encryption.provider.KeyProvider; @RequiredArgsConstructor public class DataEncrypterFactory { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/AesKey.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/AesKey.java similarity index 90% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/AesKey.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/AesKey.java index 136f0e360..e6bd711fc 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/AesKey.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/AesKey.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.key; +package org.eclipse.tractusx.edc.data.encryption.key; public interface AesKey extends CryptoKey { byte[] getBytes(); diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKey.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKey.java similarity index 88% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKey.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKey.java index cf3ca2da5..e3435773d 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKey.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKey.java @@ -11,6 +11,6 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.key; +package org.eclipse.tractusx.edc.data.encryption.key; public interface CryptoKey {} diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKeyFactory.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactory.java similarity index 90% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKeyFactory.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactory.java index b3eadcd50..6297e0b69 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKeyFactory.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactory.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.key; +package org.eclipse.tractusx.edc.data.encryption.key; public interface CryptoKeyFactory { AesKey fromBase64(String base64); diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKeyFactoryImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java similarity index 95% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKeyFactoryImpl.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java index 398088a95..bb41d7c97 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/key/CryptoKeyFactoryImpl.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.key; +package org.eclipse.tractusx.edc.data.encryption.key; import lombok.Value; import org.bouncycastle.util.encoders.Base64; diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/AesKeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java similarity index 86% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/AesKeyProvider.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java index be9802013..a273ed860 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/AesKeyProvider.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java @@ -11,17 +11,17 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.provider; +package org.eclipse.tractusx.edc.data.encryption.provider; import java.util.Arrays; import java.util.function.Predicate; import java.util.stream.Stream; import lombok.RequiredArgsConstructor; -import net.catenax.edc.data.encryption.DataEncryptionExtension; -import net.catenax.edc.data.encryption.key.AesKey; -import net.catenax.edc.data.encryption.key.CryptoKeyFactory; import org.bouncycastle.util.encoders.Base64; import org.eclipse.dataspaceconnector.spi.security.Vault; +import org.eclipse.tractusx.edc.data.encryption.DataEncryptionExtension; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactory; @RequiredArgsConstructor public class AesKeyProvider implements KeyProvider { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/CachingKeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java similarity index 94% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/CachingKeyProvider.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java index e33a39551..ab3c36fab 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/CachingKeyProvider.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.data.encryption.provider; +package org.eclipse.tractusx.edc.data.encryption.provider; import java.time.Clock; import java.time.Duration; @@ -22,7 +22,7 @@ import java.util.stream.Stream; import lombok.NonNull; import lombok.Value; -import net.catenax.edc.data.encryption.key.CryptoKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey; public class CachingKeyProvider implements KeyProvider { diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/KeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/KeyProvider.java similarity index 81% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/KeyProvider.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/KeyProvider.java index 8e9c8006c..b888b7c49 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/provider/KeyProvider.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/KeyProvider.java @@ -11,10 +11,10 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.provider; +package org.eclipse.tractusx.edc.data.encryption.provider; import java.util.stream.Stream; -import net.catenax.edc.data.encryption.key.CryptoKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey; public interface KeyProvider { T getEncryptionKey(); diff --git a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/util/ArrayUtil.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtil.java similarity index 95% rename from edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/util/ArrayUtil.java rename to edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtil.java index f632c8121..d72b85198 100644 --- a/edc-extensions/data-encryption/src/main/java/net/catenax/edc/data/encryption/util/ArrayUtil.java +++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtil.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.util; +package org.eclipse.tractusx.edc.data.encryption.util; public class ArrayUtil { diff --git a/edc-extensions/data-encryption/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/edc-extensions/data-encryption/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension index 8a09148c9..7f1be01e3 100644 --- a/edc-extensions/data-encryption/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension +++ b/edc-extensions/data-encryption/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension @@ -11,4 +11,4 @@ # Mercedes-Benz Tech Innovation GmbH - Initial ServiceExtension file # # -net.catenax.edc.data.encryption.DataEncryptionExtension +org.eclipse.tractusx.edc.data.encryption.DataEncryptionExtension diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/DataEncryptionExtensionTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtensionTest.java similarity index 96% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/DataEncryptionExtensionTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtensionTest.java index 49fd8dd67..7c3a81033 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/DataEncryptionExtensionTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtensionTest.java @@ -12,13 +12,13 @@ * */ -package net.catenax.edc.data.encryption; +package org.eclipse.tractusx.edc.data.encryption; -import net.catenax.edc.data.encryption.encrypter.DataEncrypterFactory; import org.eclipse.dataspaceconnector.spi.EdcException; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; import org.eclipse.dataspaceconnector.spi.security.Vault; import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext; +import org.eclipse.tractusx.edc.data.encryption.encrypter.DataEncrypterFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java similarity index 85% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java index d66459fee..ad853e54f 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java @@ -11,15 +11,15 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.algorithms.aes; +package org.eclipse.tractusx.edc.data.encryption.algorithms.aes; import lombok.SneakyThrows; -import net.catenax.edc.data.encryption.data.CryptoDataFactory; -import net.catenax.edc.data.encryption.data.CryptoDataFactoryImpl; -import net.catenax.edc.data.encryption.data.DecryptedData; -import net.catenax.edc.data.encryption.data.EncryptedData; -import net.catenax.edc.data.encryption.key.AesKey; import org.bouncycastle.util.encoders.Base64; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactoryImpl; +import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData; +import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java similarity index 94% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java index 5a79a42b5..a1712dc8e 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java @@ -11,13 +11,13 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.algorithms.aes; +package org.eclipse.tractusx.edc.data.encryption.algorithms.aes; import java.util.ArrayList; import java.util.List; import java.util.NoSuchElementException; import lombok.SneakyThrows; -import net.catenax.edc.data.encryption.util.ArrayUtil; +import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/ByteCounterTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounterTest.java similarity index 96% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/ByteCounterTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounterTest.java index 9beb2e190..a7897f172 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/algorithms/aes/ByteCounterTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounterTest.java @@ -11,10 +11,10 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.algorithms.aes; +package org.eclipse.tractusx.edc.data.encryption.algorithms.aes; import java.util.stream.Stream; -import net.catenax.edc.data.encryption.util.ArrayUtil; +import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java similarity index 77% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java index 717459e4a..ddbb8af9d 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java @@ -11,23 +11,23 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.encrypter; +package org.eclipse.tractusx.edc.data.encryption.encrypter; import lombok.SneakyThrows; -import net.catenax.edc.data.encryption.algorithms.CryptoAlgorithm; -import net.catenax.edc.data.encryption.algorithms.aes.AesAlgorithm; -import net.catenax.edc.data.encryption.data.CryptoDataFactory; -import net.catenax.edc.data.encryption.data.CryptoDataFactoryImpl; -import net.catenax.edc.data.encryption.data.DecryptedData; -import net.catenax.edc.data.encryption.data.EncryptedData; -import net.catenax.edc.data.encryption.key.AesKey; -import net.catenax.edc.data.encryption.key.CryptoKeyFactory; -import net.catenax.edc.data.encryption.key.CryptoKeyFactoryImpl; -import net.catenax.edc.data.encryption.provider.AesKeyProvider; -import net.catenax.edc.data.encryption.provider.KeyProvider; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; import org.eclipse.dataspaceconnector.spi.security.Vault; import org.eclipse.dataspaceconnector.transfer.dataplane.spi.security.DataEncrypter; +import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm; +import org.eclipse.tractusx.edc.data.encryption.algorithms.aes.AesAlgorithm; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory; +import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactoryImpl; +import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData; +import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactory; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactoryImpl; +import org.eclipse.tractusx.edc.data.encryption.provider.AesKeyProvider; +import org.eclipse.tractusx.edc.data.encryption.provider.KeyProvider; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java similarity index 95% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java index 957983503..55f05ca73 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java @@ -11,13 +11,13 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.encrypter; +package org.eclipse.tractusx.edc.data.encryption.encrypter; import java.time.Duration; -import net.catenax.edc.data.encryption.key.CryptoKeyFactoryImpl; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; import org.eclipse.dataspaceconnector.spi.security.Vault; import org.eclipse.dataspaceconnector.transfer.dataplane.spi.security.DataEncrypter; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactoryImpl; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/key/CryptoKeyFactoryImplTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImplTest.java similarity index 95% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/key/CryptoKeyFactoryImplTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImplTest.java index 00ec3e8e0..3d4a0fdad 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/key/CryptoKeyFactoryImplTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImplTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.key; +package org.eclipse.tractusx.edc.data.encryption.key; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/provider/AesKeyProviderTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProviderTest.java similarity index 91% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/provider/AesKeyProviderTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProviderTest.java index f106ba9c4..84789e752 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/provider/AesKeyProviderTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProviderTest.java @@ -12,13 +12,13 @@ * */ -package net.catenax.edc.data.encryption.provider; +package org.eclipse.tractusx.edc.data.encryption.provider; import java.util.List; import java.util.stream.Collectors; -import net.catenax.edc.data.encryption.key.AesKey; -import net.catenax.edc.data.encryption.key.CryptoKeyFactoryImpl; import org.eclipse.dataspaceconnector.spi.security.Vault; +import org.eclipse.tractusx.edc.data.encryption.key.AesKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactoryImpl; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/provider/CachingKeyProviderTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProviderTest.java similarity index 95% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/provider/CachingKeyProviderTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProviderTest.java index ea8fc4ffc..a5459d0bb 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/provider/CachingKeyProviderTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProviderTest.java @@ -11,13 +11,13 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.provider; +package org.eclipse.tractusx.edc.data.encryption.provider; import java.time.Clock; import java.time.Duration; import java.time.Instant; import java.util.stream.Stream; -import net.catenax.edc.data.encryption.key.CryptoKey; +import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/util/ArrayUtilTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtilTest.java similarity index 97% rename from edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/util/ArrayUtilTest.java rename to edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtilTest.java index 611585c86..cd7684a73 100644 --- a/edc-extensions/data-encryption/src/test/java/net/catenax/edc/data/encryption/util/ArrayUtilTest.java +++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtilTest.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.data.encryption.util; +package org.eclipse.tractusx.edc.data.encryption.util; import java.util.stream.Stream; import org.junit.jupiter.api.Assertions; diff --git a/edc-extensions/dataplane-selector-configuration/pom.xml b/edc-extensions/dataplane-selector-configuration/pom.xml index d35d99172..3b6b0f488 100644 --- a/edc-extensions/dataplane-selector-configuration/pom.xml +++ b/edc-extensions/dataplane-selector-configuration/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> edc-extensions - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions 0.1.1-SNAPSHOT 4.0.0 diff --git a/edc-extensions/dataplane-selector-configuration/src/main/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java b/edc-extensions/dataplane-selector-configuration/src/main/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java similarity index 91% rename from edc-extensions/dataplane-selector-configuration/src/main/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java rename to edc-extensions/dataplane-selector-configuration/src/main/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java index cd9a04271..a382dfcb9 100644 --- a/edc-extensions/dataplane-selector-configuration/src/main/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java +++ b/edc-extensions/dataplane-selector-configuration/src/main/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.dataplane.selector.configuration; +package org.eclipse.tractusx.edc.dataplane.selector.configuration; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -53,25 +53,32 @@ * edc.dataplane.selector..url * URL to connect to the Data Plane Instance. * X - * http://localhost:8181/control/transfer + * http://localhost:8181/control/transfer * * - * edc.dataplane.selector..sourcetypes + * edc.dataplane.selector..sourcetypes * Source Types in a comma separated List. * X * HttpData * * - * edc.dataplane.selector..destinationtypes + * edc.dataplane.selector..destinationtypes * Destination Types in a comma separated List. * X * HttpProxy * * - * edc.dataplane.selector..properties - * Additional properties of the Data Plane Instance. + * edc.dataplane.selector..properties + * Additional properties of the Data Plane + * Instance. * (X) - * { "publicApiUrl:": "http://localhost:8181/api/public" } + * { "publicApiUrl:": "http://localhost:8181/api/public" + * } * * * diff --git a/edc-extensions/dataplane-selector-configuration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/edc-extensions/dataplane-selector-configuration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension index f23f403dd..6dfab8980 100644 --- a/edc-extensions/dataplane-selector-configuration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension +++ b/edc-extensions/dataplane-selector-configuration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension @@ -12,4 +12,4 @@ # # -net.catenax.edc.dataplane.selector.configuration.DataPlaneSelectorConfigurationServiceExtension +org.eclipse.tractusx.edc.dataplane.selector.configuration.DataPlaneSelectorConfigurationServiceExtension diff --git a/edc-extensions/dataplane-selector-configuration/src/test/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java similarity index 98% rename from edc-extensions/dataplane-selector-configuration/src/test/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java rename to edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java index 8d162e0d3..79e3f43e6 100644 --- a/edc-extensions/dataplane-selector-configuration/src/test/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java +++ b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.dataplane.selector.configuration; +package org.eclipse.tractusx.edc.dataplane.selector.configuration; import java.util.HashMap; import java.util.Map; diff --git a/edc-extensions/dataplane-selector-configuration/src/test/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java similarity index 99% rename from edc-extensions/dataplane-selector-configuration/src/test/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java rename to edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java index 58a744fc5..f19d7c8e9 100644 --- a/edc-extensions/dataplane-selector-configuration/src/test/java/net/catenax/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java +++ b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.dataplane.selector.configuration; +package org.eclipse.tractusx.edc.dataplane.selector.configuration; import java.util.HashMap; import java.util.Map; diff --git a/edc-extensions/hashicorp-vault/pom.xml b/edc-extensions/hashicorp-vault/pom.xml index 10cf26eff..cb1a52711 100644 --- a/edc-extensions/hashicorp-vault/pom.xml +++ b/edc-extensions/hashicorp-vault/pom.xml @@ -15,7 +15,7 @@ - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions edc-extensions 0.1.1-SNAPSHOT diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/AbstractHashicorpVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java similarity index 98% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/AbstractHashicorpVaultExtension.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java index 4512e8512..6a8b8fd4a 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/AbstractHashicorpVaultExtension.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.time.Duration; import okhttp3.OkHttpClient; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolver.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java similarity index 97% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolver.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java index f067aec92..1bc067df9 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolver.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVault.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java similarity index 97% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVault.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java index 6fe484081..d49b9bae5 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVault.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultClient.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java similarity index 98% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultClient.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java index 754ac5928..5509a9b29 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultClient.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java @@ -13,7 +13,7 @@ * Mercedes-Benz Tech Innovation GmbH - Add vault health check */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; @@ -95,7 +95,8 @@ public HashicorpVaultHealthResponse getHealth() throws IOException { objectMapper.readValue(responseBody, HashicorpVaultHealthResponsePayload.class); healthResponseBuilder.payload(responsePayload); } catch (JsonMappingException e) { - // ignore. status code not checked, so it may be possible that no payload was provided + // ignore. status code not checked, so it may be possible that no payload was + // provided } } @@ -170,7 +171,8 @@ private HttpUrl getHealthUrl() { final String vaultHealthPath = config.getVaultApiHealthPath(); final boolean isVaultHealthStandbyOk = config.isVaultApiHealthStandbyOk(); - // by setting 'standbyok' and/or 'perfstandbyok' the vault will return an active status + // by setting 'standbyok' and/or 'perfstandbyok' the vault will return an active + // status // code instead of the standby status codes return Objects.requireNonNull(HttpUrl.parse(config.getVaultUrl())) diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultClientConfig.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java similarity index 94% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultClientConfig.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java index a9f0ee2a0..5004e165d 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultClientConfig.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.time.Duration; import lombok.Builder; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java similarity index 95% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java index 4882c5477..c15d2af46 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java similarity index 94% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java index 0818c77a7..73663431e 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultEntryMetadata.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java similarity index 95% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultEntryMetadata.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java index ce9f16b7b..3952b9446 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultEntryMetadata.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultException.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultException.java similarity index 93% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultException.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultException.java index af106bb58..4f130d998 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultException.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultException.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import org.eclipse.dataspaceconnector.spi.EdcException; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java similarity index 95% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java index 712c92421..c755dbefc 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheck.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java similarity index 98% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheck.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java index e2177d157..464408d12 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheck.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.io.IOException; import lombok.RequiredArgsConstructor; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java similarity index 97% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthExtension.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java index 9e904a2c7..ddb19d1ba 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthExtension.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import okhttp3.OkHttpClient; import org.eclipse.dataspaceconnector.spi.EdcSetting; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthResponse.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java similarity index 97% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthResponse.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java index b987c7041..bbf991684 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthResponse.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import lombok.Builder; import lombok.Getter; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java similarity index 96% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java index d63b71408..67ef6533c 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java similarity index 97% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultVaultExtension.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java index f6afafb07..c3504931a 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/HashicorpVaultVaultExtension.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java @@ -14,7 +14,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import okhttp3.OkHttpClient; import org.eclipse.dataspaceconnector.spi.security.CertificateResolver; diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/PathUtil.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtil.java similarity index 93% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/PathUtil.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtil.java index fe5bb69fa..f22895355 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/PathUtil.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtil.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; final class PathUtil { diff --git a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/PemUtil.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java similarity index 97% rename from edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/PemUtil.java rename to edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java index 8e72fdfb1..112c56700 100644 --- a/edc-extensions/hashicorp-vault/src/main/java/net/catenax/edc/hashicorpvault/PemUtil.java +++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.io.IOException; import java.io.InputStream; diff --git a/edc-extensions/hashicorp-vault/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/edc-extensions/hashicorp-vault/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension index 11f7b3617..d0d36224a 100644 --- a/edc-extensions/hashicorp-vault/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension +++ b/edc-extensions/hashicorp-vault/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension @@ -10,5 +10,5 @@ # Contributors: # Mercedes-Benz Tech Innovation GmbH - Initial ServiceExtension file # -net.catenax.edc.hashicorpvault.HashicorpVaultHealthExtension -net.catenax.edc.hashicorpvault.HashicorpVaultVaultExtension +org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultHealthExtension +org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultVaultExtension diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/AbstractHashicorpIT.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/AbstractHashicorpIT.java index 57b2b584e..859070f2a 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/AbstractHashicorpIT.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/AbstractHashicorpIT.java @@ -12,11 +12,11 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; -import static net.catenax.edc.hashicorpvault.HashicorpVaultClient.VAULT_DATA_ENTRY_NAME; -import static net.catenax.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_TOKEN; -import static net.catenax.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_URL; +import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultClient.VAULT_DATA_ENTRY_NAME; +import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_TOKEN; +import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_URL; import java.util.ArrayList; import java.util.HashMap; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverIT.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverIT.java index 77d26e6df..3c91c8ae5 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverIT.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverIT.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.security.cert.X509Certificate; import java.util.UUID; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverTest.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverTest.java index 4a485cf4b..d93dad6e6 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverTest.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpCertificateResolverTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.security.cert.X509Certificate; import lombok.SneakyThrows; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultClientTest.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultClientTest.java index 525881619..44223ca99 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultClientTest.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultClientTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import com.fasterxml.jackson.databind.ObjectMapper; import java.time.Duration; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultExtensionTest.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultExtensionTest.java index 212477ced..15a48f590 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultExtensionTest.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultExtensionTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java index 71605bd3e..c37a1c922 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java index da198ba84..5950084a6 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.io.IOException; import org.eclipse.dataspaceconnector.spi.monitor.Monitor; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultIT.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultIT.java index e23c5a9f0..6534cb57d 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultIT.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultIT.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.util.UUID; import org.eclipse.dataspaceconnector.spi.security.Vault; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultTest.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultTest.java index 5b98c4f6e..608573576 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultTest.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/HashicorpVaultTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.util.UUID; import lombok.SneakyThrows; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/PathUtilTest.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/PathUtilTest.java index 01fb0f40a..a5d9821dd 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/PathUtilTest.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/PathUtilTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.util.stream.Stream; import org.junit.jupiter.api.Assertions; diff --git a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/X509CertificateTestUtil.java b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/X509CertificateTestUtil.java index 210928a88..0911e9a0b 100644 --- a/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/X509CertificateTestUtil.java +++ b/edc-extensions/hashicorp-vault/src/test/java/net/catenax/edc/hashicorpvault/X509CertificateTestUtil.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.hashicorpvault; +package org.eclipse.tractusx.edc.hashicorpvault; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/edc-extensions/pom.xml b/edc-extensions/pom.xml index 43ef65961..f4d59f291 100644 --- a/edc-extensions/pom.xml +++ b/edc-extensions/pom.xml @@ -15,13 +15,13 @@ - net.catenax.edc + org.eclipse.tractusx.edc product-edc-parent 0.1.1-SNAPSHOT 4.0.0 - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions edc-extensions pom diff --git a/edc-extensions/postgresql-migration/pom.xml b/edc-extensions/postgresql-migration/pom.xml index ee70e8201..769e13226 100644 --- a/edc-extensions/postgresql-migration/pom.xml +++ b/edc-extensions/postgresql-migration/pom.xml @@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> edc-extensions - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions 0.1.1-SNAPSHOT 4.0.0 diff --git a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java similarity index 95% rename from edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java rename to edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java index dbb17465a..8142b50db 100644 --- a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java +++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.postgresql.migration; +package org.eclipse.tractusx.edc.postgresql.migration; import java.util.Objects; import java.util.Properties; @@ -50,7 +50,8 @@ public void initialize(final ServiceExtensionContext context) { context .getConfig() .getBoolean( - String.format("net.catenax.edc.postgresql.migration.%s.enabled", subSystemName), + String.format( + "org.eclipse.tractusx.edc.postgresql.migration.%s.enabled", subSystemName), true); if (!enabled) { diff --git a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java similarity index 93% rename from edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java rename to edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java index 9876d17ea..3e71f54b0 100644 --- a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java +++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.postgresql.migration; +package org.eclipse.tractusx.edc.postgresql.migration; import org.eclipse.dataspaceconnector.sql.assetindex.ConfigurationKeys; diff --git a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java similarity index 94% rename from edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java rename to edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java index 1834cde8f..0a2cd98c1 100644 --- a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java +++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.postgresql.migration; +package org.eclipse.tractusx.edc.postgresql.migration; import org.eclipse.dataspaceconnector.spi.EdcSetting; diff --git a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java similarity index 94% rename from edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java rename to edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java index 8c732742f..fd076e0de 100644 --- a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java +++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.postgresql.migration; +package org.eclipse.tractusx.edc.postgresql.migration; import org.eclipse.dataspaceconnector.spi.EdcSetting; diff --git a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/DriverManagerConnectionFactory.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/DriverManagerConnectionFactory.java similarity index 95% rename from edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/DriverManagerConnectionFactory.java rename to edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/DriverManagerConnectionFactory.java index 4e7c96220..58c2d0461 100644 --- a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/DriverManagerConnectionFactory.java +++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/DriverManagerConnectionFactory.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.postgresql.migration; +package org.eclipse.tractusx.edc.postgresql.migration; import java.sql.Connection; import java.sql.DriverManager; diff --git a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java similarity index 94% rename from edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java rename to edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java index 9e3b64ff9..7f96fb52f 100644 --- a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java +++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.postgresql.migration; +package org.eclipse.tractusx.edc.postgresql.migration; import org.eclipse.dataspaceconnector.spi.EdcSetting; diff --git a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java similarity index 94% rename from edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java rename to edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java index 4ef0d97f4..09b714b98 100644 --- a/edc-extensions/postgresql-migration/src/main/java/net/catenax/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java +++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.postgresql.migration; +package org.eclipse.tractusx.edc.postgresql.migration; import org.eclipse.dataspaceconnector.spi.EdcSetting; diff --git a/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension b/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension index fc52160ad..4631681ca 100644 --- a/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension +++ b/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.dataspaceconnector.spi.system.ServiceExtension @@ -11,8 +11,8 @@ # Mercedes-Benz Tech Innovation GmbH - Initial ServiceExtension file # # -net.catenax.edc.postgresql.migration.AssetPostgresqlMigrationExtension -net.catenax.edc.postgresql.migration.ContractDefinitionPostgresqlMigrationExtension -net.catenax.edc.postgresql.migration.ContractNegotiationPostgresqlMigrationExtension -net.catenax.edc.postgresql.migration.PolicyPostgresqlMigrationExtension -net.catenax.edc.postgresql.migration.TransferProcessPostgresqlMigrationExtension +org.eclipse.tractusx.edc.postgresql.migration.AssetPostgresqlMigrationExtension +org.eclipse.tractusx.edc.postgresql.migration.ContractDefinitionPostgresqlMigrationExtension +org.eclipse.tractusx.edc.postgresql.migration.ContractNegotiationPostgresqlMigrationExtension +org.eclipse.tractusx.edc.postgresql.migration.PolicyPostgresqlMigrationExtension +org.eclipse.tractusx.edc.postgresql.migration.TransferProcessPostgresqlMigrationExtension diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/asset/V0_0_1__Init_Asset_Database_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_1__Init_Asset_Database_Schema.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/asset/V0_0_1__Init_Asset_Database_Schema.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_1__Init_Asset_Database_Schema.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/asset/V0_0_2__Milestone5_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_2__Milestone5_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/asset/V0_0_2__Milestone5_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_2__Milestone5_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/asset/V0_0_3__Snapshot_20220815_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_3__Snapshot_20220815_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/asset/V0_0_3__Snapshot_20220815_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_3__Snapshot_20220815_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractdefinition/V0_0_1__Init_ContractDefinition_Database_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_1__Init_ContractDefinition_Database_Schema.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractdefinition/V0_0_1__Init_ContractDefinition_Database_Schema.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_1__Init_ContractDefinition_Database_Schema.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractdefinition/V0_0_2__Alter_ContractDefinition_Access_Contract_Policy_Id_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_2__Alter_ContractDefinition_Access_Contract_Policy_Id_Schema.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractdefinition/V0_0_2__Alter_ContractDefinition_Access_Contract_Policy_Id_Schema.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_2__Alter_ContractDefinition_Access_Contract_Policy_Id_Schema.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractdefinition/V0_0_3__Snapshot_20220815_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_3__Snapshot_20220815_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractdefinition/V0_0_3__Snapshot_20220815_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_3__Snapshot_20220815_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_1__Init_ContractNegotiation_Database_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_1__Init_ContractNegotiation_Database_Schema.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_1__Init_ContractNegotiation_Database_Schema.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_1__Init_ContractNegotiation_Database_Schema.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_2__Alter_ContractNegotation_Contract_Agreement_Id_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_2__Alter_ContractNegotation_Contract_Agreement_Id_Schema.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_2__Alter_ContractNegotation_Contract_Agreement_Id_Schema.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_2__Alter_ContractNegotation_Contract_Agreement_Id_Schema.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_3__Milestone5_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_3__Milestone5_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_3__Milestone5_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_3__Milestone5_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_4__Snapshot_20220815_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_4__Snapshot_20220815_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/contractnegotiation/V0_0_4__Snapshot_20220815_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_4__Snapshot_20220815_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/policy/V0_0_1__Init_Policy_Database_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_1__Init_Policy_Database_Schema.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/policy/V0_0_1__Init_Policy_Database_Schema.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_1__Init_Policy_Database_Schema.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/policy/V0_0_2__Milestone5_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_2__Milestone5_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/policy/V0_0_2__Milestone5_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_2__Milestone5_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/policy/V0_0_3__Snapshot_20220815_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_3__Snapshot_20220815_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/policy/V0_0_3__Snapshot_20220815_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_3__Snapshot_20220815_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_1__Init_TransferProcess_Database_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_1__Init_TransferProcess_Database_Schema.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_1__Init_TransferProcess_Database_Schema.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_1__Init_TransferProcess_Database_Schema.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_2__Alter_TransferProcess_Add_DataAddress.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_2__Alter_TransferProcess_Add_DataAddress.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_2__Alter_TransferProcess_Add_DataAddress.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_2__Alter_TransferProcess_Add_DataAddress.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_3__Alter_Rename_Id.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_3__Alter_Rename_Id.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_3__Alter_Rename_Id.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_3__Alter_Rename_Id.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_4__Milestone5_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_4__Milestone5_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_4__Milestone5_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_4__Milestone5_Update.sql diff --git a/edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_5__Snapshot_20220815_Update.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_5__Snapshot_20220815_Update.sql similarity index 100% rename from edc-extensions/postgresql-migration/src/main/resources/net/catenax/edc/postgresql/migration/transferprocess/V0_0_5__Snapshot_20220815_Update.sql rename to edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_5__Snapshot_20220815_Update.sql diff --git a/edc-tests/README.md b/edc-tests/README.md index 1169a1998..e7c100d04 100644 --- a/edc-tests/README.md +++ b/edc-tests/README.md @@ -1,7 +1,7 @@ # Invoke Business-Tests via Maven ```shell -./mvnw -pl edc-tests -Pbusiness-tests -pl edc-tests test -Dtest=net.catenax.edc.tests.features.RunCucumberTest +./mvnw -pl edc-tests -Pbusiness-tests -pl edc-tests test -Dtest=org.eclipse.tractusx.edc.tests.features.RunCucumberTest ``` # Test locally using Act Tool diff --git a/edc-tests/pom.xml b/edc-tests/pom.xml index b4fd025bf..79e6cb837 100644 --- a/edc-tests/pom.xml +++ b/edc-tests/pom.xml @@ -17,12 +17,12 @@ 4.0.0 - net.catenax.edc + org.eclipse.tractusx.edc product-edc-parent 0.1.1-SNAPSHOT - net.catenax.edc.tests + org.eclipse.tractusx.edc.tests edc-tests jar @@ -147,57 +147,57 @@ --> - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions business-partner-validation - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions dataplane-selector-configuration - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions hashicorp-vault - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions postgresql-migration - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions data-encryption - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions cx-oauth2 - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-base - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-memory - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-postgresql - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-postgresql-hashicorp-vault - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-base - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-azure-vault - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-hashicorp-vault diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/Constraint.java b/edc-tests/src/test/java/net/catenax/edc/tests/data/Constraint.java deleted file mode 100644 index 1fbd2fa59..000000000 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/Constraint.java +++ /dev/null @@ -1,3 +0,0 @@ -package net.catenax.edc.tests.data; - -public interface Constraint {} diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/AssetStepDefs.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/AssetStepDefs.java similarity index 94% rename from edc-tests/src/test/java/net/catenax/edc/tests/AssetStepDefs.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/AssetStepDefs.java index 3c96d9de8..e1476d0fe 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/AssetStepDefs.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/AssetStepDefs.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import io.cucumber.datatable.DataTable; import io.cucumber.java.en.Given; @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import net.catenax.edc.tests.data.Asset; +import org.eclipse.tractusx.edc.tests.data.Asset; public class AssetStepDefs { diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/BackendServiceBackendAPI.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java similarity index 98% rename from edc-tests/src/test/java/net/catenax/edc/tests/BackendServiceBackendAPI.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java index f68d0da59..052900483 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/BackendServiceBackendAPI.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -62,7 +62,7 @@ public BackendServiceBackendAPI(@NonNull final String backendServiceBackendApiUr /** Lists all files and directories associated by a backend-service path. */ @SneakyThrows - public List list(/*@Nullable*/ final String path) { + public List list(/* @Nullable */ final String path) { final URI uri = new URIBuilder(backendServiceBackendApiUrl) .setPath(Optional.ofNullable(path).orElse(PATH_ROOT)) diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/BackendServiceSteps.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java similarity index 90% rename from edc-tests/src/test/java/net/catenax/edc/tests/BackendServiceSteps.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java index 1d5ec62ca..05960ddf7 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/BackendServiceSteps.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java @@ -1,4 +1,4 @@ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import io.cucumber.java.en.Given; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/CatalogStepDefs.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogStepDefs.java similarity index 96% rename from edc-tests/src/test/java/net/catenax/edc/tests/CatalogStepDefs.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogStepDefs.java index aa4468dbc..0b7807d2c 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/CatalogStepDefs.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogStepDefs.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import io.cucumber.datatable.DataTable; import io.cucumber.java.en.Then; @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import net.catenax.edc.tests.data.ContractOffer; +import org.eclipse.tractusx.edc.tests.data.ContractOffer; import org.junit.jupiter.api.Assertions; public class CatalogStepDefs { diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/Connector.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java similarity index 93% rename from edc-tests/src/test/java/net/catenax/edc/tests/Connector.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java index 137f007cf..4f82325a9 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/Connector.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java @@ -12,12 +12,12 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import net.catenax.edc.tests.util.DatabaseCleaner; +import org.eclipse.tractusx.edc.tests.util.DatabaseCleaner; @RequiredArgsConstructor public class Connector { diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/ConnectorFactory.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java similarity index 96% rename from edc-tests/src/test/java/net/catenax/edc/tests/ConnectorFactory.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java index 9a9d7e2ac..2d4163b83 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/ConnectorFactory.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import java.util.HashMap; import java.util.Locale; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/ConnectorSteps.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorSteps.java similarity index 94% rename from edc-tests/src/test/java/net/catenax/edc/tests/ConnectorSteps.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorSteps.java index 8af81d655..4f30e60b3 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/ConnectorSteps.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorSteps.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import io.cucumber.java.en.Given; import java.sql.SQLException; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/Constants.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java similarity index 96% rename from edc-tests/src/test/java/net/catenax/edc/tests/Constants.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java index 6f16894ea..8725dbe66 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/Constants.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import lombok.experimental.UtilityClass; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/ContractDefinitionStepDefs.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ContractDefinitionStepDefs.java similarity index 94% rename from edc-tests/src/test/java/net/catenax/edc/tests/ContractDefinitionStepDefs.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ContractDefinitionStepDefs.java index 11a097e68..eced4d803 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/ContractDefinitionStepDefs.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/ContractDefinitionStepDefs.java @@ -12,14 +12,14 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import io.cucumber.datatable.DataTable; import io.cucumber.java.en.Given; import java.util.ArrayList; import java.util.List; import java.util.Map; -import net.catenax.edc.tests.data.ContractDefinition; +import org.eclipse.tractusx.edc.tests.data.ContractDefinition; public class ContractDefinitionStepDefs { diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/DataManagementAPI.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java similarity index 96% rename from edc-tests/src/test/java/net/catenax/edc/tests/DataManagementAPI.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java index 5338a4f5e..0795316a5 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/DataManagementAPI.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -25,16 +25,6 @@ import java.util.stream.Collectors; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import net.catenax.edc.tests.data.Asset; -import net.catenax.edc.tests.data.BusinessPartnerNumberConstraint; -import net.catenax.edc.tests.data.Constraint; -import net.catenax.edc.tests.data.ContractDefinition; -import net.catenax.edc.tests.data.ContractNegotiation; -import net.catenax.edc.tests.data.ContractNegotiationState; -import net.catenax.edc.tests.data.ContractOffer; -import net.catenax.edc.tests.data.PayMeConstraint; -import net.catenax.edc.tests.data.Permission; -import net.catenax.edc.tests.data.Policy; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; @@ -42,6 +32,16 @@ import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClientBuilder; +import org.eclipse.tractusx.edc.tests.data.Asset; +import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint; +import org.eclipse.tractusx.edc.tests.data.Constraint; +import org.eclipse.tractusx.edc.tests.data.ContractDefinition; +import org.eclipse.tractusx.edc.tests.data.ContractNegotiation; +import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState; +import org.eclipse.tractusx.edc.tests.data.ContractOffer; +import org.eclipse.tractusx.edc.tests.data.PayMeConstraint; +import org.eclipse.tractusx.edc.tests.data.Permission; +import org.eclipse.tractusx.edc.tests.data.Policy; @Slf4j public class DataManagementAPI { diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/Environment.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java similarity index 74% rename from edc-tests/src/test/java/net/catenax/edc/tests/Environment.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java index 699472a63..5df4486c5 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/Environment.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java @@ -12,16 +12,16 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; -import static net.catenax.edc.tests.Constants.BACKEND_SERVICE_BACKEND_API_URL; -import static net.catenax.edc.tests.Constants.DATABASE_PASSWORD; -import static net.catenax.edc.tests.Constants.DATABASE_URL; -import static net.catenax.edc.tests.Constants.DATABASE_USER; -import static net.catenax.edc.tests.Constants.DATA_MANAGEMENT_API_AUTH_KEY; -import static net.catenax.edc.tests.Constants.DATA_MANAGEMENT_URL; -import static net.catenax.edc.tests.Constants.DATA_PLANE_URL; -import static net.catenax.edc.tests.Constants.IDS_URL; +import static org.eclipse.tractusx.edc.tests.Constants.BACKEND_SERVICE_BACKEND_API_URL; +import static org.eclipse.tractusx.edc.tests.Constants.DATABASE_PASSWORD; +import static org.eclipse.tractusx.edc.tests.Constants.DATABASE_URL; +import static org.eclipse.tractusx.edc.tests.Constants.DATABASE_USER; +import static org.eclipse.tractusx.edc.tests.Constants.DATA_MANAGEMENT_API_AUTH_KEY; +import static org.eclipse.tractusx.edc.tests.Constants.DATA_MANAGEMENT_URL; +import static org.eclipse.tractusx.edc.tests.Constants.DATA_PLANE_URL; +import static org.eclipse.tractusx.edc.tests.Constants.IDS_URL; import java.util.Locale; import lombok.AccessLevel; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/NegotiationSteps.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java similarity index 89% rename from edc-tests/src/test/java/net/catenax/edc/tests/NegotiationSteps.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java index bf4bcdd12..8994f13a7 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/NegotiationSteps.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import static org.awaitility.Awaitility.await; @@ -26,11 +26,11 @@ import java.util.Map; import java.util.stream.Stream; import lombok.extern.slf4j.Slf4j; -import net.catenax.edc.tests.data.ContractNegotiation; -import net.catenax.edc.tests.data.ContractNegotiationState; -import net.catenax.edc.tests.data.Permission; -import net.catenax.edc.tests.data.Policy; -import net.catenax.edc.tests.util.Timeouts; +import org.eclipse.tractusx.edc.tests.data.ContractNegotiation; +import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState; +import org.eclipse.tractusx.edc.tests.data.Permission; +import org.eclipse.tractusx.edc.tests.data.Policy; +import org.eclipse.tractusx.edc.tests.util.Timeouts; import org.junit.jupiter.api.Assertions; @Slf4j diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/PolicyStepDefs.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java similarity index 84% rename from edc-tests/src/test/java/net/catenax/edc/tests/PolicyStepDefs.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java index 81f173c09..707cc724a 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/PolicyStepDefs.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java @@ -12,18 +12,18 @@ * */ -package net.catenax.edc.tests; +package org.eclipse.tractusx.edc.tests; import io.cucumber.datatable.DataTable; import io.cucumber.java.en.Given; import java.util.ArrayList; import java.util.List; import java.util.Map; -import net.catenax.edc.tests.data.BusinessPartnerNumberConstraint; -import net.catenax.edc.tests.data.Constraint; -import net.catenax.edc.tests.data.PayMeConstraint; -import net.catenax.edc.tests.data.Permission; -import net.catenax.edc.tests.data.Policy; +import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint; +import org.eclipse.tractusx.edc.tests.data.Constraint; +import org.eclipse.tractusx.edc.tests.data.PayMeConstraint; +import org.eclipse.tractusx.edc.tests.data.Permission; +import org.eclipse.tractusx.edc.tests.data.Policy; public class PolicyStepDefs { diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/Asset.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java similarity index 92% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/Asset.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java index b402df750..7b5709744 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/Asset.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import lombok.NonNull; import lombok.Value; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/BusinessPartnerNumberConstraint.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java similarity index 78% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/BusinessPartnerNumberConstraint.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java index d7cee2be9..b9c64d158 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/BusinessPartnerNumberConstraint.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java @@ -1,4 +1,4 @@ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import lombok.NonNull; import lombok.Value; diff --git a/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Constraint.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Constraint.java new file mode 100644 index 000000000..c63fbed8a --- /dev/null +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Constraint.java @@ -0,0 +1,3 @@ +package org.eclipse.tractusx.edc.tests.data; + +public interface Constraint {} diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractDefinition.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java similarity index 93% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/ContractDefinition.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java index dc2054a97..37e211d01 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractDefinition.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import java.util.List; import lombok.NonNull; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractNegotiation.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java similarity index 92% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/ContractNegotiation.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java index aff80ff8b..d0d33306a 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractNegotiation.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import lombok.NonNull; import lombok.Value; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractNegotiationState.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiationState.java similarity index 91% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/ContractNegotiationState.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiationState.java index 66b077601..e3112ed2e 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractNegotiationState.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiationState.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; public enum ContractNegotiationState { UNKNOWN, diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractOffer.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java similarity index 92% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/ContractOffer.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java index 329639fed..ac615ed06 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/ContractOffer.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import lombok.NonNull; import lombok.Value; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/PayMeConstraint.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java similarity index 93% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/PayMeConstraint.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java index 3a12fe12f..f5df68b84 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/PayMeConstraint.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import lombok.Value; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/Permission.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java similarity index 92% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/Permission.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java index d0f15b13f..00b4a6fca 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/Permission.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java @@ -11,7 +11,7 @@ * Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import java.util.List; import lombok.NonNull; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/data/Policy.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java similarity index 92% rename from edc-tests/src/test/java/net/catenax/edc/tests/data/Policy.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java index 2996fa032..0b1047222 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/data/Policy.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests.data; +package org.eclipse.tractusx.edc.tests.data; import java.util.List; import lombok.NonNull; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/features/ParameterTypes.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/features/ParameterTypes.java similarity index 56% rename from edc-tests/src/test/java/net/catenax/edc/tests/features/ParameterTypes.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/features/ParameterTypes.java index 29a3b8072..7995e8d89 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/features/ParameterTypes.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/features/ParameterTypes.java @@ -1,8 +1,8 @@ -package net.catenax.edc.tests.features; +package org.eclipse.tractusx.edc.tests.features; import io.cucumber.java.ParameterType; -import net.catenax.edc.tests.Connector; -import net.catenax.edc.tests.ConnectorFactory; +import org.eclipse.tractusx.edc.tests.Connector; +import org.eclipse.tractusx.edc.tests.ConnectorFactory; public class ParameterTypes { diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/features/RunCucumberTest.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/features/RunCucumberTest.java similarity index 92% rename from edc-tests/src/test/java/net/catenax/edc/tests/features/RunCucumberTest.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/features/RunCucumberTest.java index 0c4c9379c..04bf00d18 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/features/RunCucumberTest.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/features/RunCucumberTest.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests.features; +package org.eclipse.tractusx.edc.tests.features; import org.junit.platform.suite.api.SelectClasspathResource; import org.junit.platform.suite.api.Suite; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/util/DatabaseCleaner.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java similarity index 96% rename from edc-tests/src/test/java/net/catenax/edc/tests/util/DatabaseCleaner.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java index 530278e75..c615c75bf 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/util/DatabaseCleaner.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests.util; +package org.eclipse.tractusx.edc.tests.util; import java.sql.Connection; import java.sql.DriverManager; diff --git a/edc-tests/src/test/java/net/catenax/edc/tests/util/Timeouts.java b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/util/Timeouts.java similarity index 92% rename from edc-tests/src/test/java/net/catenax/edc/tests/util/Timeouts.java rename to edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/util/Timeouts.java index 355de752d..83a0cae36 100644 --- a/edc-tests/src/test/java/net/catenax/edc/tests/util/Timeouts.java +++ b/edc-tests/src/test/java/org/eclipse/tractusx/edc/tests/util/Timeouts.java @@ -12,7 +12,7 @@ * */ -package net.catenax.edc.tests.util; +package org.eclipse.tractusx.edc.tests.util; import java.time.Duration; diff --git a/edc-tests/src/test/resources/net/catenax/edc/tests/features/ContractNegotiation.feature b/edc-tests/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractNegotiation.feature similarity index 100% rename from edc-tests/src/test/resources/net/catenax/edc/tests/features/ContractNegotiation.feature rename to edc-tests/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractNegotiation.feature diff --git a/edc-tests/src/test/resources/net/catenax/edc/tests/features/ContractOffers.feature b/edc-tests/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractOffers.feature similarity index 100% rename from edc-tests/src/test/resources/net/catenax/edc/tests/features/ContractOffers.feature rename to edc-tests/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractOffers.feature diff --git a/pom.xml b/pom.xml index e8c822602..5adaff857 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.catenax.edc + org.eclipse.tractusx.edc product-edc-parent 0.1.1-SNAPSHOT pom @@ -320,73 +320,73 @@ - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions business-partner-validation ${project.version} - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions postgresql-migration ${project.version} - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions hashicorp-vault ${project.version} - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions dataplane-selector-configuration ${project.version} - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions data-encryption ${project.version} - net.catenax.edc.extensions + org.eclipse.tractusx.edc.extensions cx-oauth2 ${project.version} - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-base ${project.version} - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-base ${project.version} - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-memory ${project.version} - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-postgresql ${project.version} - net.catenax.edc + org.eclipse.tractusx.edc edc-controlplane-postgresql-hashicorp-vault ${project.version} - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-azure-vault ${project.version} - net.catenax.edc + org.eclipse.tractusx.edc edc-dataplane-hashicorp-vault ${project.version}