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

upstream latest changes after version release #174

Merged
merged 40 commits into from
Mar 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
313f818
Cherry-picked upstream commits (QGate stuff) in preparation for the 0…
stephanbcbauer Mar 1, 2023
a2f9407
Merge pull request #7 from catenax-ng/chore/cherry_pick_qgate5
paullatzelsperger Mar 27, 2023
723ae39
Release: fix version handling
paullatzelsperger Mar 27, 2023
9f72c3b
Prepare release 0.3.1
web-flow Mar 27, 2023
f073470
Merge branch 'main' into release/0.3.1
paullatzelsperger Mar 27, 2023
8524e84
Merge pull request #9 from catenax-ng/release/0.3.1
paullatzelsperger Mar 27, 2023
1d61edd
fix: use PAT to publish to CXNG product-edc repo
paullatzelsperger Mar 30, 2023
8552803
Generate OpenApi Spec
Mar 21, 2023
197dd5c
feat(baseImage): replace alpine with temurin as base image for runnin…
wolf4ood Mar 27, 2023
df6dd6e
Lint and refactor mostly all *.md files
florianrusch-zf Mar 15, 2023
3f29667
Lint new changes from develop branch
florianrusch-zf Mar 21, 2023
7f08aa0
Replace appearance of product-edc with tractusx-edc
florianrusch-zf Mar 21, 2023
465fd99
Fix README.md and Transfer Data.md
florianrusch-zf Mar 22, 2023
cde3c06
Fix Transfer Data.md
florianrusch-zf Mar 22, 2023
932cc67
Regenerate helm chart README.md files
florianrusch-zf Mar 23, 2023
cbbc671
Remove left over html tags from root REAMDE.md
florianrusch-zf Mar 23, 2023
ceefb34
Add empty line at EOF
florianrusch-zf Mar 23, 2023
e724d9b
Update CODE_OF_CONDUCT.md
florianrusch-zf Mar 23, 2023
0e45abb
Release: fix version handling
paullatzelsperger Mar 27, 2023
0707fa3
Prepare release 0.3.1
web-flow Mar 27, 2023
d6b21db
Cherry-picked upstream commits (QGate stuff) in preparation for the 0…
stephanbcbauer Mar 1, 2023
8683738
fix: use snapshot version after publish workflow
paullatzelsperger Mar 28, 2023
05dedf6
docs: add additional info for running business tests locally
wolf4ood Mar 24, 2023
91a1084
feat(CI): add Markdown linter
wolf4ood Mar 21, 2023
98d655b
md lint fix
wolf4ood Mar 28, 2023
3f88def
pr remarks
wolf4ood Mar 28, 2023
1929d73
Apply suggestions from code review
paullatzelsperger Mar 28, 2023
c975253
Update .github/workflows/verify.yaml
wolf4ood Mar 28, 2023
657e983
chore(md-linting): Fix markdown lint
wolf4ood Mar 28, 2023
2e7082b
fix: make AZKV clientsecret or certificate mutually exclusive
paullatzelsperger Mar 29, 2023
8d2de0d
revert pointless blanks
paullatzelsperger Mar 30, 2023
201082f
fix: use correct paths for GH Packages docker reg.
paullatzelsperger Mar 29, 2023
ecc9e6b
fix: only dockerize if a dockerfile exists
paullatzelsperger Mar 30, 2023
795a763
chore: use old repo URL for Maven publication
paullatzelsperger Mar 30, 2023
e3562fa
fix: use PAT to publish to CXNG product-edc repo
paullatzelsperger Mar 30, 2023
528c712
Prepare release 0.3.2
web-flow Mar 30, 2023
6ee8673
doc: added migration guide and updated changelog
paullatzelsperger Mar 30, 2023
e0d8913
Merge pull request #11 from catenax-ng/release/0.3.2
paullatzelsperger Mar 30, 2023
9b53144
Introduce new snapshot version 0.3.3-SNAPSHOT
web-flow Mar 30, 2023
9836746
PR Remarks
paullatzelsperger Mar 31, 2023
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: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,5 +259,5 @@ jobs:
env:
#REPO: ${{ github.repository }}
REPO: "catenax-ng/product-edc"
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ jobs:
env:
#REPO: ${{ github.repository }}
REPO: "catenax-ng/product-edc"
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}

# Release: Helm Charts
helm-release:
Expand Down
17 changes: 15 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.3.2] - 2023-03-30

### Fixed

- Fixed mutually-exclusive config values for Azure KeyVault

## [0.3.1] - 2023-03-27

### Added
Expand Down Expand Up @@ -72,6 +78,11 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
- Fix not working docu link in README.md
- Fix typo in control-plane adapter README

- bugfix: Fix slow AES encryption (#746)
- Fix typo in tractusx-connector values.yaml comment
- Fix not working docu link in README.md
- Fix typo in control-plane adapter README
Comment on lines +81 to +84
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still a doublet


### Dependency updates

- Bump EDC to 20220220 (#767)
Expand Down Expand Up @@ -239,7 +250,7 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
### Fixed

- [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
contract offers max.
contract offers max.

### Removed

Expand All @@ -252,7 +263,9 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).

## [0.0.1] - 2022-05-13

[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.1...HEAD
[Unreleased]: https://github.com/catenax-ng/tx-tractusx-edc/compare/0.3.2...HEAD

[0.3.2]: https://github.com/catenax-ng/tx-tractusx-edc/compare/0.3.1...0.3.2

[0.3.1]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.0...0.3.1

Expand Down
4 changes: 2 additions & 2 deletions charts/edc-controlplane/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ description: >-
EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
type: application
appVersion: "0.3.1"
version: 0.3.1
appVersion: "0.3.2"
version: 0.3.2
deprecated: true
maintainers: []
sources:
Expand Down
4 changes: 2 additions & 2 deletions charts/edc-controlplane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> **:exclamation: This Helm Chart is deprecated!**

![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)

EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers

Expand All @@ -12,7 +12,7 @@ EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with res

```shell
helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
helm install my-release tractusx-edc/edc-controlplane --version 0.3.1
helm install my-release tractusx-edc/edc-controlplane --version 0.3.2
```

## Source Code
Expand Down
4 changes: 2 additions & 2 deletions charts/edc-dataplane/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ description: >-
EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
type: application
appVersion: "0.3.1"
version: 0.3.1
appVersion: "0.3.2"
version: 0.3.2
deprecated: true
maintainers: []
sources:
Expand Down
4 changes: 2 additions & 2 deletions charts/edc-dataplane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> **:exclamation: This Helm Chart is deprecated!**

![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)

EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams

Expand All @@ -12,7 +12,7 @@ EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility o

```shell
helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
helm install my-release tractusx-edc/edc-dataplane --version 0.3.1
helm install my-release tractusx-edc/edc-dataplane --version 0.3.2
```

## Source Code
Expand Down
5 changes: 2 additions & 3 deletions charts/tractusx-connector/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.3.1
version: 0.3.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.3.1"

appVersion: "0.3.2"
home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
sources:
- https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
8 changes: 4 additions & 4 deletions charts/tractusx-connector/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tractusx-connector

![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)

A Helm chart for Tractus-X Eclipse Data Space Connector

Expand All @@ -10,7 +10,7 @@ A Helm chart for Tractus-X Eclipse Data Space Connector

```shell
helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
helm install my-release tractusx-edc/tractusx-connector --version 0.3.1
helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
```

## Source Code
Expand Down Expand Up @@ -217,11 +217,11 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.1
| serviceAccount.create | bool | `true` | |
| serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
| serviceAccount.name | string | `""` | |
| vault.azure.certificate | string | `""` | |
| vault.azure.certificate | string | `nil` | |
| vault.azure.client | string | `""` | |
| vault.azure.enabled | bool | `false` | |
| vault.azure.name | string | `""` | |
| vault.azure.secret | string | `""` | |
| vault.azure.secret | string | `nil` | |
| vault.azure.tenant | string | `""` | |
| vault.hashicorp.enabled | bool | `false` | |
| vault.hashicorp.healthCheck.enabled | bool | `true` | |
Expand Down
9 changes: 9 additions & 0 deletions docs/migration/Version_0.3.1_0.3.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Migration from 0.3.0 to 0.3.1

## Configuration of Azure KeyVault

When using Helm Charts that use the Azure KeyVault (`edc-controlplane-memory`, `edc-controlplane-postgres`)
it is now possible to select _either_ authentication via Client Secret (`azure.vault.secret`) or via
certificate (`azure.vault.certificate`).

If neither of the two is configured, the runtime will fail to start issuing an error.
5 changes: 5 additions & 0 deletions edc-tests/cucumber/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ tasks.withType(Test::class) {
System.getProperty("cucumber") == "true"
}
}

// do not publish
edcBuild {
publish.set(false)
}
5 changes: 5 additions & 0 deletions edc-tests/e2e-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ dependencies {
testImplementation(edc.api.catalog)
testImplementation(testFixtures(edc.junit))
}

// do not publish
edcBuild {
publish.set(false)
}
11 changes: 8 additions & 3 deletions edc-tests/runtime/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ plugins {

dependencies {

runtimeOnly(project(":edc-controlplane:edc-controlplane-base")){
runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
exclude("org.eclipse.edc", "oauth2-core")
exclude("org.eclipse.edc", "oauth2-daps")
exclude(module= "data-encryption")
exclude(module= "control-plane-adapter")
exclude(module = "data-encryption")
exclude(module = "control-plane-adapter")
}
}

Expand All @@ -37,3 +37,8 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
mergeServiceFiles()
archiveFileName.set("app.jar")
}

// do not publish
edcBuild {
publish.set(false)
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
groupId=org.eclipse.tractusx.edc
version=0.3.2-SNAPSHOT
version=0.3.3-SNAPSHOT
javaVersion=11

# configure the build:
Expand Down