Skip to content

Commit

Permalink
Merge branch 'main' into documentation_refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
tmberthold authored Jan 23, 2024
2 parents 2bd5f23 + e5fee02 commit 78fb58f
Show file tree
Hide file tree
Showing 47 changed files with 2,102 additions and 1,685 deletions.
7 changes: 3 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Env variables for docker-compose.yaml
EDC_IMAGE=ghcr.io/sovity/edc-dev:7.0.0
TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:7.0.0
EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:2.2.0
EDC_IMAGE=ghcr.io/sovity/edc-dev:7.1.1
TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:7.1.1
EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:2.3.1
EDC_UI_ACTIVE_PROFILE=sovity-open-source

32 changes: 11 additions & 21 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,57 +6,47 @@ updates:
schedule:
interval: "weekly"
target-branch: "main"
open-pull-requests-limit: 30
open-pull-requests-limit: 50
labels:
- "dependencies"
- "github"
# Docker
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
target-branch: "main"
open-pull-requests-limit: 30
labels:
- "dependencies"
- "docker"
# Gradle
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "daily"
target-branch: "main"
open-pull-requests-limit: 30
open-pull-requests-limit: 50
labels:
- "dependencies"
- "java"
# Maven
- package-ecosystem: "maven"
directory: "/"
# NPM
- package-ecosystem: "npm"
directory: "/extensions/wrapper/clients/typescript-client-example/"
schedule:
interval: "daily"
target-branch: "main"
open-pull-requests-limit: 30
open-pull-requests-limit: 50
labels:
- "dependencies"
- "java"
- "javascript"
# NPM
- package-ecosystem: "npm"
directory: "/"
directory: "/extensions/wrapper/clients/typescript-client/"
schedule:
interval: "daily"
target-branch: "main"
open-pull-requests-limit: 30
open-pull-requests-limit: 50
labels:
- "dependencies"
- "javascript"
# Docker
- package-ecosystem: "docker"
directory: "/connector"
directory: "/launchers/"
schedule:
interval: "daily"
target-branch: "main"
open-pull-requests-limit: 30
open-pull-requests-limit: 50
labels:
- "dependencies"
- "docker"
46 changes: 46 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: "CodeQL"

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
schedule:
- cron: '34 8 * * 5'

jobs:
analyze:
name: Analyze
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'java-kotlin', 'javascript-typescript' ]

steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
54 changes: 52 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,65 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
#### Major Changes

#### Minor Changes

- Added `JWKS-Extension`, which provides an endpoint in the default API, that returns the JWKS of the connector.
- Add new MDS fields and migrate existing MDS asset keys to mobilityDCAT-AP

#### Patch Changes
- Docs: Enhanced starting a Http-Pull over the EDC-Ui documentation

### Deployment Migration Notes

#### Compatible Versions

## [7.1.1] - 2024-01-18

### Overview

Bugfix release for minor UI bugs

### EDC UI

https://github.com/sovity/edc-ui/releases/tag/v2.3.1

### Deployment Migration Notes

_No special deployment migration steps required_

#### Compatible Versions

- Connector Backend Docker Images:
- Dev EDC: `ghcr.io/sovity/edc-dev:7.1.1`
- sovity EDC CE: `ghcr.io/sovity/edc-ce:7.1.1`
- MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:7.1.1`
- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:2.3.1`

## [7.1.0] - 2024-01-17

### Overview

MDS feature release: Asset markdown descriptions and editable metadata

### EDC UI

https://github.com/sovity/edc-ui/releases/tag/v2.3.0

### EDC Extensions

#### Minor Changes

- Asset metadata is now editable
- Asset descriptions now support Markdown
- Negotiate button is no longer shown for own connector endpoints

### Deployment Migration Notes

#### Compatible Versions

- Connector Backend Docker Images:
- Dev EDC: `ghcr.io/sovity/edc-dev:7.1.0`
- sovity EDC CE: `ghcr.io/sovity/edc-ce:7.1.0`
- MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:7.1.0`
- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:2.3.0`

## [7.0.0] - 2023-12-06

### Overview
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started/documentation/pull-data-transfer.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ When initiating the transfer, select "Custom Transfer Process JSON", and provide
"https://w3id.org/edc/v0.0.1/ns/dataDestination": {
"https://w3id.org/edc/v0.0.1/ns/type": "HttpProxy"
},
"https://w3id.org/edc/v0.0.1/ns/properties": {
"https://w3id.org/edc/v0.0.1/ns/receiverHttpEndpoint": "{{target-pull-backend-url}}"
"https://w3id.org/edc/v0.0.1/ns/privateProperties": {
"https://w3id.org/edc/v0.0.1/ns/receiverHttpEndpoint": "{{TARGET_PULL_BACKEND_URL}}"
},
"https://w3id.org/edc/v0.0.1/ns/protocol": "dataspace-protocol-http",
"https://w3id.org/edc/v0.0.1/ns/managedResources": false
Expand Down
Loading

0 comments on commit 78fb58f

Please sign in to comment.