Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/lh test rebase #9

Closed
wants to merge 9 commits into from
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ jobs:
uses: gradle/[email protected]
with:
arguments: build ${{ env.GRADLE_ARGS }}
env:
USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Gradle: Publish (Main & Release Only)"
uses: gradle/[email protected]
if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
Expand All @@ -53,6 +56,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 }}
Expand All @@ -64,6 +68,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 }}
Expand All @@ -75,6 +80,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 }}
Expand All @@ -86,6 +92,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 }}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

- UIAsset: Replaced unsafe additional and private properties with safer alternative fields `customJsonAsString` (**not** affected by Json LD manipulation) and `customJsonLdAsString` (affected by Json LD manipulation), along with their private counterparts.
- API Wrapper: TS Client Library now supports OAuth Client Credentials
Expand All @@ -25,6 +26,9 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
- Add e2e test for double encoding of query parameters

### Deployment Migration Notes
- new logging-house-client env for mds:
- ```CLEARINGHOUSE_CLIENT_EXTENSION_ENABLED:``` "true"
- ```EDC_CLEARINGHOUSE_LOG_URL:``` https://example.com

- EDC UI:
- New **optional** environment variable: `EDC_UI_MANAGEMENT_API_URL_SHOWN_IN_DASHBOARD` as override for shown Management API URL on the dashboard
Expand Down
15 changes: 13 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,21 @@ allprojects {
mavenCentral()
mavenLocal()
maven {
url = uri("https://maven.iais.fraunhofer.de/artifactory/eis-ids-public/")
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
}
maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
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")
}
}
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")
}
}
}
}
Expand Down
6 changes: 1 addition & 5 deletions launchers/common/base-mds/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ 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.2.9")
}

val sovityEdcGroup: String by project
Expand Down
Loading