Skip to content

Commit

Permalink
Merge pull request #948 from catenax-ng/main
Browse files Browse the repository at this point in the history
sync
  • Loading branch information
ds-mwesener authored May 8, 2024
2 parents 7a52f7d + e4751d8 commit 197a5c0
Show file tree
Hide file tree
Showing 47 changed files with 16,014 additions and 361 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ _**For better traceability add the corresponding GitHub issue number in each cha
### Added
- #844 Validation for BPN to Notification API (Create / Edit), Fixed pagination
- #726 Added @Preauthorize annotation to dashboard controller
- #849 Added concept: Notifications to multiple BPNs
- #837 Added digital twin type to data provisioning workflow to be able to lookup shells created by trace-x
- #783 Validation that receiver of a notification must not be same as sender.
- #831 Added concept: Notification data model revision
- #859 Enable autocomplete API to filter for given assets
- #778 Added counterPartyId to getCatalogRequest

### Changed
- #837 migrate to irs-helm 7.1.1
- #837 migrate to irs-decentral-client-library to 2.0.2-SNAPSHOT
- #844 Prefilled bpn on investigation creation
- #843 Refactored e2e tests, added edit notification e2e test case
- #828 fix duplicates in traction_battery_code_subcomponent table
Expand All @@ -25,7 +30,13 @@ _**For better traceability add the corresponding GitHub issue number in each cha
- #603 Upgraded Batch, SerialPart and JustInSequencePart to 3.0.0
- #603 Upgraded PartAsPlanned to 2.0.0
- #918 Merged parts and other parts into one table
- #918 Fixed translations and normal case for autocomplete values
- #778 update EDC from 0.5.3 to 0.7.0
- #xxx update of lombok from 1.18.30 to 1.18.32
- #xxx update of findsecbugs plugin from 1.12.0 to 1.13.0
- #xxx update of commons-compress from 1.26.0 to 1.26.1
- #xxx update of logback from 1.5.5 to 1.5.6
- #xxx update of cucumber-bom from 7.16.1 to 7.17.0

### Removed

Expand Down
38 changes: 20 additions & 18 deletions DEPENDENCIES_BACKEND
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
maven/mavencentral/ch.qos.logback/logback-classic/1.4.14, EPL-1.0 OR LGPL-2.1-only, approved, #3435
maven/mavencentral/ch.qos.logback/logback-classic/1.5.5, EPL-1.0 AND LGPL-2.1-only, approved, #13282
maven/mavencentral/ch.qos.logback/logback-classic/1.5.6, EPL-1.0 AND LGPL-2.1-only, approved, #13282
maven/mavencentral/ch.qos.logback/logback-core/1.4.14, EPL-1.0 OR LGPL-2.1-only, approved, #3373
maven/mavencentral/ch.qos.logback/logback-core/1.5.5, EPL-1.0 AND LGPL-2.1-only, approved, #13283
maven/mavencentral/ch.qos.logback/logback-core/1.5.6, EPL-1.0 AND LGPL-2.1-only, approved, #13283
maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #13683
maven/mavencentral/com.auth0/java-jwt/4.4.0, MIT, approved, #8459
maven/mavencentral/com.carrotsearch.thirdparty/simple-xml-safe/2.7.1, Apache-2.0, approved, clearlydefined
Expand Down Expand Up @@ -73,20 +73,22 @@ maven/mavencentral/commons-validator/commons-validator/1.8.0, Apache-2.0, approv
maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #9178
maven/mavencentral/dev.failsafe/failsafe/3.3.2, Apache-2.0, approved, #9268
maven/mavencentral/io.cucumber/ci-environment/10.0.1, MIT, approved, #13863
maven/mavencentral/io.cucumber/cucumber-core/7.16.1, MIT AND (Apache-2.0 AND MIT), approved, #14270
maven/mavencentral/io.cucumber/cucumber-core/7.17.0, MIT AND (Apache-2.0 AND MIT), approved, #14646
maven/mavencentral/io.cucumber/cucumber-expressions/17.1.0, MIT, approved, #14271
maven/mavencentral/io.cucumber/cucumber-gherkin-messages/7.16.1, MIT, approved, clearlydefined
maven/mavencentral/io.cucumber/cucumber-gherkin/7.16.1, MIT, approved, clearlydefined
maven/mavencentral/io.cucumber/cucumber-java/7.16.1, MIT, approved, clearlydefined
maven/mavencentral/io.cucumber/cucumber-junit-platform-engine/7.16.1, MIT, approved, clearlydefined
maven/mavencentral/io.cucumber/cucumber-plugin/7.16.1, MIT, approved, clearlydefined
maven/mavencentral/io.cucumber/datatable/7.16.1, MIT, approved, #14273
maven/mavencentral/io.cucumber/docstring/7.16.1, MIT, approved, clearlydefined
maven/mavencentral/io.cucumber/cucumber-gherkin-messages/7.17.0, MIT, approved, #14649
maven/mavencentral/io.cucumber/cucumber-gherkin/7.17.0, MIT, approved, #14648
maven/mavencentral/io.cucumber/cucumber-java/7.17.0, MIT, approved, #14640
maven/mavencentral/io.cucumber/cucumber-junit-platform-engine/7.17.0, MIT, approved, #14642
maven/mavencentral/io.cucumber/cucumber-plugin/7.17.0, MIT, approved, #14643
maven/mavencentral/io.cucumber/datatable/7.17.0, MIT, approved, #14647
maven/mavencentral/io.cucumber/docstring/7.17.0, MIT, approved, #14645
maven/mavencentral/io.cucumber/gherkin/28.0.0, MIT, approved, #14276
maven/mavencentral/io.cucumber/html-formatter/21.3.0, Apache-2.0 AND MIT, approved, #14275
maven/mavencentral/io.cucumber/junit-xml-formatter/0.3.0, MIT, approved, #14272
maven/mavencentral/io.cucumber/html-formatter/21.3.1, Apache-2.0 AND MIT, approved, #14275
maven/mavencentral/io.cucumber/junit-xml-formatter/0.4.0, MIT, approved, #14644
maven/mavencentral/io.cucumber/messages/24.1.0, MIT, approved, #14274
maven/mavencentral/io.cucumber/query/12.1.2, MIT, approved, #14641
maven/mavencentral/io.cucumber/tag-expressions/6.1.0, MIT AND (BSD-3-Clause AND MIT) AND BSD-3-Clause, approved, #14277
maven/mavencentral/io.cucumber/testng-xml-formatter/0.1.0, MIT, approved, #14650
maven/mavencentral/io.github.classgraph/classgraph/4.8.149, MIT, approved, CQ22530
maven/mavencentral/io.github.resilience4j/resilience4j-annotations/2.1.0, Apache-2.0, approved, #10171
maven/mavencentral/io.github.resilience4j/resilience4j-bulkhead/2.1.0, Apache-2.0, approved, #10172
Expand Down Expand Up @@ -164,7 +166,7 @@ maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, clearlyde
maven/mavencentral/net.sf.jopt-simple/jopt-simple/5.0.4, MIT, approved, CQ13174
maven/mavencentral/org.antlr/antlr4-runtime/4.13.0, BSD-3-Clause, approved, #10767
maven/mavencentral/org.apache.commons/commons-collections4/4.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.commons/commons-compress/1.26.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #13288
maven/mavencentral/org.apache.commons/commons-compress/1.26.1, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #13288
maven/mavencentral/org.apache.commons/commons-lang3/3.11, Apache-2.0, approved, CQ22642
maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.commons/commons-lang3/3.13.0, Apache-2.0, approved, #9820
Expand Down Expand Up @@ -260,10 +262,10 @@ maven/mavencentral/org.eclipse.tractusx.edc/callback-spi/0.6.0, Apache-2.0, appr
maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.edc/edr-api/0.6.0, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.edc/edr-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.1-20240507.145257-6, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.1-20240507.145257-6, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.1-20240507.145257-6, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.1-20240507.145257-6, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.2-20240508.102327-2, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.2-20240508.102327-2, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.2-20240508.102327-2, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.2-20240508.102327-2, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.traceability/tx-backend/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.traceability/tx-models/0.0.1-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.flywaydb/flyway-core/9.22.3, Apache-2.0, approved, #10349
Expand Down Expand Up @@ -316,7 +318,7 @@ maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713
maven/mavencentral/org.ow2.asm/asm/9.3, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.ow2.asm/asm/9.6, BSD-3-Clause, approved, #10776
maven/mavencentral/org.postgresql/postgresql/42.6.1, BSD-2-Clause AND Apache-2.0, approved, #9159
maven/mavencentral/org.projectlombok/lombok/1.18.30, MIT AND LicenseRef-Public-Domain, approved, CQ23907
maven/mavencentral/org.projectlombok/lombok/1.18.32, MIT AND LicenseRef-Public-Domain, approved, CQ23907
maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined
maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.13, MIT, approved, #7698
Expand Down
10 changes: 5 additions & 5 deletions DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ npm/npmjs/-/jsdom/16.7.0, LGPL-2.0-or-later AND MIT, approved, #1370
npm/npmjs/-/jsesc/0.5.0, MIT, approved, clearlydefined
npm/npmjs/-/jsesc/2.5.2, MIT, approved, clearlydefined
npm/npmjs/-/json-parse-even-better-errors/2.3.1, MIT, approved, clearlydefined
npm/npmjs/-/json-parse-even-better-errors/3.0.0, MIT, approved, clearlydefined
npm/npmjs/-/json-parse-even-better-errors/3.0.0, MIT, approved, #14658
npm/npmjs/-/json-schema-traverse/0.4.1, MIT, approved, clearlydefined
npm/npmjs/-/json-schema-traverse/1.0.0, MIT, approved, clearlydefined
npm/npmjs/-/json-schema/0.4.0, AFL-2.1 OR BSD-3-Clause, approved, #2410
Expand Down Expand Up @@ -734,7 +734,7 @@ npm/npmjs/-/no-case/3.0.4, MIT, approved, clearlydefined
npm/npmjs/-/node-addon-api/3.2.1, MIT, approved, clearlydefined
npm/npmjs/-/node-fetch/2.6.7, MIT, approved, #6954
npm/npmjs/-/node-forge/1.3.1, (BSD-3-Clause OR GPL-2.0-only) AND MIT, approved, #3014
npm/npmjs/-/node-gyp-build/4.8.0, MIT, approved, clearlydefined
npm/npmjs/-/node-gyp-build/4.8.0, MIT, approved, #14661
npm/npmjs/-/node-gyp/9.3.1, MIT AND BSD-3-Clause, approved, #3783
npm/npmjs/-/node-hook/1.0.0, MIT, approved, clearlydefined
npm/npmjs/-/node-releases/2.0.10, MIT, approved, #1954
Expand Down Expand Up @@ -940,7 +940,7 @@ npm/npmjs/-/semver/6.3.1, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.3.8, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.5.3, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.5.4, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.6.0, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.6.0, ISC, approved, #14659
npm/npmjs/-/send/0.18.0, MIT, approved, clearlydefined
npm/npmjs/-/serialize-javascript/6.0.1, BSD-3-Clause, approved, #12680
npm/npmjs/-/serialize-javascript/6.0.2, BSD-3-Clause, approved, #12680
Expand Down Expand Up @@ -1113,7 +1113,7 @@ npm/npmjs/-/uuid/9.0.0, MIT AND (BSD-3-Clause AND MIT), approved, #6869
npm/npmjs/-/v8-compile-cache-lib/3.0.1, MIT, approved, clearlydefined
npm/npmjs/-/v8-compile-cache/2.3.0, MIT, approved, clearlydefined
npm/npmjs/-/validate-npm-package-license/3.0.4, Apache-2.0 AND (Apache-2.0 AND BSD-2-Clause), approved, #2562
npm/npmjs/-/validate-npm-package-name/5.0.0, ISC, approved, clearlydefined
npm/npmjs/-/validate-npm-package-name/5.0.0, ISC, approved, #14653
npm/npmjs/-/vary/1.1.2, MIT, approved, clearlydefined
npm/npmjs/-/verror/1.10.0, MIT, approved, clearlydefined
npm/npmjs/-/verror/1.10.1, MIT, approved, clearlydefined
Expand Down Expand Up @@ -1525,7 +1525,7 @@ npm/npmjs/@nodelib/fs.scandir/2.1.5, MIT, approved, clearlydefined
npm/npmjs/@nodelib/fs.stat/2.0.5, MIT, approved, clearlydefined
npm/npmjs/@nodelib/fs.walk/1.2.8, MIT, approved, clearlydefined
npm/npmjs/@npmcli/fs/2.1.0, ISC, approved, clearlydefined
npm/npmjs/@npmcli/fs/3.1.0, ISC, approved, clearlydefined
npm/npmjs/@npmcli/fs/3.1.0, ISC AND MIT, approved, #14656
npm/npmjs/@npmcli/git/4.0.3, ISC, approved, #7598
npm/npmjs/@npmcli/installed-package-contents/2.0.1, ISC, approved, clearlydefined
npm/npmjs/@npmcli/move-file/2.0.0, MIT, approved, clearlydefined
Expand Down
2 changes: 1 addition & 1 deletion charts/traceability-foss/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies:
condition: pgadmin4.enabled
- name: item-relationship-service
repository: https://eclipse-tractusx.github.io/item-relationship-service
version: 7.1.0
version: 7.1.1
condition: item-relationship-service.enabled
- name: tractusx-connector
repository: https://eclipse-tractusx.github.io/tractusx-edc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ spec:
value: "{{ .Values.image.CATENAX_PORTAL_URL }}"
- name: GIT_TAG
value: "{{ .Values.image.tag }}"
- name: BPN
value: "{{ .Values.image.BPN }}"

ports:
- name: http
containerPort: {{ .Values.service.port }}
Expand Down
1 change: 1 addition & 0 deletions charts/traceability-foss/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ frontend:
CATENAX_PORTAL_BACKEND_DOMAIN: "CHANGEME" # portal backend domain example: catena-x.net
CATENAX_PORTAL_URL: "CHANGEME" # portal url example: https://portal.net/
CATENAX_PORTAL_CLIENT_ID: "CHANGEME" # application id created on portal
BPN: "CHANGEME"

##
## Image pull secret to create to obtain the container image
Expand Down
7,510 changes: 7,509 additions & 1 deletion docs/api/traceability-foss-backend.json

Large diffs are not rendered by default.

Loading

0 comments on commit 197a5c0

Please sign in to comment.