Skip to content

Commit

Permalink
change package from net.catenx to org.eclipse.tractusx (#398)
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikPinsel authored Oct 25, 2022
1 parent 46c3894 commit 3be5712
Show file tree
Hide file tree
Showing 195 changed files with 436 additions and 421 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/business-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,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"
Expand Down
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Set EDC version to `0.0.1-20221006-SNAPSHOT`

### Changed

- Update package structure/namespace from `net.catenax` to `org.eclipse.tractusx`

## [0.1.2] - 2022-09-30

### Added
Expand All @@ -24,9 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Moved helm charts from `deployment/helm` to `charts`
- Replaced distroless image with alpine in all docker images
- Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
- Moved helm charts from `deployment/helm` to `charts`

## [0.1.1] - 2022-09-04

Expand Down
18 changes: 9 additions & 9 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,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
Expand Down
1 change: 0 additions & 1 deletion edc
Submodule edc deleted from 740c10
10 changes: 5 additions & 5 deletions edc-controlplane/edc-controlplane-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>edc-controlplane</artifactId>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<version>0.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -52,19 +52,19 @@
<dependencies>
<!-- CX Extensions -->
<dependency>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>business-partner-validation</artifactId>
</dependency>
<dependency>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>dataplane-selector-configuration</artifactId>
</dependency>
<dependency>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>data-encryption</artifactId>
</dependency>
<dependency>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>cx-oauth2</artifactId>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions edc-controlplane/edc-controlplane-memory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-controlplane</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -84,7 +84,7 @@
<dependencies>
<!-- Base Control-Plane -->
<dependency>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-controlplane-base</artifactId>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-controlplane</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -84,7 +84,7 @@
<dependencies>
<!-- Base Control-Plane \w psql, \wo Azure KeyVault -->
<dependency>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-controlplane-postgresql</artifactId>
<exclusions>
<exclusion>
Expand All @@ -96,7 +96,7 @@

<!-- Vault -->
<dependency>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>hashicorp-vault</artifactId>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions edc-controlplane/edc-controlplane-postgresql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-controlplane</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -85,13 +85,13 @@
<dependencies>
<!-- Base Control-Plane -->
<dependency>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-controlplane-base</artifactId>
</dependency>

<!-- CX Extensions -->
<dependency>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>postgresql-migration</artifactId>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion edc-controlplane/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>product-edc-parent</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down
4 changes: 2 additions & 2 deletions edc-dataplane/edc-dataplane-azure-vault/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-dataplane</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -83,7 +83,7 @@
<dependencies>
<!-- Base Data-Plane -->
<dependency>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-dataplane-base</artifactId>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion edc-dataplane/edc-dataplane-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>edc-dataplane</artifactId>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<version>0.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
6 changes: 3 additions & 3 deletions edc-dataplane/edc-dataplane-hashicorp-vault/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-dataplane</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -83,13 +83,13 @@
<dependencies>
<!-- Base Data-Plane -->
<dependency>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>edc-dataplane-base</artifactId>
</dependency>

<!-- Vault -->
<dependency>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>hashicorp-vault</artifactId>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion edc-dataplane/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>net.catenax.edc</groupId>
<groupId>org.eclipse.tractusx.edc</groupId>
<artifactId>product-edc-parent</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion edc-extensions/business-partner-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<artifactId>edc-extensions</artifactId>
<version>0.1.3-SNAPSHOT</version>
</parent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@
*
*/

package net.catenax.edc.validation.businesspartner;
package org.eclipse.tractusx.edc.validation.businesspartner;

import static org.eclipse.dataspaceconnector.spi.policy.engine.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;
Expand All @@ -28,6 +25,9 @@
import org.eclipse.dataspaceconnector.spi.policy.engine.RuleBindingRegistry;
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;

public class BusinessPartnerValidationExtension implements ServiceExtension {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion edc-extensions/cx-oauth2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>edc-extensions</artifactId>
<groupId>net.catenax.edc.extensions</groupId>
<groupId>org.eclipse.tractusx.edc.extensions</groupId>
<version>0.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
* 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;
import lombok.Setter;
import okhttp3.OkHttpClient;
import org.eclipse.dataspaceconnector.iam.oauth2.spi.Oauth2JwtDecoratorRegistry;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.EdcSetting;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Inject;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Provides;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Requires;
import org.eclipse.dataspaceconnector.runtime.metamodel.annotation.Setting;
import org.eclipse.dataspaceconnector.spi.EdcException;
import org.eclipse.dataspaceconnector.spi.iam.IdentityService;
import org.eclipse.dataspaceconnector.spi.jwt.TokenGenerationService;
Expand All @@ -38,9 +38,9 @@
})
public class OAuth2Extension implements ServiceExtension {

@EdcSetting private static final String TOKEN_URL = "edc.oauth.token.url";
@Setting private static final String TOKEN_URL = "edc.oauth.token.url";

@EdcSetting private static final String PROVIDER_AUDIENCE = "edc.oauth.provider.audience";
@Setting private static final String PROVIDER_AUDIENCE = "edc.oauth.provider.audience";

@Inject @Setter private OkHttpClient okHttpClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
*/

package net.catenax.edc.oauth2;
package org.eclipse.tractusx.edc.oauth2;

import java.net.URI;
import java.util.LinkedHashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 3be5712

Please sign in to comment.