From 21bc2c8481a085b3832b14e27067e6a2f9527b8f Mon Sep 17 00:00:00 2001 From: jzbmw <48311334+jzbmw@users.noreply.github.com> Date: Fri, 13 Oct 2023 08:56:32 +0200 Subject: [PATCH 01/12] Create irs-story issue template --- .github/ISSUE_TEMPLATE/irs-story | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/irs-story diff --git a/.github/ISSUE_TEMPLATE/irs-story b/.github/ISSUE_TEMPLATE/irs-story new file mode 100644 index 0000000000..31d66e009e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/irs-story @@ -0,0 +1,22 @@ +--- +name: Propose a Story +about: propose a new story, new task +--- + +**As** ... , +**I want** ... , +**so that** ... . + +## Hints / Details + +- ... + +## Outcome / Acceptance Criteria + +- ... From 2c7849764d1ea4292aeea02bd3df82d316aa6415 Mon Sep 17 00:00:00 2001 From: jzbmw <48311334+jzbmw@users.noreply.github.com> Date: Mon, 16 Oct 2023 12:22:43 +0200 Subject: [PATCH 02/12] Update irs-story --- .github/ISSUE_TEMPLATE/irs-story | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/irs-story b/.github/ISSUE_TEMPLATE/irs-story index 31d66e009e..a3bdb56cbd 100644 --- a/.github/ISSUE_TEMPLATE/irs-story +++ b/.github/ISSUE_TEMPLATE/irs-story @@ -1,6 +1,7 @@ --- name: Propose a Story about: propose a new story, new task +labels: Story --- - ... ## Outcome / Acceptance Criteria +- ... + +## Out of Scope + - ... From 68c294d81f4c77c7fa5e68f6b2688742d4237bca Mon Sep 17 00:00:00 2001 From: jzbmw <48311334+jzbmw@users.noreply.github.com> Date: Fri, 20 Oct 2023 08:50:44 +0200 Subject: [PATCH 03/12] Update irs-story --- .github/ISSUE_TEMPLATE/irs-story | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/irs-story b/.github/ISSUE_TEMPLATE/irs-story index a3bdb56cbd..cbe42cb441 100644 --- a/.github/ISSUE_TEMPLATE/irs-story +++ b/.github/ISSUE_TEMPLATE/irs-story @@ -20,6 +20,9 @@ Provide as much information regarding this request as possible +### Outcome +- ... +### Acceptance Criteria - ... ## Out of Scope From 1684508e1d4938918de6f60475031e6eaf76d68a Mon Sep 17 00:00:00 2001 From: jzbmw <48311334+jzbmw@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:09:34 +0200 Subject: [PATCH 04/12] Rename irs-story to irs-story.md --- .github/ISSUE_TEMPLATE/{irs-story => irs-story.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{irs-story => irs-story.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/irs-story b/.github/ISSUE_TEMPLATE/irs-story.md similarity index 100% rename from .github/ISSUE_TEMPLATE/irs-story rename to .github/ISSUE_TEMPLATE/irs-story.md From acb5ebb88e457d8884712ee6cd5a3cfb286d1d16 Mon Sep 17 00:00:00 2001 From: jzbmw Date: Tue, 24 Oct 2023 08:20:10 +0000 Subject: [PATCH 05/12] chore(dependencies): Update DEPENDENCIES --- DEPENDENCIES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 7070317ced..21f79c4d1c 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -192,8 +192,8 @@ maven/mavencentral/net.java.dev.jna/jna/5.12.1, Apache-2.0 OR LGPL-2.1-or-later, maven/mavencentral/net.javacrumbs.json-unit/json-unit-assertj/2.36.1, Apache-2.0, approved, clearlydefined maven/mavencentral/net.javacrumbs.json-unit/json-unit-core/2.36.1, Apache-2.0, approved, clearlydefined maven/mavencentral/net.javacrumbs.json-unit/json-unit-json-path/2.36.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/net.jimblackler.jsonschemafriend/core/0.12.0, None, restricted, #10911 -maven/mavencentral/net.jimblackler.jsonschemafriend/extra/0.12.0, None, restricted, #10910 +maven/mavencentral/net.jimblackler.jsonschemafriend/core/0.12.0, Apache-2.0, approved, #10911 +maven/mavencentral/net.jimblackler.jsonschemafriend/extra/0.12.0, Apache-2.0, approved, #10910 maven/mavencentral/net.jimblackler/jsonschemafriend/0.12.0, Apache-2.0, approved, #10912 maven/mavencentral/net.jodah/typetools/0.6.3, Apache-2.0, approved, clearlydefined maven/mavencentral/net.minidev/accessors-smart/2.4.11, Apache-2.0, approved, #7515 From 9f200e173b8007ae63d4f7c39b2711f84b8aae12 Mon Sep 17 00:00:00 2001 From: Johannes Zahn <48311334+jzbmw@users.noreply.github.com> Date: Wed, 25 Oct 2023 12:33:34 +0200 Subject: [PATCH 06/12] Create irs-bug.md --- .github/ISSUE_TEMPLATE/irs-bug.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/irs-bug.md diff --git a/.github/ISSUE_TEMPLATE/irs-bug.md b/.github/ISSUE_TEMPLATE/irs-bug.md new file mode 100644 index 0000000000..d71c4ec80c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/irs-bug.md @@ -0,0 +1,25 @@ +--- +name: Report a Bug +about: report bugs or unexpected behavior. +--- + + + +## Description + +## Current behaviour + +## Expected behavior + + +## Steps to reproduce the Bug + From 0600ffb7c4eeae3cbde8b9f84f3fc842b7ea8ab1 Mon Sep 17 00:00:00 2001 From: ds-jhartmann Date: Wed, 25 Oct 2023 14:02:10 +0000 Subject: [PATCH 07/12] chore(release): Prepare release for Helm version 6.8.0 --- charts/irs-helm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/irs-helm/Chart.yaml b/charts/irs-helm/Chart.yaml index 400fa439d7..bf83c19dad 100644 --- a/charts/irs-helm/Chart.yaml +++ b/charts/irs-helm/Chart.yaml @@ -40,7 +40,7 @@ version: 6.8.0 # 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: "3.5.3" +appVersion: "3.5.4" dependencies: - name: common repository: https://charts.bitnami.com/bitnami From 0dd1a55a4be9e1509a8ce694544dcbc5bf9743cd Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Wed, 25 Oct 2023 16:07:12 +0200 Subject: [PATCH 08/12] fix(charts): Add missing changelog entry --- charts/irs-helm/CHANGELOG.md | 4 ++++ charts/irs-helm/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/irs-helm/CHANGELOG.md b/charts/irs-helm/CHANGELOG.md index 563340dd8b..2ec9635434 100644 --- a/charts/irs-helm/CHANGELOG.md +++ b/charts/irs-helm/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added configuration for IRS OAuth2 JWT token claim +## [6.8.1] - 2023-10-25 +### Changed +- Update IRS version to 3.5.4 + ## [6.8.0] - 2023-10-09 ### Changed - Update IRS version to 3.5.3 diff --git a/charts/irs-helm/Chart.yaml b/charts/irs-helm/Chart.yaml index bf83c19dad..5747190156 100644 --- a/charts/irs-helm/Chart.yaml +++ b/charts/irs-helm/Chart.yaml @@ -35,7 +35,7 @@ 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: 6.8.0 +version: 6.8.1 # 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. From e0ec32fec0e4b62042b766e61f34607c29d5dc5d Mon Sep 17 00:00:00 2001 From: ds-jhartmann Date: Thu, 26 Oct 2023 10:53:27 +0000 Subject: [PATCH 09/12] chore(dependencies): Update irs-registry-client to 1.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 704ccaa140..b0b6ac244b 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ - 1.3.2-SNAPSHOT + 1.4.0 3.1.4 From baae5b18401a36dd6b734b2e5f168662a4bc7403 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann <57985712+ds-jhartmann@users.noreply.github.com> Date: Thu, 26 Oct 2023 12:56:13 +0200 Subject: [PATCH 10/12] chore(deps): Update DEPENDENCIES --- DEPENDENCIES | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 43ce9c4eef..5aa086bcc1 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -300,11 +300,11 @@ maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.16, EPL-2.0 OR Apache-2.0 maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.irs/irs-common/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/1.3.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-models/1.3.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/1.4.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-models/1.4.0, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.irs/irs-policy-store/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.3.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/1.3.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.4.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/1.4.0, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish From 9da2eb1a5de5d52702ea30341a4c26cbca1eac9c Mon Sep 17 00:00:00 2001 From: ds-jhartmann Date: Thu, 26 Oct 2023 12:25:32 +0000 Subject: [PATCH 11/12] chore(dependencies): Update irs-registry-client to 1.4.1-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b0b6ac244b..cd9b2c0c63 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ - 1.4.0 + 1.4.1-SNAPSHOT 3.1.4 From 68ae523f7ea049edf292dadbe911239433b664e6 Mon Sep 17 00:00:00 2001 From: ds-jhartmann Date: Thu, 26 Oct 2023 12:28:06 +0000 Subject: [PATCH 12/12] chore(dependencies): Update DEPENDENCIES --- DEPENDENCIES | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 5aa086bcc1..70492d3366 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -300,11 +300,11 @@ maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.16, EPL-2.0 OR Apache-2.0 maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.irs/irs-common/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/1.4.0, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-models/1.4.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/1.4.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-models/1.4.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.eclipse.tractusx.irs/irs-policy-store/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.4.0, Apache-2.0, approved, automotive.tractusx -maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/1.4.0, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/1.4.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx +maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/1.4.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish