refactor: remove control-plane core modules from federated-catalog

ndr-brt · ndr-brt · commit a7a259708a9b · 2026-07-03T10:11:45.000+02:00
diff --git a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/CoreDefaultServicesExtension.java b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/CoreDefaultServicesExtension.java
@@ -14,8 +14,10 @@
 
 package org.eclipse.edc.connector.core;
 
-import org.eclipse.edc.connector.core.agent.NoOpParticipantIdMapper;
+import org.eclipse.edc.connector.core.profile.DataspaceProfileContextRegistryImpl;
+import org.eclipse.edc.participant.spi.NoOpParticipantIdMapper;
 import org.eclipse.edc.participant.spi.ParticipantIdMapper;
+import org.eclipse.edc.protocol.spi.DataspaceProfileContextRegistry;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.spi.system.ServiceExtension;
@@ -38,4 +40,8 @@ public ParticipantIdMapper participantIdMapper() {
         return new NoOpParticipantIdMapper();
     }
 
+    @Provider(isDefault = true)
+    public DataspaceProfileContextRegistry dataspaceProfileContextRegistry() {
+        return new DataspaceProfileContextRegistryImpl();
+    }
 }
diff --git a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DefaultUrlResolver.java b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DefaultUrlResolver.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.controlplane.discovery;
+package org.eclipse.edc.connector.core.discovery;
 
 import org.eclipse.edc.protocol.spi.discovery.DiscoveryRequest;
 import org.eclipse.edc.protocol.spi.discovery.DiscoveryUrlResolver;
diff --git a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DiscoveryDefaultServicesExtension.java b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DiscoveryDefaultServicesExtension.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.controlplane.discovery;
+package org.eclipse.edc.connector.core.discovery;
 
 import org.eclipse.edc.http.spi.EdcHttpClient;
 import org.eclipse.edc.protocol.spi.ParticipantProfileService;
diff --git a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DiscoveryServiceImpl.java b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DiscoveryServiceImpl.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.controlplane.discovery;
+package org.eclipse.edc.connector.core.discovery;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import okhttp3.Request;
diff --git a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DiscoveryServicesExtension.java b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/discovery/DiscoveryServicesExtension.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.controlplane.discovery;
+package org.eclipse.edc.connector.core.discovery;
 
 import org.eclipse.edc.protocol.spi.discovery.DiscoveryService;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
diff --git a/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/profile/DataspaceProfileContextRegistryImpl.java b/core/common/connector-core/src/main/java/org/eclipse/edc/connector/core/profile/DataspaceProfileContextRegistryImpl.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2025 Cofinity-X
+ *  Copyright (c) 2026 Think-it GmbH
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -8,11 +8,11 @@
  *  SPDX-License-Identifier: Apache-2.0
  *
  *  Contributors:
- *       Cofinity-X - initial API and implementation
+ *       Think-it GmbH - initial API and implementation
  *
  */
 
-package org.eclipse.edc.connector.controlplane.profile;
+package org.eclipse.edc.connector.core.profile;
 
 
 import org.eclipse.edc.protocol.spi.DataspaceProfileContext;
diff --git a/core/common/connector-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/core/common/connector-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -16,3 +16,5 @@ org.eclipse.edc.connector.core.CoreServicesExtension
 org.eclipse.edc.connector.core.CoreDefaultServicesExtension
 org.eclipse.edc.connector.core.SecurityDefaultServicesExtension
 org.eclipse.edc.connector.core.LocalPublicKeyDefaultExtension
+org.eclipse.edc.connector.core.discovery.DiscoveryDefaultServicesExtension
+org.eclipse.edc.connector.core.discovery.DiscoveryServicesExtension
diff --git a/core/common/connector-core/src/test/java/org/eclipse/edc/connector/core/discovery/DiscoveryServiceImplTest.java b/core/common/connector-core/src/test/java/org/eclipse/edc/connector/core/discovery/DiscoveryServiceImplTest.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.connector.controlplane.discovery;
+package org.eclipse.edc.connector.core.discovery;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import okhttp3.Protocol;
diff --git a/core/common/connector-core/src/test/java/org/eclipse/edc/connector/core/profile/DataspaceProfileContextRegistryImplTest.java b/core/common/connector-core/src/test/java/org/eclipse/edc/connector/core/profile/DataspaceProfileContextRegistryImplTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2025 Cofinity-X
+ *  Copyright (c) 2026 Think-it GmbH
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -8,12 +8,11 @@
  *  SPDX-License-Identifier: Apache-2.0
  *
  *  Contributors:
- *       Cofinity-X - initial API and implementation
- *       Cofinity-X - add participantId to DataspaceProfileContext
+ *       Think-it GmbH - initial API and implementation
  *
  */
 
-package org.eclipse.edc.connector.controlplane.profile;
+package org.eclipse.edc.connector.core.profile;
 
 import org.eclipse.edc.jsonld.spi.JsonLdNamespace;
 import org.eclipse.edc.protocol.spi.DataspaceProfileContext;
diff --git a/core/control-plane/control-plane-core/build.gradle.kts b/core/control-plane/control-plane-core/build.gradle.kts
@@ -23,9 +23,9 @@ dependencies {
 
     implementation(project(":core:control-plane:lib:control-plane-lib"))
     implementation(project(":core:common:boot"))
-    implementation(project(":core:common::participant-context-core"))
-    implementation(project(":core:common::participant-context-connector-core"))
-    implementation(project(":core:common::participant-context-config-core"))
+    implementation(project(":core:common:participant-context-core"))
+    implementation(project(":core:common:participant-context-connector-core"))
+    implementation(project(":core:common:participant-context-config-core"))
     implementation(project(":core:control-plane:control-plane-catalog"))
     implementation(project(":core:control-plane:control-plane-contract"))
     implementation(project(":core:control-plane:control-plane-transfer"))
diff --git a/core/control-plane/control-plane-core/src/main/java/org/eclipse/edc/connector/controlplane/ControlPlaneDefaultServicesExtension.java b/core/control-plane/control-plane-core/src/main/java/org/eclipse/edc/connector/controlplane/ControlPlaneDefaultServicesExtension.java
@@ -26,11 +26,9 @@
 import org.eclipse.edc.connector.controlplane.defaults.storage.policydefinition.InMemoryPolicyDefinitionStore;
 import org.eclipse.edc.connector.controlplane.defaults.storage.transferprocess.InMemoryTransferProcessStore;
 import org.eclipse.edc.connector.controlplane.policy.spi.store.PolicyDefinitionStore;
-import org.eclipse.edc.connector.controlplane.profile.DataspaceProfileContextRegistryImpl;
 import org.eclipse.edc.connector.controlplane.query.asset.AssetPropertyLookup;
 import org.eclipse.edc.connector.controlplane.services.spi.callback.CallbackRegistry;
 import org.eclipse.edc.connector.controlplane.transfer.spi.store.TransferProcessStore;
-import org.eclipse.edc.protocol.spi.DataspaceProfileContextRegistry;
 import org.eclipse.edc.protocol.spi.store.DataspaceProfileStore;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
@@ -104,11 +102,6 @@ public DataspaceProfileStore defaultDataspaceProfileStore() {
     public CallbackRegistry defaultCallbackRegistry() {
         return new CallbackRegistryImpl();
     }
-
-    @Provider(isDefault = true)
-    public DataspaceProfileContextRegistry dataspaceProfileContextRegistry() {
-        return new DataspaceProfileContextRegistryImpl();
-    }
     
     private ContractDefinitionStore getContractDefinitionStore() {
         if (contractDefinitionStore == null) {
diff --git a/core/control-plane/control-plane-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/core/control-plane/control-plane-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -13,5 +13,3 @@
 #
 
 org.eclipse.edc.connector.controlplane.ControlPlaneDefaultServicesExtension
-org.eclipse.edc.connector.controlplane.discovery.DiscoveryDefaultServicesExtension
-org.eclipse.edc.connector.controlplane.discovery.DiscoveryServicesExtension
diff --git a/dist/bom/federatedcatalog-base-bom/build.gradle.kts b/dist/bom/federatedcatalog-base-bom/build.gradle.kts
@@ -17,35 +17,37 @@ plugins {
 }
 
 dependencies {
-    api(project(":core:catalog-crawler:catalog-crawler-core"))
-    api(project(":extensions:federated-catalog:api:federated-catalog-api"))
-    api(project(":spi:control-plane-spi"))
-    api(project(":core:common:lib:core-lib"))
-    api(project(":spi:core-spi"))
 
+    api(project(":core:catalog-crawler:catalog-crawler-core"))
     api(project(":core:common:boot"))
-    api(project(":core:common:runtime-core"))
     api(project(":core:common:connector-core"))
-    api(project(":extensions:common:http:jersey-core"))
-    api(project(":core:common:participant-context-connector-core"))
+    api(project(":core:common:lib:core-lib"))
+    api(project(":core:common:participant-context-config-core"))
     api(project(":core:common:participant-context-connector-classic-core"))
-    api(project(":extensions:common:api:api-observability"))
-    api(project(":extensions:common:configuration:configuration-filesystem"))
-    api(project(":core:common:edr-store-core"))
-    api(project(":extensions:common:api:version-api"))
+    api(project(":core:common:participant-context-connector-core"))
+    api(project(":core:common:participant-context-core"))
+    api(project(":core:common:runtime-core"))
+    api(project(":core:common:token-core"))
+
+    api(project(":data-protocols:dsp:dsp-2025:dsp-http-api-configuration-2025"))
+    api(project(":data-protocols:dsp:dsp-core:dsp-catalog-http-dispatcher"))
+    api(project(":data-protocols:dsp:dsp-core:dsp-http-api-base-configuration"))
+    api(project(":data-protocols:dsp:dsp-core:dsp-http-core"))
 
-    api(project(":extensions:common:console-monitor"))
     api(project(":extensions:common:api:api-core"))
+    api(project(":extensions:common:api:api-observability"))
     api(project(":extensions:common:api:management-api-configuration"))
-    api(project(":extensions:common:auth:auth-tokenbased"))
+    api(project(":extensions:common:api:version-api"))
     api(project(":extensions:common:auth:auth-configuration"))
     api(project(":extensions:common:auth:auth-delegated"))
+    api(project(":extensions:common:auth:auth-tokenbased"))
+    api(project(":extensions:common:configuration:configuration-filesystem"))
+    api(project(":extensions:common:console-monitor"))
     api(project(":extensions:common:http"))
-    api(project(":core:control-plane:control-plane-core"))
+    api(project(":extensions:common:http:jersey-core"))
     api(project(":extensions:common:http:jetty-core"))
-    api(project(":core:common:token-core"))
-    api(project(":core:data-plane-selector:data-plane-selector-core"))
+    api(project(":extensions:federated-catalog:api:federated-catalog-api"))
 
-    api(project(":data-protocols:dsp"))
-    api(project(":data-protocols:data-plane-signaling"))
+    api(project(":spi:control-plane-spi"))
+    api(project(":spi:core-spi"))
 }
diff --git a/extensions/common/events/events-cloud-http/build.gradle.kts b/extensions/common/events/events-cloud-http/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     implementation(libs.failsafe.core)
 
     testImplementation(testFixtures(project(":core:common:junit")))
-    testImplementation(project(":core:common:connector-core"))
     testImplementation(project(":core:common:runtime-core"))
 
     testImplementation(libs.wiremock)
diff --git a/extensions/common/http/jersey-core/build.gradle.kts b/extensions/common/http/jersey-core/build.gradle.kts
@@ -30,7 +30,6 @@ dependencies {
     implementation(libs.jersey.servlet)
 
     testImplementation(project(":core:common:junit"))
-    testImplementation(project(":core:common:connector-core"))
     testImplementation(project(":core:common:runtime-core"))
 
     testImplementation(libs.restAssured)
diff --git a/spi/control-plane-spi/src/main/java/org/eclipse/edc/participant/spi/NoOpParticipantIdMapper.java b/spi/control-plane-spi/src/main/java/org/eclipse/edc/participant/spi/NoOpParticipantIdMapper.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2026 Think-it GmbH
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -8,13 +8,11 @@
  *  SPDX-License-Identifier: Apache-2.0
  *
  *  Contributors:
- *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Think-it GmbH - initial API and implementation
  *
  */
 
-package org.eclipse.edc.connector.core.agent;
-
-import org.eclipse.edc.participant.spi.ParticipantIdMapper;
+package org.eclipse.edc.participant.spi;
 
 /**
  * No-op implementation of the mapper, the ID is already its IRI representation.
diff --git a/system-tests/e2e-federatedcatalog-tests/component-tests/src/test/java/org/eclipse/edc/catalog/ControlPlaneCrawlerComponentTest.java b/system-tests/e2e-federatedcatalog-tests/component-tests/src/test/java/org/eclipse/edc/catalog/ControlPlaneCrawlerComponentTest.java
@@ -122,7 +122,7 @@ void crawlSingle_noResults(TypeTransformerRegistry ttr, TargetNodeDirectory dire
         when(dispatcher.dispatch(any(), eq(byte[].class), isA(CatalogRequestMessage.class)))
                 .thenReturn(emptyCatalog(toBytes(ttr)));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var response = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(response).hasSize(1);
             assertThat(response).allSatisfy(c -> assertThat(c.getDatasets()).isNullOrEmpty());
@@ -137,7 +137,7 @@ void crawlSingle_withResults(TypeTransformerRegistry ttr, TargetNodeDirectory di
                 .thenReturn(randomCatalog(toBytes(ttr), "test-catalog-id", 5))
                 .thenReturn(emptyCatalog(toBytes(ttr))); // this is important, otherwise there is an endless loop!
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).allSatisfy(c -> assertThat(c.getDatasets()).hasSize(5));
         });
@@ -152,7 +152,7 @@ void crawlSingle_withCatalogOfCatalogs(TypeTransformerRegistry ttr, TargetNodeDi
                 .thenReturn(randomCatalog(catalog -> StatusResult.success(TestUtils.getResourceFileContentAsString("catalog_of_catalogs.json").getBytes()), "root-catalog-id", 5))
                 .thenReturn(randomCatalog(catalog -> StatusResult.success(TestUtils.getResourceFileContentAsString("catalog.json").getBytes()), "sub-catalog-id", 5));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).isNotEmpty().allSatisfy(c -> {
                 assertThat(c.getDatasets()).hasSize(2);
@@ -169,7 +169,7 @@ void crawlSingle_verifyOriginator(TypeTransformerRegistry ttr, TargetNodeDirecto
                 .thenReturn(emptyCatalog(toBytes(ttr)));
         directory.insert(targetNode());
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(1);
             assertThat(catalogs.get(0).getDatasets()).hasSize(3);
@@ -188,7 +188,7 @@ void crawlSingle_withPagedResults(TypeTransformerRegistry ttr, TargetNodeDirecto
                 .thenReturn(randomCatalog(toBytes(ttr), "test-catalog-id", 100))
                 .thenReturn(randomCatalog(toBytes(ttr), "test-catalog-id", 50));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs.size()).isEqualTo(1);
             assertThat(catalogs.get(0).getDatasets()).hasSize(250);
@@ -212,7 +212,7 @@ void crawlMultiple_shouldCollectAll(TypeTransformerRegistry ttr, TargetNodeDirec
                 .thenReturn(catalogOf(toBytes(ttr), "catalog-node2", createDataset("offer3")))
                 .thenReturn(emptyCatalog(toBytes(ttr)));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(2);
             assertThat(catalogs.stream().flatMap(c -> c.getDatasets().stream()).map(Dataset::getId))
@@ -257,7 +257,7 @@ void crawlSingle_withDeletions(TypeTransformerRegistry ttr, TargetNodeDirectory
                 .thenReturn(emptyCatalog(toBytes(ttr), catalogId))
                 .thenReturn(completedFuture(result));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(1);
             assertThat(catalogs.get(0).getDatasets()).hasSize(2)
@@ -302,7 +302,7 @@ void crawlSingle_withDeletions_shouldRemove(TypeTransformerRegistry ttr, TargetN
                 .thenReturn(emptyCatalog(toBytes(ttr), "test-catalog-id"))
                 .thenReturn(completedFuture(result));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(1);
             assertThat(catalogs.get(0).getDatasets()).hasSize(2)
@@ -348,7 +348,7 @@ void crawlSingle_withUpdates_shouldReplace(TypeTransformerRegistry ttr, TargetNo
                 .thenReturn(emptyCatalog(toBytes(ttr), "test-catalog-id"))
                 .thenReturn(completedFuture(result));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(1);
             assertThat(catalogs.get(0).getDatasets()).hasSize(3);
@@ -395,7 +395,7 @@ void crawlSingle_withAdditions_shouldAdd(TypeTransformerRegistry ttr, TargetNode
                     return completedFuture(result);
                 });
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(1);
             assertThat(catalogs)
@@ -416,7 +416,7 @@ void crawlSingle_verifyCorrectOriginator(TypeTransformerRegistry ttr, TargetNode
                 .thenReturn(randomCatalog(toBytes(ttr), "test-catalog-id", 5))
                 .thenReturn(emptyCatalog(toBytes(ttr))); // this is important, otherwise there is an endless loop!
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(1);
             assertThat(catalogs.get(0).getDatasets()).hasSize(5);
@@ -471,7 +471,7 @@ void crawlMultiple_whenConflictingAssetIds_shouldOverwrite(TypeTransformerRegist
                 .thenReturn(catalogOf(toBytes(ttr), "catalog-" + node2.targetUrl(), createDataset("offer14"), createDataset("offer32"), /*this one is conflicting:*/createDataset("offer3")))
                 .thenReturn(emptyCatalog(toBytes(ttr)));
 
-        await().untilAsserted(() -> {
+        await().atMost(TEST_TIMEOUT).untilAsserted(() -> {
             var catalogs = queryCatalogApi(jsonLd, jsonObject -> toCatalog(ttr, jsonObject));
             assertThat(catalogs).hasSize(2);
             assertThat(catalogs).anySatisfy(c -> assertThat(c.getProperties().get(PROPERTY_ORIGINATOR).toString()).startsWith("http://test-node1.com"));
diff --git a/system-tests/e2e-federatedcatalog-tests/end2end-test/catalog-runtime/build.gradle.kts b/system-tests/e2e-federatedcatalog-tests/end2end-test/catalog-runtime/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 dependencies {
-    runtimeOnly(project(":dist:bom:federatedcatalog-dcp-bom"))
+    implementation(project(":dist:bom:federatedcatalog-dcp-bom"))
 }
 
 application {
diff --git a/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/build.gradle.kts b/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/build.gradle.kts
@@ -18,18 +18,15 @@ plugins {
 
 dependencies {
     testImplementation(project(":spi:control-plane-spi"))
-    testImplementation(project(":core:catalog-crawler:catalog-crawler-core"))
-    testImplementation(project(":core:common:connector-core"))
+//    testImplementation(project(":core:common:connector-core"))
     testImplementation(project(":core:common:lib:jsonld-lib"))
     testImplementation(project(":core:control-plane:control-plane-transform"))
     testImplementation(libs.awaitility)
-    testImplementation(project(":extensions:control-plane:api:management-api"))
     testImplementation(project(":data-protocols:dsp:dsp-lib"))
     testImplementation(project(":data-protocols:dsp:dsp-2025:dsp-catalog-2025:dsp-catalog-transform-2025"))
     testImplementation(project(":core:common:junit"))
     testImplementation(libs.jackson.datatype.jsr310)
 
-    testCompileOnly(project(":dist:bom:federatedcatalog-base-bom"))
     testCompileOnly(project(":extensions:common:iam:iam-mock"))
     testCompileOnly(project(":system-tests:e2e-federatedcatalog-tests:end2end-test:catalog-runtime"))
     testCompileOnly(project(":system-tests:e2e-federatedcatalog-tests:end2end-test:connector-runtime"))
diff --git a/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/CatalogApiClient.java b/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/CatalogApiClient.java
diff --git a/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/FederatedCatalogTest.java b/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/FederatedCatalogTest.java
diff --git a/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/TestFunctions.java b/system-tests/e2e-federatedcatalog-tests/end2end-test/e2e-junit-runner/src/test/java/org/eclipse/edc/end2end/TestFunctions.java
diff --git a/system-tests/e2e-transfer-test/runner/build.gradle.kts b/system-tests/e2e-transfer-test/runner/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*/`
`14`	`14`
`15`		`-package org.eclipse.edc.connector.controlplane.discovery;`
	`15`	`+package org.eclipse.edc.connector.core.discovery;`
`16`	`16`
`17`	`17`	`import org.eclipse.edc.protocol.spi.discovery.DiscoveryRequest;`
`18`	`18`	`import org.eclipse.edc.protocol.spi.discovery.DiscoveryUrlResolver;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2025 Cofinity-X`
	`2`	`+ * Copyright (c) 2026 Think-it GmbH`
`3`	`3`	`*`
`4`	`4`	`* This program and the accompanying materials are made available under the`
`5`	`5`	`* terms of the Apache License, Version 2.0 which is available at`
`@@ -8,11 +8,11 @@`
`8`	`8`	`* SPDX-License-Identifier: Apache-2.0`
`9`	`9`	`*`
`10`	`10`	`* Contributors:`
`11`		`- * Cofinity-X - initial API and implementation`
	`11`	`+ * Think-it GmbH - initial API and implementation`
`12`	`12`	`*`
`13`	`13`	`*/`
`14`	`14`
`15`		`-package org.eclipse.edc.connector.controlplane.profile;`
	`15`	`+package org.eclipse.edc.connector.core.profile;`
`16`	`16`
`17`	`17`
`18`	`18`	`import org.eclipse.edc.protocol.spi.DataspaceProfileContext;`