Skip to content

Commit b1d783c

Browse files
committed
add single context module
1 parent 269d009 commit b1d783c

26 files changed

Lines changed: 84 additions & 115 deletions

File tree

advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ application {
3535
mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
3636
}
3737

38-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
38+
tasks.shadowJar {
3939
mergeServiceFiles()
4040
archiveFileName.set("connector.jar")
4141
duplicatesStrategy = DuplicatesStrategy.INCLUDE

advanced/advanced-02-custom-runtime/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ application {
3333
var distTar = tasks.getByName("distTar")
3434
var distZip = tasks.getByName("distZip")
3535

36-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
36+
tasks.shadowJar {
3737
mergeServiceFiles()
3838
archiveFileName.set("custom-runtime.jar")
3939
dependsOn(distTar, distZip)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ application {
3030
mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
3131
}
3232

33-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
33+
tasks.shadowJar {
3434
mergeServiceFiles()
3535
archiveFileName.set("basic-connector.jar")
3636
duplicatesStrategy = DuplicatesStrategy.INCLUDE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ application {
3333
mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
3434
}
3535

36-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
36+
tasks.shadowJar {
3737
mergeServiceFiles()
3838
archiveFileName.set("connector-health.jar")
3939
duplicatesStrategy = DuplicatesStrategy.INCLUDE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ application {
3636
mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
3737
}
3838

39-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
39+
tasks.shadowJar {
4040
mergeServiceFiles()
4141
archiveFileName.set("filesystem-config-connector.jar")
4242
duplicatesStrategy = DuplicatesStrategy.INCLUDE

federated-catalog/fc-00-basic/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ essential for FC, without any additional functionality.
1717
```shell
1818
...
1919
dependencies {
20-
implementation(libs.edc.fc.spi.crawler)
21-
runtimeOnly(libs.fc.core)
22-
runtimeOnly(libs.fc.ext.api)
20+
runtimeOnly(libs.edc.federatedcatalog.base.bom)
2321
}
2422
...
2523
```

federated-catalog/fc-00-basic/fixed-node-resolver/src/main/java/org/eclipse/edc/sample/extension/fc/CatalogNodeDirectory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class CatalogNodeDirectory implements TargetNodeDirectory {
2525
public List<TargetNode> getAll() {
2626
var participantNode = new TargetNode("https://w3id.org/edc/v0.0.1/ns/",
2727
"provider",
28-
"http://localhost:19194/protocol", List.of("dataspace-protocol-http"));
28+
"http://localhost:19194/protocol/2025-1", List.of("dataspace-protocol-http:2025-1"));
2929

3030
return List.of(participantNode);
3131
}

federated-catalog/fc-01-embedded/fc-connector/build.gradle.kts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,11 @@ plugins {
1919
}
2020

2121
dependencies {
22-
runtimeOnly(project(":federated-catalog:fc-00-basic:federated-catalog-base"))
23-
runtimeOnly(project(":federated-catalog:fc-00-basic:fixed-node-resolver"))
22+
implementation(project(":federated-catalog:fc-00-basic:federated-catalog-base"))
23+
implementation(project(":federated-catalog:fc-00-basic:fixed-node-resolver"))
2424

25-
implementation(libs.edc.runtime.core)
26-
implementation(libs.edc.connector.core)
27-
implementation(libs.edc.control.plane.core)
28-
implementation(libs.edc.configuration.filesystem)
29-
implementation(libs.edc.management.api)
30-
implementation(libs.edc.dsp)
31-
implementation(libs.edc.iam.mock)
32-
implementation(libs.edc.http)
33-
implementation(libs.edc.edr.store.core)
25+
runtimeOnly(libs.edc.bom.controlplane.base)
26+
runtimeOnly(libs.edc.iam.mock)
3427

3528
}
3629

@@ -41,7 +34,7 @@ application {
4134
var distTar = tasks.getByName("distTar")
4235
var distZip = tasks.getByName("distZip")
4336

44-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
37+
tasks.shadowJar {
4538
mergeServiceFiles()
4639
archiveFileName.set("fc-connector.jar")
4740
dependsOn(distTar, distZip)

federated-catalog/fc-02-standalone/standalone-fc/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies {
3030
runtimeOnly(libs.edc.token.core)
3131
implementation(libs.edc.http)
3232
runtimeOnly(libs.edc.dsp)
33+
runtimeOnly(libs.edc.participant.context.single.core)
3334
implementation(libs.edc.iam.mock)
3435

3536
}
@@ -41,7 +42,7 @@ application {
4142
var distTar = tasks.getByName("distTar")
4243
var distZip = tasks.getByName("distZip")
4344

44-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
45+
tasks.shadowJar {
4546
mergeServiceFiles()
4647
archiveFileName.set("standalone-fc.jar")
4748
dependsOn(distTar, distZip)

federated-catalog/fc-03-static-node-directory/embedded-fc-with-node-resolver/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ dependencies {
2828
implementation(libs.edc.configuration.filesystem)
2929
implementation(libs.edc.management.api)
3030
implementation(libs.edc.dsp)
31+
implementation(libs.edc.participant.context.single.core)
3132
implementation(libs.edc.iam.mock)
3233
implementation(libs.edc.http)
3334
implementation(libs.edc.edr.store.core)
@@ -41,7 +42,7 @@ application {
4142
var distTar = tasks.getByName("distTar")
4243
var distZip = tasks.getByName("distZip")
4344

44-
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
45+
tasks.shadowJar {
4546
mergeServiceFiles()
4647
archiveFileName.set("fc-connector-with-node-resolver.jar")
4748
dependsOn(distTar, distZip)

0 commit comments

Comments
 (0)