Merge branch 'eclipse-edc:main' into feat/101-streaming-kafka-to-http

basic/basic-01-basic-connector/build.gradle.kts

@@ -16,7 +16,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {

basic/basic-02-health-endpoint/build.gradle.kts

@@ -16,7 +16,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {

basic/basic-03-configuration/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {

build.gradle.kts

@@ -21,15 +21,14 @@ repositories {
     mavenCentral()
 }
 
-val edcVersion: String by project
-
 buildscript {
     dependencies {
-        val edcVersion: String by project
-        classpath("org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin:${edcVersion}")
+        classpath(libs.edc.build.plugin)
     }
 }
 
+val edcVersion = libs.versions.edc
+
 allprojects {
     apply(plugin = "$group.edc-build")
 
@@ -42,7 +41,6 @@ allprojects {
     configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
         versions {
             // override default dependency versions here
-            projectVersion.set(edcVersion)
             metaModel.set(edcVersion)
         }
         publish.set(false)
@@ -53,7 +51,6 @@ allprojects {
         configDirectory.set(rootProject.file("resources"))
     }
 
-
     // EdcRuntimeExtension uses this to determine the runtime classpath of the module to run.
     tasks.register("printClasspath") {
         doLast {

gradle.properties

@@ -1,2 +1 @@
 group=org.eclipse.edc
-edcVersion=0.1.0

gradle/libs.versions.toml

@@ -8,6 +8,7 @@ edc = "0.2.1"
 jakarta-json = "2.0.1"
 junit-pioneer = "2.0.1"
 jupiter = "5.10.0"
+okhttp-mockwebserver = "5.0.0-alpha.11"
 openTelemetry = "1.18.0"
 restAssured = "5.3.1"
 rsApi = "3.1.0"
@@ -20,6 +21,7 @@ edc-api-core = { module = "org.eclipse.edc:api-core", version.ref = "edc" }
 edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" }
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
 edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
+edc-build-plugin = { module = "org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin", version.ref = "edc" }
 edc-configuration-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
 edc-connector-core = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
 edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
@@ -40,6 +42,7 @@ edc-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
 edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
 edc-jersey-micrometer = { module = "org.eclipse.edc:jersey-micrometer", version.ref = "edc" }
 edc-jetty-micrometer = { module = "org.eclipse.edc:jetty-micrometer", version.ref = "edc" }
+edc-json-ld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-management-api = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
 edc-micrometer-core = { module = "org.eclipse.edc:micrometer-core", version.ref = "edc" }
@@ -59,6 +62,7 @@ junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.re
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "jupiter" }
 junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" }
+okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp-mockwebserver" }
 opentelemetry-annotations = { module = "io.opentelemetry:opentelemetry-extension-annotations", version.ref = "openTelemetry" }
 restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
 

other/custom-runtime/build.gradle.kts

@@ -15,7 +15,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.shadow)
 }
 
 dependencies {

settings.gradle.kts

@@ -54,10 +54,12 @@ include(":transfer:transfer-05-file-transfer-cloud:cloud-transfer-provider")
 include(":transfer:transfer-05-file-transfer-cloud:transfer-file-cloud")
 
 include("transfer:transfer-06-consumer-pull-http:http-pull-connector")
-include("transfer:transfer-06-consumer-pull-http:consumer-pull-backend-service")
-
 include("transfer:transfer-07-provider-push-http:http-push-connector")
-include("transfer:transfer-07-provider-push-http:provider-push-http-backend-service")
+
+include("transfer:streaming:streaming-01-http-to-http:streaming-01-runtime")
+
+include("util:http-request-logger")
+
 
 include("transfer:streaming:streaming-02-kafka-to-http:streaming-02-runtime")
 

system-tests/build.gradle.kts

@@ -17,10 +17,12 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.edc.junit)
     implementation(libs.edc.transfer.spi)
 
+    testImplementation(libs.edc.junit)
+    testImplementation(libs.edc.json.ld)
     testImplementation(libs.awaitility)
+    testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.restAssured)
 
     // runtimes
@@ -31,4 +33,5 @@ dependencies {
     testCompileOnly(project(":transfer:transfer-01-file-transfer:file-transfer-provider"))
     testCompileOnly(project(":transfer:transfer-02-file-transfer-listener:file-transfer-listener-consumer"))
     testCompileOnly(project(":transfer:transfer-03-modify-transferprocess:modify-transferprocess-consumer"))
+    testCompileOnly(project(":transfer:streaming:streaming-01-http-to-http:streaming-01-runtime"))
 }

system-tests/src/test/java/org/eclipse/edc/samples/transfer/FileTransferSampleTestCommon.java

@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.Map;
 
@@ -36,7 +37,7 @@
 import static org.hamcrest.Matchers.not;
 
 /**
- * Encapsulates common settings, test steps, and helper methods for the test for samples 4.x.
+ * Encapsulates common settings, test steps, and helper methods for transfer samples
  */
 public class FileTransferSampleTestCommon {
 
@@ -78,6 +79,19 @@ public static File getFileFromRelativePath(String relativePath) {
         return new File(TestUtils.findBuildRoot(), relativePath);
     }
 
+    /**
+     * Resolves a {@link File} instance from a relative path.
+     */
+    @NotNull
+    public static String getFileContentFromRelativePath(String relativePath) {
+        var fileFromRelativePath = getFileFromRelativePath(relativePath);
+        try {
+            return Files.readString(Paths.get(fileFromRelativePath.toURI()));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * Assert that prerequisites are fulfilled before running the test.
      * This assertion checks only whether the file to be copied is not existing already.