Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
2a8f759
Rename SetParticipantContextId.sql migration script into correct flyw…
pratapipatelbcone Feb 11, 2026
3e51d9d
feat: add previous tag for release notes (#2574)
AndrYurk Feb 11, 2026
b6d9ad9
Fix issues in management api walkthrough (#2578)
lgblaumeiser Feb 11, 2026
f3f6ffb
Fix OpenApi spec for connector discovery (#2579)
lgblaumeiser Feb 11, 2026
22cd1a2
fix: Update dim url for did document update APIs (#2584)
pratapipatelbcone Feb 13, 2026
78dd57d
Provide migration guide information (#2580)
lgblaumeiser Feb 13, 2026
84d5e4c
Fix JSON-LD registrations for management api (#2585)
lgblaumeiser Feb 13, 2026
12afc2c
chore(deps): bump flyway from 12.0.0 to 12.0.1 (#2586)
dependabot[bot] Feb 16, 2026
86d15c3
chore(deps): bump mikefarah/yq (#2593)
dependabot[bot] Feb 16, 2026
2595368
chore(deps): bump trufflesecurity/trufflehog from 3.93.1 to 3.93.3 (#…
dependabot[bot] Feb 16, 2026
df73ef7
chore(deps): bump aquasecurity/trivy-action from 0.33.1 to 0.34.0 (#2…
dependabot[bot] Feb 16, 2026
acde1e2
chore(deps): bump org.junit.platform:junit-platform-launcher (#2589)
dependabot[bot] Feb 16, 2026
949c0d1
chore(deps): bump gradle-wrapper from 9.3.0 to 9.3.1 (#2587)
dependabot[bot] Feb 16, 2026
296a94b
chore(deps): bump io.opentelemetry.instrumentation:opentelemetry-log4…
dependabot[bot] Feb 17, 2026
0d2e109
chore(deps): bump postgres (#2591)
dependabot[bot] Feb 17, 2026
dbf5495
Switch tx-auth in management scope to namespace (#2594)
lgblaumeiser Feb 18, 2026
33836da
Get rid of outdated github action
lgblaumeiser Feb 18, 2026
d2747d5
docs: add contributing link to readme file (#2596)
AndrYurk Feb 18, 2026
68fd82e
chore(deps): bump helm/kind-action from 1.13.0 to 1.14.0 (#2599)
dependabot[bot] Feb 23, 2026
751733d
chore(deps): bump aquasecurity/trivy-action from 0.34.0 to 0.34.1 (#2…
dependabot[bot] Feb 23, 2026
4ba4d94
chore(deps): bump trufflesecurity/trufflehog from 3.93.3 to 3.93.4 (#…
dependabot[bot] Feb 23, 2026
e7bd07d
chore(deps): bump org.postgresql:postgresql from 42.7.9 to 42.7.10 (#…
dependabot[bot] Feb 23, 2026
95d6bf5
chore(deps): bump helm/kind-action (#2602)
dependabot[bot] Feb 23, 2026
a4e9dbb
chore(deps): bump io.opentelemetry.javaagent:opentelemetry-javaagent …
dependabot[bot] Feb 23, 2026
adf9372
Switch snapshot dependencies for tck helper to release (#2607)
lgblaumeiser Feb 23, 2026
ce67e2d
chore(deps): bump com.azure:azure-storage-blob from 12.32.0 to 12.33.…
dependabot[bot] Feb 24, 2026
cce5673
feat: Split Jsonld Core Extension (#2598)
pratapipatelbcone Feb 26, 2026
0c16416
fix: Exclude Upstream Transitive Dependency data-plane-util (#2616)
pratapipatelbcone Feb 26, 2026
bd2944d
docs: update catalog api walkthrough docs (#2620)
AndrYurk Mar 2, 2026
b8e543c
chore(deps): bump com.nimbusds:nimbus-jose-jwt from 10.7 to 10.8 (#2630)
dependabot[bot] Mar 2, 2026
1124391
chore(deps): bump flyway from 12.0.1 to 12.0.3 (#2628)
dependabot[bot] Mar 2, 2026
f0f5ba3
chore(deps): bump actions/download-artifact (#2625)
dependabot[bot] Mar 2, 2026
5397fcd
chore(deps): bump actions/download-artifact from 7 to 8 (#2624)
dependabot[bot] Mar 2, 2026
732551f
chore(deps): bump postgres (#2622)
dependabot[bot] Mar 2, 2026
fef6322
chore(deps): bump trufflesecurity/trufflehog from 3.93.4 to 3.93.6 (#…
dependabot[bot] Mar 2, 2026
f3369e1
chore(deps): bump io.opentelemetry.instrumentation:opentelemetry-inst…
dependabot[bot] Mar 2, 2026
b81402b
chore(deps): bump actions/upload-artifact from 6 to 7 (#2623)
dependabot[bot] Mar 2, 2026
f00edcd
chore(deps): bump io.qameta.allure:allure-junit5 from 2.32.0 to 2.33.…
dependabot[bot] Mar 2, 2026
653355f
fix: remove snapshot dependency (#2631)
AndrYurk Mar 2, 2026
b5b772e
fix: change return type on provider to interface (#2633)
arnoweiss Mar 4, 2026
e9fd3be
chore: deprecate C-X ODRL context (#2632)
ronjaquensel Mar 4, 2026
77cfa28
Add odrl context changes to migration guide
lgblaumeiser Mar 4, 2026
d2caf21
chore: update kubernetes infra for deployment tests (#2635)
lgblaumeiser Mar 4, 2026
d71799f
Update Trivy workflow
lgblaumeiser Mar 5, 2026
b217d47
fix: vulnerability improvements (#2637)
lgblaumeiser Mar 5, 2026
95f0521
chore(deps): bump checkmarx/kics-github-action from 2.1.19 to 2.1.20 …
dependabot[bot] Mar 6, 2026
8dda744
chore(deps): bump aws from 2.41.24 to 2.42.7 (#2649)
dependabot[bot] Mar 6, 2026
6eaca42
chore(deps): bump com.azure:azure-core-http-netty from 1.16.2 to 1.16…
dependabot[bot] Mar 6, 2026
38f2a0d
chore(deps): bump org.yaml:snakeyaml from 2.5 to 2.6 (#2647)
dependabot[bot] Mar 6, 2026
3b28452
chore(deps): bump docker/build-push-action (#2646)
dependabot[bot] Mar 6, 2026
3119754
chore(deps): bump docker/setup-buildx-action (#2645)
dependabot[bot] Mar 6, 2026
9acba3f
chore(deps): bump docker/login-action (#2644)
dependabot[bot] Mar 6, 2026
f8e215d
chore(deps): bump trufflesecurity/trufflehog from 3.93.6 to 3.93.7 (#…
dependabot[bot] Mar 6, 2026
7d4a95d
feat: increase dependabot PR limit (#2651)
AndrYurk Mar 6, 2026
75d509e
chore(deps): bump docker/setup-qemu-action (#2652)
dependabot[bot] Mar 6, 2026
ab5f606
chore(deps): bump docker/metadata-action (#2653)
dependabot[bot] Mar 6, 2026
c041e24
chore(deps): bump com.gradleup.shadow from 9.3.1 to 9.3.2 (#2654)
dependabot[bot] Mar 6, 2026
b092870
chore(deps): bump gradle-wrapper from 9.3.1 to 9.4.0 (#2655)
dependabot[bot] Mar 6, 2026
0c7972a
fix(deps): Fix some dependencies (#2659)
lgblaumeiser Mar 6, 2026
504c627
chore(deps): bump io.swagger.core.v3.swagger-gradle-plugin (#2661)
dependabot[bot] Mar 6, 2026
4b247a4
fix(deps): more dependency fixes (#2662)
lgblaumeiser Mar 6, 2026
0709a20
chore(deps): update vulnerable dependencies (#2658)
AndrYurk Mar 7, 2026
58a5500
chore: limit dependency check to runtime dependencies (#2666)
lgblaumeiser Mar 9, 2026
e098ecb
Bump to version 0.13.0-SNAPSHOT
eclipse-tractusx-bot Mar 9, 2026
09ebd43
Add latest version to OpenAPI Hub
lgblaumeiser Mar 9, 2026
d71d60b
Remove Develocity configuration (#2670)
ribafish Mar 12, 2026
6354a1c
chore(deps): bump aws from 2.42.7 to 2.42.12 (#2676)
dependabot[bot] Mar 13, 2026
6f1d9ad
chore(deps): bump flyway from 12.0.3 to 12.1.0 (#2675)
dependabot[bot] Mar 13, 2026
46ca103
chore(deps): bump aquasecurity/trivy-action from 0.34.2 to 0.35.0 (#2…
dependabot[bot] Mar 13, 2026
fc1aacc
chore(deps): bump trufflesecurity/trufflehog from 3.93.7 to 3.93.8 (#…
dependabot[bot] Mar 13, 2026
ba45ef3
feat: Split tx-dcp extension (#2641)
pratapipatelbcone Mar 13, 2026
fe3ccdc
feat: Rename dim to div (#2672)
pratapipatelbcone Mar 16, 2026
838e763
feat: exchange identity extractor (#2677)
arnoweiss Mar 17, 2026
2ab6041
feat: remove federated catalog (#2575)
AndrYurk Mar 18, 2026
0cc3ef8
feat(policy): implement data usage constraints for end date and durat…
MDSBarbosa Mar 19, 2026
32be44b
chore(deps): bump testcontainers from 2.0.3 to 2.0.4 (#2685)
dependabot[bot] Mar 20, 2026
45ac50b
chore(deps): bump flyway from 12.1.0 to 12.1.1 (#2688)
dependabot[bot] Mar 20, 2026
4a87fd4
chore(deps): bump io.swagger.core.v3.swagger-gradle-plugin (#2687)
dependabot[bot] Mar 20, 2026
b06aace
chore(deps): bump io.opentelemetry.javaagent:opentelemetry-javaagent …
dependabot[bot] Mar 20, 2026
096ed9b
feat: Clean up the 0.8.X deprecated instances (#2690)
AndrYurk Mar 23, 2026
3789616
Merge remote-tracking branch 'upstream/main' into chore/update-tx-0.12.0
eschrewe Mar 23, 2026
416ffff
chore: update for edc 0.15.1 and tx 0.12.0
eschrewe Mar 23, 2026
6c753f1
fix: version variable
eschrewe Mar 23, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/actions/generate-and-check-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ runs:
- name: Generate dependency list
shell: bash
run: |
./gradlew allDependencies | grep -Poh "(?<=\s)[\w.-]+:[\w.-]+:[^:\s\[\]]+" | sort | uniq > dependency-list
./gradlew :edc-controlplane:allDependencies --configuration runtimeClasspath | grep -Poh "(?<=\s)[\w.-]+:[\w.-]+:[^:\s\[\]]+" > dependency-list-c
./gradlew :edc-dataplane:allDependencies --configuration runtimeClasspath | grep -Poh "(?<=\s)[\w.-]+:[\w.-]+:[^:\s\[\]]+" > dependency-list-d
cat dependency-list-c dependency-list-d | sort | uniq > dependency-list
cat dependency-list

- name: Run dash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
using: "composite"
steps:
- name: Download Allure results
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
pattern: ${{ inputs.allure_results }}-*
merge-multiple: true
Expand Down
10 changes: 5 additions & 5 deletions .github/actions/publish-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ runs:
# Enable emulation for cross-arch builds
###############################################
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4

###############################################
# Use Docker Buildx (required for multi-arch)
###############################################
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

#####################
# Login to DockerHub
#####################
- name: DockerHub login
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ inputs.docker_user }}
password: ${{ inputs.docker_token }}
Expand All @@ -84,7 +84,7 @@ runs:
# Create SemVer or ref tags dependent of trigger event
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: |
${{ inputs.namespace }}/${{ inputs.imagename }}
Expand All @@ -101,7 +101,7 @@ runs:
# Build and push the image
###############################
- name: Build and push
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: ${{ inputs.rootDir }}
file: ${{ inputs.rootDir }}/build/resources/docker/Dockerfile
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/run-deployment-test/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#################################################################################
# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2026 Cofinity-X GmbH
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -43,7 +44,7 @@ inputs:
k8sversion:
required: false
description: "Version of Kubernetes to use"
default: "v1.30.0"
default: "v1.34.3"

runs:
using: "composite"
Expand All @@ -55,10 +56,9 @@ runs:
- uses: ./.github/actions/setup-kubectl

- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.13.0
uses: helm/kind-action@v1.14.0
with:
node_image: kindest/node:${{ inputs.k8sversion }}
version: v0.29.0

- name: Build docker images
shell: bash
Expand Down
11 changes: 4 additions & 7 deletions .github/actions/update-version-and-charts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,15 @@ runs:
fi
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
- name: Bump version in /charts
uses: mikefarah/yq@v4.52.2
uses: mikefarah/yq@v4.52.4
with:
cmd: |
find charts -name Chart.yaml -maxdepth 3 | xargs -n1 yq -i '.appVersion = "${{ steps.resolver.outputs.version }}"
| .version = "${{ steps.resolver.outputs.version }}"'
- name: Update Chart READMEs
uses: addnab/docker-run-action@v3
with:
image: jnorwood/helm-docs:v1.10.0
options: -v ${{ github.workspace }}/charts:/helm-docs
run: |
helm-docs --log-level debug
shell: bash
run: |
docker run -v ${{ github.workspace }}/charts:/helm-docs jnorwood/helm-docs helm-docs
- name: Update version in gradle.properties
shell: bash
run: |-
Expand Down
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ updates:
- "dependencies"
schedule:
interval: "weekly"
open-pull-requests-limit: 50
ignore:
- dependency-name: "org.eclipse.dataspacetck.dsp:*"
- dependency-name: "org.eclipse.dataspacetck.dcp:*"
Expand All @@ -49,6 +50,7 @@ updates:
- "github-actions"
schedule:
interval: "weekly"
open-pull-requests-limit: 50

# Docker
- package-ecosystem: "docker"
Expand All @@ -62,3 +64,4 @@ updates:
- "docker"
schedule:
interval: "weekly"
open-pull-requests-limit: 50
2 changes: 0 additions & 2 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ jobs:
- name: Build Production Code
run: |
./gradlew compileJava --no-daemon --no-build-cache
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v4
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/deployment-test.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#################################################################################
# Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
# Copyright (c) 2026 Cofinity-X GmbH
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand Down Expand Up @@ -65,9 +66,9 @@ jobs:
fail-fast: false
# this will verify that the official distribution of the Tractus-X EDC Helm chart runs on the last 3 Kubernetes versions
matrix:
k8s-version: [ "v1.33.1",
"v1.32.5",
"v1.31.9" ]
k8s-version: [ "v1.35.1",
"v1.34.3",
"v1.33.7" ]
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v6

- name: KICS scan
uses: checkmarx/kics-github-action@v2.1.19
uses: checkmarx/kics-github-action@v2.1.20
with:
path: "."
fail_on: high
Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/publish-openapi-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ jobs:

- name: Generate openapi spec
run: ./gradlew resolve
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}
- uses: actions/upload-artifact@v6
- uses: actions/upload-artifact@v7
with:
name: openapi-spec
path: resources/openapi/yaml
Expand All @@ -74,7 +72,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- uses: eclipse-edc/.github/.github/actions/setup-build@main
- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: openapi-spec
path: resources/openapi/yaml
Expand All @@ -93,14 +91,10 @@ jobs:
run: |
./gradlew -p ${{ matrix.apiGroup.folder }} downloadOpenapi
cp ${{ matrix.apiGroup.folder }}/build/docs/openapi/* resources/openapi/yaml/${{ matrix.apiGroup.name }}
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}

- name: Merge API specs
run: |
./gradlew mergeOpenApiSpec --inputDir=${PWD}/resources/openapi/yaml/${{ matrix.apiGroup.name }} --output=${{ matrix.apiGroup.name }}.yaml --infoTitle="Tractus-X EDC ${{ matrix.apiGroup.name }} API" --infoDescription="Tractus-X EDC ${{ matrix.apiGroup.name }} API Documentation" --infoVersion=${{ env.VERSION }}
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}

- name: Generate Swagger UI current version
uses: Legion2/swagger-ui-action@v1
Expand All @@ -117,7 +111,7 @@ jobs:
spec-file: ${{ matrix.apiGroup.name }}.yaml
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/upload-artifact@v6
- uses: actions/upload-artifact@v7
with:
name: ${{ matrix.apiGroup.name }}-api
path: dist
Expand All @@ -128,7 +122,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
path: openapi
pattern: "*-api"
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ on:
required: true
type: boolean
default: false
previous_tag:
description: "Generate release notes starting from tag"
type: string
required: true
default: ""


jobs:
Expand All @@ -48,6 +53,8 @@ jobs:
update_main_branch_version: ${{ steps.update-main.outputs.update_main_branch_version }}
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Output release version
id: release-version
run: |
Expand Down Expand Up @@ -79,6 +86,10 @@ jobs:
echo "This workflow can not be executed for SNAPSHOT versions."
exit 1
fi
- name: Validate previous_tag exists
run: |
git show-ref --tags --verify --quiet "refs/tags/${{ inputs.previous_tag }}" \
|| (echo "Tag '${{ inputs.previous_tag }}' not found." && exit 1)


# Release: Maven Artifacts
Expand Down Expand Up @@ -169,6 +180,7 @@ jobs:
uses: ncipollo/release-action@v1
with:
generateReleaseNotes: true
generateReleaseNotesPreviousTag: ${{ inputs.previous_tag }}
tag: ${{ needs.validation.outputs.RELEASE_VERSION }}
token: ${{ secrets.GITHUB_TOKEN }}
makeLatest: ${{ inputs.latest }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/secrets-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: TruffleHog OSS
id: trufflehog
uses: trufflesecurity/trufflehog@7635b24fd512a2e817dd3e9dd661caaf035a079d
uses: trufflesecurity/trufflehog@6c05c4a00b91aa542267d8e32a8254774799d68d
continue-on-error: true
with:
path: ./ # Scan the entire repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.33.1
uses: aquasecurity/trivy-action@0.35.0
with:
scan-type: "config"
# ignore-unfixed: true
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
## the next two steps will only execute if the image exists check was successful
- name: Run Trivy vulnerability scanner
if: success() && steps.imageCheck.outcome != 'failure'
uses: aquasecurity/trivy-action@0.33.1
uses: aquasecurity/trivy-action@0.35.0
with:
image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
format: "sarif"
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/upgradeability-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- uses: ./.github/actions/setup-kubectl

- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.13.0
uses: helm/kind-action@v1.14.0

- name: "Update helm repo"
run: |
Expand Down Expand Up @@ -89,8 +89,6 @@ jobs:
run: |-
./gradlew :edc-controlplane:edc-controlplane-postgresql-hashicorp-vault:dockerize
./gradlew :edc-dataplane:edc-dataplane-hashicorp-vault:dockerize
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_API_TOKEN }}

- name: "Load images into KinD"
shell: bash
Expand All @@ -114,7 +112,14 @@ jobs:
- name: Print logs
if: failure()
shell: bash
run: kubectl get deployments | tail -n +2 | awk '{print $1}' | sed 's/^/deployment\//' | xargs -n1 kubectl logs
run: |
kubectl get pods -o wide
kubectl get pods --no-headers | awk '{print $1}' | while read pod; do
echo "=== logs: $pod ==="
kubectl logs "$pod" --all-containers=true || true
echo "=== previous logs: $pod ==="
kubectl logs "$pod" --previous --all-containers=true || true
done

- name: Destroy the kind cluster
if: always()
Expand Down
Loading
Loading