Remove DSP version 2024/1 from Eclipse Tractus-X connector implementation (eclipse-tractusx#2554)

* Remove 2024/1 version from runtime

Signed-off-by: Lars Geyer-Blaumeiser <lars.blaumeiser@cofinity-x.com>

* Remove 2024-1 from repository

Signed-off-by: Lars Geyer-Blaumeiser <lars.blaumeiser@cofinity-x.com>

---------

Signed-off-by: Lars Geyer-Blaumeiser <lars.blaumeiser@cofinity-x.com>

Author: lgblaumeiser

core/json-ld-core/src/main/resources/document/dspace.jsonld

@@ -32,7 +32,9 @@ configurations.all {
 }
 
 dependencies {
-    runtimeOnly(libs.edc.bom.controlplane.base)
+    runtimeOnly(libs.edc.bom.controlplane.base) {
+        exclude(module = "dsp-2024")
+    }
     runtimeOnly(libs.edc.bom.controlplane.dcp)
 
     runtimeOnly(libs.edc.bom.federatedcatalog.base)

edc-controlplane/edc-controlplane-base/build.gradle.kts

@@ -34,7 +34,6 @@ dependencies {
 
     implementation(libs.dsp.spi.http)
     implementation(libs.dsp.spi.v08)
-    implementation(libs.dsp.spi.v2024)
 
     implementation(libs.edc.spi.participant)
     implementation(libs.edc.spi.protocol)

edc-extensions/dataspace-protocol/cx-dataspace-protocol/build.gradle.kts

@@ -38,9 +38,6 @@
 
 import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP;
 import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.V_08;
-import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1;
-import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1;
-import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH;
 
 public class CxDataspaceProtocolExtension implements ServiceExtension {
 
@@ -59,9 +56,7 @@ public class CxDataspaceProtocolExtension implements ServiceExtension {
     @Override
     public void initialize(ServiceExtensionContext context) {
         Stream.of(
-                new DataspaceProfileContext(DATASPACE_PROTOCOL_HTTP, V_08, () -> dspWebhookAddress.get(), new BpnExtractionFunction(monitor)),
-                // currently required for DCP TCK tests
-                new DataspaceProfileContext(DATASPACE_PROTOCOL_HTTP_V_2024_1, V_2024_1, () -> dspWebhookAddress.get() + V_2024_1_PATH, new BpnExtractionFunction(monitor))
+                new DataspaceProfileContext(DATASPACE_PROTOCOL_HTTP, V_08, () -> dspWebhookAddress.get(), new BpnExtractionFunction(monitor))
         ).forEach(contextRegistry::register);
     }
 

edc-extensions/dataspace-protocol/cx-dataspace-protocol/src/main/java/org/eclipse/tractusx/edc/protocol/cx/CxDataspaceProtocolExtension.java

@@ -27,7 +27,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP;
-import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1;
 
 public class CatenaxParticipantIdentityResolver implements ParticipantIdentityResolver {
     private final String bpn;
@@ -41,7 +40,7 @@ public CatenaxParticipantIdentityResolver(String bpn, ParticipantContextSupplier
     @Nullable
     @Override
     public String getParticipantId(String participantContextId, String protocol) {
-        if (DATASPACE_PROTOCOL_HTTP.equals(protocol) || DATASPACE_PROTOCOL_HTTP_V_2024_1.equals(protocol)) {
+        if (DATASPACE_PROTOCOL_HTTP.equals(protocol)) {
             return bpn;
         }
         return participantContextSupplier.get().map(ParticipantContext::getIdentity)

edc-extensions/dataspace-protocol/cx-dataspace-protocol/src/main/java/org/eclipse/tractusx/edc/protocol/cx/identifier/CatenaxParticipantIdentityResolver.java

@@ -27,20 +27,12 @@
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
-import org.junit.jupiter.params.provider.ArgumentsSource;
 
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.CX_CREDENTIAL_NS;
 
 public abstract class MembershipCredentialIdExtractionFunctionTest {
 

edc-extensions/dataspace-protocol/dataspace-protocol-core/src/testFixtures/java/org/eclipse/tractusx/edc/protocol/core/identifier/MembershipCredentialIdExtractionFunctionTest.java

@@ -169,7 +169,6 @@ tck-extension = { module = "org.eclipse.edc:tck-extension", version.ref = "edc"
 # DSP libraries
 dsp-spi-http = { module = "org.eclipse.edc:dsp-http-spi", version.ref = "edc" }
 dsp-spi-v08 = { module = "org.eclipse.edc:dsp-spi-08", version.ref = "edc" }
-dsp-spi-v2024 = { module = "org.eclipse.edc:dsp-spi-2024", version.ref = "edc" }
 dsp-spi-v2025 = { module = "org.eclipse.edc:dsp-spi-2025", version.ref = "edc" }
 
 # Federated Catalog modules