feat: restructure extensions by component (eclipse-edc#1863)

feat: restructure extensions by component

.github/workflows/verify.yaml

@@ -204,7 +204,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           command: |
-            ./gradlew -p extensions/azure test -DincludeTags="AzureStorageIntegrationTest"
+            ./gradlew -p extensions test -DincludeTags="AzureStorageIntegrationTest"
             ./gradlew -p system-tests/azure-tests test -DincludeTags="AzureStorageIntegrationTest"
 
       - name: "Publish Gatling report"
@@ -242,7 +242,7 @@ jobs:
       - name: Azure CosmosDB Tests
         uses: ./.github/actions/run-tests
         with:
-          command: ./gradlew -p extensions/azure/cosmos test -DincludeTags="AzureCosmosDbIntegrationTest"
+          command: ./gradlew -p extensions test -DincludeTags="AzureCosmosDbIntegrationTest"
 
   Aws-Integration-Tests:
     runs-on: ubuntu-latest
@@ -267,7 +267,7 @@ jobs:
       - name: AWS Tests
         uses: ./.github/actions/run-tests
         with:
-          command: ./gradlew -p extensions/aws test -DincludeTags="AwsS3IntegrationTest"
+          command: ./gradlew -p extensions test -DincludeTags="AwsS3IntegrationTest"
 
   Daps-Integration-Tests:
     runs-on: ubuntu-latest
@@ -279,12 +279,12 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-build
 
-      - run: docker run -d --rm -p 4567:4567 -v ${{ github.workspace }}/extensions/iam/daps/src/test/resources/config:/opt/config -v ${{ github.workspace }}/extensions/iam/daps/src/test/resources/keys:/opt/keys ghcr.io/fraunhofer-aisec/omejdn-server:1.3.1
+      - run: docker run -d --rm -p 4567:4567 -v ${{ github.workspace }}/extensions/common/iam/oauth2/daps/src/test/resources/config:/opt/config -v ${{ github.workspace }}/extensions/common/iam/oauth2/daps/src/test/resources/keys:/opt/keys ghcr.io/fraunhofer-aisec/omejdn-server:1.4.2
 
       - name: Daps Integration Tests
         uses: ./.github/actions/run-tests
         with:
-          command: ./gradlew -p extensions/iam/daps test -DincludeTags="DapsIntegrationTest"
+          command: ./gradlew -p extensions/common/iam/oauth2/daps test -DincludeTags="DapsIntegrationTest"
 
   Postgresql-Integration-Tests:
     runs-on: ubuntu-latest
@@ -326,7 +326,7 @@ jobs:
       - name: Hashicorp Vault Integration Tests
         uses: ./.github/actions/run-tests
         with:
-          command: ./gradlew -p extensions/hashicorp-vault test -DincludeTags="HashicorpVaultIntegrationTest"
+          command: ./gradlew -p extensions test -DincludeTags="HashicorpVaultIntegrationTest"
 
   End-To-End-Tests:
     runs-on: ubuntu-latest
@@ -371,7 +371,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           command: |
-            ./gradlew -p extensions/micrometer test -DincludeTags="OpenTelemetryIntegrationTest"
+            ./gradlew -p extensions/common/micrometer test -DincludeTags="OpenTelemetryIntegrationTest"
             ./gradlew -p system-tests/tests test -DincludeTags="OpenTelemetryIntegrationTest"
 
   Check-Cloud-Environments:
@@ -429,7 +429,7 @@ jobs:
           AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
         with:
           command: |
-            ./gradlew -p extensions/azure/data-plane/data-factory test -DincludeTags="AzureDataFactoryIntegrationTest"
+            ./gradlew -p extensions/data-plane/data-plane-data-factory test -DincludeTags="AzureDataFactoryIntegrationTest"
             ./gradlew -p system-tests/azure-data-factory-tests test -DincludeTags="AzureDataFactoryIntegrationTest"
 
       - name: "Publish Gatling report"

core/common/base/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
     api("dev.failsafe:failsafe:${failsafeVersion}")
     implementation("org.bouncycastle:bcpkix-jdk15on:${bouncycastleVersion}")
 
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
     testImplementation("org.awaitility:awaitility:${awaitility}")
     testImplementation("org.junit.jupiter:junit-jupiter-api:${jupiterVersion}")
 }

core/control-plane/contract/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
     implementation("io.opentelemetry:opentelemetry-extension-annotations:${openTelemetryVersion}")
 
     testImplementation(project(":core:control-plane:control-plane-core"))
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
     testImplementation(testFixtures(project(":common:util")))
     testImplementation("org.awaitility:awaitility:${awaitility}")
 }

core/control-plane/transfer/build.gradle.kts

@@ -26,7 +26,7 @@ dependencies {
     implementation(project(":common:util"))
     implementation("io.opentelemetry:opentelemetry-extension-annotations:${openTelemetryVersion}")
 
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
     testImplementation(project(":core:control-plane:control-plane-core"))
     testImplementation(testFixtures(project(":common:util")))
     testImplementation("org.awaitility:awaitility:${awaitility}")

core/data-plane/data-plane-core/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     api(project(":spi:common:web-spi"))
     api(project(":core:common:base"))
     api(project(":core:common:boot"))
-    api(project(":extensions:http"))
+    api(project(":extensions:common:http"))
     api(project(":core:data-plane:data-plane-framework"))
 }
 

core/data-plane/data-plane-framework/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     api(project(":spi:data-plane:data-plane-spi"))
     implementation(project(":common:util"))
     implementation("io.opentelemetry:opentelemetry-extension-annotations:${openTelemetryVersion}")
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
 }
 
 

core/federated-catalog/federated-catalog-core/build.gradle.kts

@@ -37,9 +37,9 @@ dependencies {
     implementation("dev.failsafe:failsafe:${failsafeVersion}")
 
     // required for integration test
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
 
-    testImplementation(project(":extensions:http"))
+    testImplementation(project(":extensions:common:http"))
     testImplementation(project(":data-protocols:ids:ids-spi"))
     testImplementation("org.awaitility:awaitility:${awaitility}")
 

data-protocols/ids/ids-api-multipart-dispatcher-v1/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
 
     testImplementation(project(":core:control-plane:control-plane-core"))
     testImplementation(project(":data-protocols:ids:ids-api-multipart-endpoint-v1"))
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
     testImplementation(testFixtures(project(":common:util")))
 }
 

data-protocols/ids/ids-api-multipart-endpoint-v1/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     api(project(":data-protocols:ids:ids-spi"))
     api(project(":data-protocols:ids:ids-core"))
     api(project(":data-protocols:ids:ids-transform-v1"))
-    api(project(":extensions:http"))
+    api(project(":extensions:common:http"))
 
     implementation(project(":data-protocols:ids:ids-api-configuration"))
 
@@ -37,7 +37,7 @@ dependencies {
     testImplementation("net.javacrumbs.json-unit:json-unit:2.35.0")
 
     testImplementation("com.squareup.okhttp3:okhttp:${okHttpVersion}")
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
 
     testImplementation(project(":core:control-plane:control-plane-core"))
     testImplementation(testFixtures(project(":common:util")))

data-protocols/ids/ids-transform-v1/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     api("de.fraunhofer.iais.eis.ids.infomodel:java:${infoModelVersion}")
 
     implementation("jakarta.ws.rs:jakarta.ws.rs-api:${rsApi}")
-    testImplementation(project(":extensions:junit"))
+    testImplementation(project(":extensions:common:junit"))
 
 }
 

docs/developer/modules.md

@@ -4,16 +4,6 @@ org.eclipse.dataspaceconnector:token-generation-lib:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:token-validation-lib:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:common-util:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:ids:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:aws-s3:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:data-plane-transfer:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:hashicorp-vault:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:http:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:http-provisioner:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:http-receiver:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:jdk-logger-monitor:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:junit:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:core-micrometer:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:sql:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:data-plane-server:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:module-domain:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:module-processor:0.0.1-SNAPSHOT
@@ -36,45 +26,18 @@ org.eclipse.dataspaceconnector:ids-jsonld-serdes-lib:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:ids-spi:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:ids-token-validation:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:ids-api-transform-v1:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:api-core:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:auth-basic:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:auth-tokenbased:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:data-management-api:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:observability-api:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:aws-test:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:data-plane-s3:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:azure-test:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:blobstorage:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:cosmos:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:azure-eventgrid:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:azure-eventgrid-config:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:azure-resource-manager:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:azure-vault:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:http:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:junit:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:core-micrometer:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:data-plane-transfer:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:http-receiver:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:data-plane-api:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:data-plane-azure-storage:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:data-plane-azure-data-factory:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:data-plane-http:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:data-plane-s3:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:data-plane-selector-api:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:data-plane-selector-client:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:data-plane-transfer-client:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:data-plane-transfer-sync:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:cloudevents-http:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:filesystem-configuration:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:filesystem-vault:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:jersey:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:jersey-micrometer:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:jetty:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:jetty-micrometer:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:iam-daps:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:decentralized-identity:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:iam-mock:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:asset-index-sql:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:common-sql:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:contractdefinition-store-sql:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:contractnegotiation-store-sql:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:lease-sql:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:policy-store-sql:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:transfer-process-store-sql:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:transaction-atomikos:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:transaction-local:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:auth-spi:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:catalog-spi:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:core-spi:0.0.1-SNAPSHOT
@@ -92,6 +55,49 @@ org.eclipse.dataspaceconnector:transfer-spi:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:data-plane-spi:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:data-plane-selector-spi:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:federated-catalog-spi:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:api-core:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:observability-api:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:auth-basic:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:auth-tokenbased:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:aws-test:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:s3-core:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:azure-eventgrid:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:azure-resource-manager:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:azure-test:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:blob-core:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:cosmos-common:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:filesystem-configuration:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:cloudevents-http:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:jersey:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:jersey-micrometer:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:jetty:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:jetty-micrometer:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:decentralized-identity:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:iam-mock:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:jdk-logger-monitor:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:common-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:lease-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:transaction-atomikos:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:transaction-local:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:azure-vault:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:filesystem-vault:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:hashicorp-vault:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:data-management-api:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:data-plane-transfer-client:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:data-plane-transfer-sync:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:blob-provision:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:http-provisioner:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:s3-provision:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:fcc-node-directory-cosmos:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:dummy-credentials-verifier:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:identity-common-test:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:identity-did-core:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:identity-did-crypto:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:identity-did-service:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:identity-did-web:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:iam-daps:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:oauth2-core:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:apache-commons-pool-sql:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:api-configuration:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:asset-api:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:catalog-api:0.0.1-SNAPSHOT
@@ -100,24 +106,15 @@ org.eclipse.dataspaceconnector:contractdefinition-api:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:contractnegotiation-api:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:policydefinition-api:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:transferprocess-api:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:s3-core:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:s3-provision:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:blob-core:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:blob-provision:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:assetindex-cosmos:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:contract-definition-store-cosmos:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:contract-negotiation-store-cosmos:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:cosmos-common:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:fcc-node-directory-cosmos:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:control-plane-cosmos:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:policy-store-cosmos:0.0.1-SNAPSHOT
 org.eclipse.dataspaceconnector:transfer-process-store-cosmos:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:data-plane-azure-data-factory:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:data-plane-azure-storage:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:dummy-credentials-verifier:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:identity-common-test:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:identity-did-core:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:identity-did-crypto:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:identity-did-service:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:identity-did-web:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:oauth2-core:0.0.1-SNAPSHOT
-org.eclipse.dataspaceconnector:apache-commons-pool-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:asset-index-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:contractdefinition-store-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:contractnegotiation-store-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:control-plane-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:policy-store-sql:0.0.1-SNAPSHOT
+org.eclipse.dataspaceconnector:transfer-process-store-sql:0.0.1-SNAPSHOT