refactor: update to EDC 0.1.0 release (eclipse-edc#60)

.github/actions/setup-build/action.yml

@@ -7,6 +7,3 @@ runs:
       with:
         java-version: '17'
         distribution: 'temurin'
-
-    - name: Setup Gradle cache
-      uses: gradle/gradle-build-action@v2

.github/workflows/verify.yaml

@@ -26,7 +26,7 @@ jobs:
       - uses: ./.github/actions/setup-build
 
       - name: Run Checkstyle
-        run: ./gradlew checkstyleMain checkstyleTest checkstyleTestFixtures
+        run: ./gradlew checkstyleMain checkstyleTest
 
   Build:
     runs-on: ubuntu-latest
@@ -37,85 +37,6 @@ jobs:
       - name: Build project
         run: ./gradlew build
 
-
-  Sanity-Check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-build
-
-      - name: Check Sample basic-01
-        run: |
-          ./gradlew :basic:basic-01-basic-connector:shadowJar
-          echo "Checking Sample basic-01"
-          java -jar basic/basic-01-basic-connector/build/libs/basic-connector.jar > log.txt &
-          sleep 5
-          grep "INFO.*edc-.*ready" log.txt
-          rm log.txt
-          killall java
-
-      - name: Check Sample basic-02
-        run: |
-          ./gradlew :basic:basic-02-health-endpoint:shadowJar
-          echo "Checking Sample basic-02"
-          java -jar basic/basic-02-health-endpoint/build/libs/connector-health.jar > log.txt &
-          sleep 5
-          grep "INFO.*edc-.*ready" log.txt
-          rm log.txt
-          killall java
-
-      - name: Check Sample basic-03
-        run: |
-          ./gradlew :basic:basic-03-configuration:shadowJar
-          echo "Checking Sample basic-03"
-          java -Dedc.fs.config=basic/basic-03-configuration/config.properties -jar basic/basic-03-configuration/build/libs/filesystem-config-connector.jar > log.txt &
-          sleep 5
-          grep "INFO.*edc-.*ready" log.txt
-          rm log.txt
-          killall java
-
-      - name: Check Sample transfer-01 (Consumer)
-        run: |
-          ./gradlew :transfer:transfer-01-file-transfer:file-transfer-consumer:shadowJar
-          echo "Checking Sample transfer-01 - Consumer"
-          java -Dedc.fs.config=transfer/transfer-01-file-transfer/file-transfer-consumer/config.properties -jar transfer/transfer-01-file-transfer/file-transfer-consumer/build/libs/consumer.jar > log.txt &
-          sleep 5
-          grep "INFO.*edc-.*ready" log.txt
-          rm log.txt
-          killall java
-
-      - name: Check Sample transfer-01 (Provider)
-        run: |
-          echo "Checking Sample transfer-01 - Provider"
-          ./gradlew :transfer:transfer-01-file-transfer:file-transfer-provider:shadowJar
-          java -Dedc.fs.config=transfer/transfer-01-file-transfer/file-transfer-provider/config.properties -jar transfer/transfer-01-file-transfer/file-transfer-provider/build/libs/provider.jar > log.txt &
-          sleep 5
-          grep "INFO.*edc-.*ready" log.txt
-          rm log.txt
-          killall java
-
-      - name: Check Sample transfer-02 (Consumer)
-        run: |
-          echo "Checking Sample transfer-02 - Consumer"
-          ./gradlew :transfer:transfer-02-file-transfer-listener:file-transfer-listener-consumer:shadowJar
-          java -Dedc.fs.config=transfer/transfer-02-file-transfer-listener/file-transfer-listener-consumer/config.properties -jar transfer/transfer-02-file-transfer-listener/file-transfer-listener-consumer/build/libs/consumer.jar > log.txt &
-          sleep 5
-          grep "INFO.*edc-.*ready" log.txt
-          rm log.txt
-          killall java
-
-      - name: Check Sample transfer-03 (Command-Q/Watchdog)
-        run: |
-          echo "Checking Sample transfer-03 - Command-Q/Watchdog"
-          ./gradlew :transfer:transfer-03-modify-transferprocess:modify-transferprocess-consumer:shadowJar
-          java -Dedc.fs.config=transfer/transfer-03-modify-transferprocess/modify-transferprocess-consumer/config.properties -jar transfer/transfer-03-modify-transferprocess/modify-transferprocess-consumer/build/libs/consumer.jar > log.txt &
-          sleep 5
-          grep "INFO.*edc-.*ready" log.txt
-          rm log.txt
-          killall java
-
-      # we cannot check sample 5 currently because we'd need repo secrets for that (client id,...)
-
   End-To-End-Tests:
     runs-on: ubuntu-latest
     steps:

basic/basic-01-basic-connector/README.md

@@ -12,7 +12,7 @@ that contains the essential dependencies. We'll need at least the following thin
 
 ```kotlin
 dependencies {
-    implementation("$groupId:control-plane-core:$edcVersion")
+    implementation(libs.edc.control.plane.core)
 }
 ```
 
@@ -59,4 +59,4 @@ scenarios.
 
 ---
 
-[Next Chapter](../basic-02-health-endpoint/README.md)
+[Next Chapter](../basic-02-health-endpoint/README.md)

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

@@ -19,11 +19,9 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
-val groupId: String by project
-val edcVersion: String by project
-
 dependencies {
-    implementation("$groupId:control-plane-core:$edcVersion")
+    implementation(libs.edc.boot)
+    implementation(libs.edc.connector.core)
 }
 
 application {

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

@@ -19,13 +19,11 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
-val groupId: String by project
-val edcVersion: String by project
-
 dependencies {
-    implementation("$groupId:control-plane-core:$edcVersion")
+    implementation(libs.edc.boot)
+    implementation(libs.edc.connector.core)
 
-    implementation("$groupId:http:$edcVersion")
+    implementation(libs.edc.http)
 
     implementation(libs.jakarta.rsApi)
 }

basic/basic-03-configuration/README.md

@@ -14,7 +14,7 @@ the `configuration-filesystem` module to the dependency list:
 ```kotlin
 dependencies {
     // ...
-    implementation("$groupId:configuration-filesystem:$edcVersion")
+    implementation(libs.edc.configuration.filesystem)
     // ...
 }
 ```
@@ -152,7 +152,7 @@ module. Therefore, we need to add the following module to the dependency list in
 ```kotlin
 dependencies {
     // ...
-    implementation("$groupId:management-api:$edcVersion")
+    implementation(libs.edc.management.api)
     // ...
 }
 ```
@@ -167,7 +167,7 @@ necessary to provide the following configuration to the connector:
 web.http.port=9191
 web.http.path=/api
 web.http.management.port=9192
-web.http.management.path=/api/v1/management
+web.http.management.path=/management
 ```
 
 _**Caution**: If you do not provide this configuration, it leads to the problem that the authentication mechanism is

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

@@ -20,16 +20,13 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
-val groupId: String by project
-val edcVersion: String by project
-
 dependencies {
-    implementation("$groupId:control-plane-core:$edcVersion")
-    implementation("$groupId:http:$edcVersion")
-
-    implementation("$groupId:management-api:$edcVersion")
+    implementation(libs.edc.boot)
+    implementation(libs.edc.connector.core)
+    
+    implementation(libs.edc.http)
 
-    implementation("$groupId:configuration-filesystem:$edcVersion")
+    implementation(libs.edc.configuration.filesystem)
 
     implementation(libs.jakarta.rsApi)
 }

basic/basic-03-configuration/config.properties

@@ -1,5 +1,5 @@
 web.http.port=9191
 web.http.path=/api
 web.http.management.port=9192
-web.http.management.path=/api/v1/management
+web.http.management.path=/management
 edc.samples.basic.03.logprefix=MyLogPrefix

build.gradle.kts

@@ -21,37 +21,30 @@ repositories {
     mavenCentral()
 }
 
-val javaVersion: String by project
-val groupId: String by project
-val defaultVersion: String by project
-val annotationProcessorVersion: String by project
-val metaModelVersion: String by project
-
-val actualVersion: String = (project.findProperty("version") ?: defaultVersion) as String
+val edcVersion: String by project
 
 buildscript {
     dependencies {
-        val edcGradlePluginsVersion: String by project
-        classpath("org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin:${edcGradlePluginsVersion}")
+        val edcVersion: String by project
+        classpath("org.eclipse.edc.edc-build:org.eclipse.edc.edc-build.gradle.plugin:${edcVersion}")
     }
 }
 
 allprojects {
-    apply(plugin = "${groupId}.edc-build")
+    apply(plugin = "$group.edc-build")
 
     // configure which version of the annotation processor to use. defaults to the same version as the plugin
     configure<org.eclipse.edc.plugins.autodoc.AutodocExtension> {
-        processorVersion.set(annotationProcessorVersion)
+        processorVersion.set(edcVersion)
         outputDirectory.set(project.buildDir)
     }
 
     configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
         versions {
             // override default dependency versions here
-            projectVersion.set(actualVersion)
-            metaModel.set(metaModelVersion)
+            projectVersion.set(edcVersion)
+            metaModel.set(edcVersion)
         }
-        javaLanguageVersion.set(JavaLanguageVersion.of(javaVersion))
         publish.set(false)
     }
 
@@ -68,4 +61,4 @@ allprojects {
         }
     }
 
-}
+}

gradle.properties

@@ -1,9 +1,2 @@
-groupId=org.eclipse.edc
-edcVersion=0.0.1-milestone-8
-defaultVersion=0.0.1-SNAPSHOT
-javaVersion=11
-
-# configure the build:
-annotationProcessorVersion=0.0.1-SNAPSHOT
-edcGradlePluginsVersion=0.0.1-SNAPSHOT
-metaModelVersion=0.0.1-SNAPSHOT
+group=org.eclipse.edc
+edcVersion=0.1.0

gradle/libs.versions.toml

@@ -1,10 +1,12 @@
 [metadata]
 format.version = "1.1"
 
-
 [versions]
 assertj = "3.24.2"
 awaitility = "4.2.0"
+edc = "0.1.0"
+jakarta-json = "2.0.1"
+junit-pioneer = "2.0.1"
 jupiter = "5.9.3"
 openTelemetry = "1.18.0"
 restAssured = "5.3.0"
@@ -14,12 +16,51 @@ rsApi = "3.1.0"
 [libraries]
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
+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-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" }
+edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" }
+edc-data-plane-api = { module = "org.eclipse.edc:data-plane-api", version.ref = "edc" }
+edc-data-plane-aws-s3 = { module = "org.eclipse.edc:data-plane-aws-s3", version.ref = "edc" }
+edc-data-plane-azure-storage = { module = "org.eclipse.edc:data-plane-azure-storage", version.ref = "edc" }
+edc-data-plane-client = { module = "org.eclipse.edc:data-plane-client", version.ref = "edc" }
+edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" }
+edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" }
+edc-data-plane-selector-api = { module = "org.eclipse.edc:data-plane-selector-api", version.ref = "edc" }
+edc-data-plane-selector-client = { module = "org.eclipse.edc:data-plane-selector-client", version.ref = "edc" }
+edc-data-plane-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
+edc-data-plane-spi = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" }
+edc-data-plane-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" }
+edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
+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-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" }
+edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" }
+edc-provision-aws-s3 = { module = "org.eclipse.edc:provision-aws-s3", version.ref = "edc" }
+edc-runtime-metamodel = { module = "org.eclipse.edc:runtime-metamodel", version.ref = "edc" }
+edc-transfer-data-plane = { module = "org.eclipse.edc:transfer-data-plane", version.ref = "edc" }
+edc-transfer-process-api = { module = "org.eclipse.edc:transfer-process-api", version.ref = "edc" }
+edc-transfer-pull-http-receiver = { module = "org.eclipse.edc:transfer-pull-http-receiver", version.ref = "edc" }
+edc-transfer-spi = { module = "org.eclipse.edc:transfer-spi", version.ref = "edc" }
+edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
+edc-vault-azure = { module = "org.eclipse.edc:vault-azure", version.ref = "edc" }
+edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.ref = "edc" }
 jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
+jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
 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" }
 opentelemetry-annotations = { module = "io.opentelemetry:opentelemetry-extension-annotations", version.ref = "openTelemetry" }
 restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
 
-
 [plugins]
-shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }

other/custom-runtime/build.gradle.kts

@@ -18,15 +18,12 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
-val groupId: String by project
-val edcVersion: String by project
-
 dependencies {
-    api("$groupId:boot:$edcVersion")
-    implementation("$groupId:ids:$edcVersion")
+    api(libs.edc.boot)
+    implementation(libs.edc.dsp)
 
-    implementation("$groupId:iam-mock:$edcVersion")
-    implementation("$groupId:configuration-filesystem:$edcVersion")
+    implementation(libs.edc.iam.mock)
+    implementation(libs.edc.configuration.filesystem)
 
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)
@@ -45,4 +42,4 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     mergeServiceFiles()
     archiveFileName.set("custom-runtime.jar")
     dependsOn(distTar, distZip)
-}
+}

other/custom-runtime/src/main/java/org/eclipse/edc/sample/runtime/CustomRuntime.java

@@ -19,8 +19,6 @@
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ConfigurationExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.spi.telemetry.Telemetry;
-import org.eclipse.edc.spi.types.TypeManager;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -41,9 +39,9 @@ protected String getRuntimeName(ServiceExtensionContext context) {
     }
 
     @Override
-    protected @NotNull ServiceExtensionContext createContext(TypeManager typeManager, Monitor monitor, Telemetry telemetry) {
+    protected @NotNull ServiceExtensionContext createContext(Monitor monitor) {
         //override the default service extension context with a super customized one
-        return new SuperCustomExtensionContext(typeManager, monitor, telemetry, loadConfigurationExtensions());
+        return new SuperCustomExtensionContext(monitor, loadConfigurationExtensions());
     }
 
     @Override
@@ -55,8 +53,8 @@ protected void shutdown() {
     }
 
     private static class SuperCustomExtensionContext extends DefaultServiceExtensionContext {
-        SuperCustomExtensionContext(TypeManager typeManager, Monitor monitor, Telemetry telemetry, List<ConfigurationExtension> configurationExtensions) {
-            super(typeManager, monitor, telemetry, configurationExtensions);
+        SuperCustomExtensionContext(Monitor monitor, List<ConfigurationExtension> configurationExtensions) {
+            super(monitor, configurationExtensions);
         }
     }
 }