From b2254393d1d0d085f21b0a7be97bffb437adb467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Sch=C3=B6nenberg?= Date: Fri, 19 Jan 2024 14:21:18 +0100 Subject: [PATCH 1/9] Add logging-house-client --- build.gradle.kts | 7 +++++++ launchers/common/base-mds/build.gradle.kts | 1 + 2 files changed, 8 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 2f094e0d3..a71e08163 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -78,6 +78,13 @@ allprojects { maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") } + maven { + url = uri("https://maven.pkg.github.com/truzzt/mds-ap3") + credentials { + username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN") + } + } } } diff --git a/launchers/common/base-mds/build.gradle.kts b/launchers/common/base-mds/build.gradle.kts index fd7913a3f..e20c0b435 100644 --- a/launchers/common/base-mds/build.gradle.kts +++ b/launchers/common/base-mds/build.gradle.kts @@ -8,6 +8,7 @@ dependencies { // Currently there are no mds-specific EDC extensions // The MDS broker and MDS clearing house extensions are in the process of being migrated to the DSP protocol + implementation("logging-house:logging-house-client:0.1.0") } val sovityEdcGroup: String by project From 831b8134cc45a24ee5b2db8f14a0b6e18b86d16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Sch=C3=B6nenberg?= Date: Fri, 19 Jan 2024 16:25:01 +0100 Subject: [PATCH 2/9] Add description of PR changes to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3079789eb..13bf3fd84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Major Changes #### Minor Changes +- Logginghouse-Client: Add logging-house-client extension 0.1.0 #### Patch Changes - Docs: Enhanced starting a Http-Pull over the EDC-Ui documentation From ed1c81c5c30fbdc43a0fb2049c1c495bdaef4cd6 Mon Sep 17 00:00:00 2001 From: "D.Hommen" <75446820+dhommen@users.noreply.github.com> Date: Fri, 19 Jan 2024 16:47:29 +0100 Subject: [PATCH 3/9] chore(changelog): update deployment migration notes with new env --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13bf3fd84..1e122fae3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). - Docs: Enhanced starting a Http-Pull over the EDC-Ui documentation ### Deployment Migration Notes +- new logging-house-client env for mds: + - ```CLEARINGHOUSE_CLIENT_EXTENSION_ENABLED:``` "true" + - ```EDC_CLEARINGHOUSE_LOG_URL:``` https://example.com #### Compatible Versions From 4b13a984a89b01f8a3030421b17ddce40b9a2307 Mon Sep 17 00:00:00 2001 From: dhommen Date: Tue, 23 Jan 2024 16:48:40 +0100 Subject: [PATCH 4/9] chore(logging-house-extension): adjusting surrounding comments --- launchers/common/base-mds/build.gradle.kts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/launchers/common/base-mds/build.gradle.kts b/launchers/common/base-mds/build.gradle.kts index e20c0b435..f046828c5 100644 --- a/launchers/common/base-mds/build.gradle.kts +++ b/launchers/common/base-mds/build.gradle.kts @@ -3,11 +3,6 @@ plugins { } dependencies { - // MDS Related EDC Extensions - // [...] - - // Currently there are no mds-specific EDC extensions - // The MDS broker and MDS clearing house extensions are in the process of being migrated to the DSP protocol implementation("logging-house:logging-house-client:0.1.0") } From ef56693bcd36a2e7308ffe5290b33cd4b51f4588 Mon Sep 17 00:00:00 2001 From: dhommen Date: Wed, 24 Jan 2024 13:31:33 +0100 Subject: [PATCH 5/9] fix(ci): add USERNAME and TOKEN to build job for github maven repo --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c23ee2701..f4fa54181 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,6 +79,9 @@ jobs: uses: gradle/gradle-build-action@v2.10.0 with: arguments: build ${{ env.GRADLE_ARGS }} + env: + USERNAME: ${{ github.actor }} + TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Gradle: Publish (Main & Release Only)" uses: gradle/gradle-build-action@v2.10.0 if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }} From a40fc87884ede91a0fefb093adaf5261dcec84d3 Mon Sep 17 00:00:00 2001 From: dhommen Date: Wed, 24 Jan 2024 20:55:23 +0100 Subject: [PATCH 6/9] fix(ci): disable docker images and add_pullrequest_to_project for fork prs --- .github/workflows/add_pullrequest_to_project.yml | 1 + .github/workflows/ci.yml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/add_pullrequest_to_project.yml b/.github/workflows/add_pullrequest_to_project.yml index 9ca64829c..354a936ce 100644 --- a/.github/workflows/add_pullrequest_to_project.yml +++ b/.github/workflows/add_pullrequest_to_project.yml @@ -5,6 +5,7 @@ on: jobs: add_pullrequest_to_project: + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} name: add_pullrequest_to_project runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4fa54181..e240d82ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,6 +91,7 @@ jobs: USERNAME: ${{ github.actor }} TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Docker Image: edc-dev" + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} uses: ./.github/actions/build-connector-image with: registry-url: ${{ env.REGISTRY_URL }} @@ -102,6 +103,7 @@ jobs: title: "sovity Dev EDC Connector" description: "Extended EDC Connector built by sovity. This dev version contains no dataspace auth and can be used to quickly start a locally running EDC + EDC UI." - name: "Docker Image: edc-ce" + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} uses: ./.github/actions/build-connector-image with: registry-url: ${{ env.REGISTRY_URL }} @@ -113,6 +115,7 @@ jobs: title: "sovity Community Edition EDC Connector" description: "EDC Connector built by sovity. Contains sovity's Community Edition EDC extensions and requires dataspace credentials to join an existing dataspace." - name: "Docker Image: edc-ce-mds" + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} uses: ./.github/actions/build-connector-image with: registry-url: ${{ env.REGISTRY_URL }} @@ -124,6 +127,7 @@ jobs: title: "MDS Community Edition EDC Connector" description: "EDC Connector built by sovity and configured for compatibility with the Mobility Data Space (MDS). This EDC requires dataspace credentials, and additional MDS Services such as a Clearing House." - name: "Docker Image: test-backend" + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} uses: ./.github/actions/build-connector-image with: registry-url: ${{ env.REGISTRY_URL }} From 6314b8381dd5da9eb9e623b7ff972e96b197f483 Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 16:10:26 +0100 Subject: [PATCH 7/9] chore(logging-house-client): bump version --- launchers/common/base-mds/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/common/base-mds/build.gradle.kts b/launchers/common/base-mds/build.gradle.kts index f046828c5..82440da2f 100644 --- a/launchers/common/base-mds/build.gradle.kts +++ b/launchers/common/base-mds/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("logging-house:logging-house-client:0.1.0") + implementation("logging-house:logging-house-client:0.1.1") } val sovityEdcGroup: String by project From 808de1303cd04c08ec0ab9ad9ee1baf209e05c0e Mon Sep 17 00:00:00 2001 From: dhommen Date: Thu, 25 Jan 2024 16:12:30 +0100 Subject: [PATCH 8/9] chore: remove offline maven repo --- build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a71e08163..c0edb65e6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -72,9 +72,6 @@ allprojects { repositories { mavenCentral() mavenLocal() - maven { - url = uri("https://maven.iais.fraunhofer.de/artifactory/eis-ids-public/") - } maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") } From 4b2b821c0c19774cfe6e8f7e9e59f3bf448b57f6 Mon Sep 17 00:00:00 2001 From: dhommen Date: Wed, 27 Mar 2024 08:59:58 +0100 Subject: [PATCH 9/9] chore(lh-extension): bump version --- build.gradle.kts | 7 +++++++ launchers/common/base-mds/build.gradle.kts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c0edb65e6..43a3c44f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -82,6 +82,13 @@ allprojects { password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN") } } + maven { + url = uri("https://maven.pkg.github.com/ids-basecamp/ids-infomodel-java") + credentials { + username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN") + } + } } } diff --git a/launchers/common/base-mds/build.gradle.kts b/launchers/common/base-mds/build.gradle.kts index 82440da2f..6508b1b9d 100644 --- a/launchers/common/base-mds/build.gradle.kts +++ b/launchers/common/base-mds/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation("logging-house:logging-house-client:0.1.1") + implementation("logging-house:logging-house-client:0.2.9") } val sovityEdcGroup: String by project