Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

[BA-750] Merge changes from upstream 10.5.0 into cfx main #178

Merged
merged 430 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
430 commits
Select commit Hold shift + click to select a range
12e8465
Update docs/concept/#437-adapt-to-changes-of-industry-core/#437-adapt…
mkanal Feb 1, 2024
0d61659
Update docs/concept/#437-adapt-to-changes-of-industry-core/#437-adapt…
mkanal Feb 1, 2024
ae0a243
Update docs/concept/#437-adapt-to-changes-of-industry-core/#437-adapt…
ds-mmaul Feb 1, 2024
fa6ffd8
Merge pull request #966 from catenax-ng/chore/#437-adapt-to-changes-o…
ds-mmaul Feb 1, 2024
ebc0bcb
chore: map PublishAssetException to HTTP 404
ds-lcapellino Feb 1, 2024
fe0ed27
chore: refactor
ds-lcapellino Feb 1, 2024
dc923f9
chore: update CHANGELOG.md
ds-lcapellino Feb 1, 2024
e43977f
Merge pull request #607 from catenax-ng/main
ds-mmaul Feb 1, 2024
6e84ebb
chore(security): - Bumped jacoco-maven-plugin from 0.8.8 to 0.8.11
ds-mwesener Feb 2, 2024
142372c
chore(security): - Bumped jacoco-maven-plugin from 0.8.8 to 0.8.11
ds-mwesener Feb 2, 2024
87c5ed8
Update Dependencies Backend Action
ds-mwesener Feb 2, 2024
e0c66d9
Merge pull request #969 from catenax-ng/action/dependencies
ds-mwesener Feb 2, 2024
c886058
chore(security): - Bumped jacoco-maven-plugin from 0.8.8 to 0.8.11
ds-mwesener Feb 2, 2024
34a952a
Merge remote-tracking branch 'origin/main'
ds-mwesener Feb 2, 2024
61aa397
chore(security): added trivy ignore to all executions.
ds-mwesener Feb 2, 2024
a96e05c
Merge pull request #609 from catenax-ng/main
ds-mwesener Feb 2, 2024
b474837
feature: 534 improve logging
ds-lcapellino Feb 2, 2024
d027bc6
feature: 534 improve logging
ds-lcapellino Feb 2, 2024
9b270b9
feature: 534 improve logging
ds-lcapellino Feb 2, 2024
5b049a4
Merge pull request #970 from catenax-ng/feature/534-improve-logging
ds-lcapellino Feb 2, 2024
4933623
feature: 534 improve logging
ds-lcapellino Feb 2, 2024
f941671
Merge branch 'main' into chore/xxx-publishAssets
ds-lcapellino Feb 2, 2024
f7319b6
chore: refactor logging, fix merge conflicts
ds-lcapellino Feb 2, 2024
e801237
chore: refactor
ds-lcapellino Feb 5, 2024
1195b57
chore: refactor
ds-lcapellino Feb 5, 2024
9beadab
Merge pull request #946 from catenax-ng/chore/xxx-publishAssets
ds-lcapellino Feb 5, 2024
e2218cd
Update Dependencies Backend Action
ds-lcapellino Feb 5, 2024
6070822
Merge pull request #971 from catenax-ng/action/dependencies
ds-mmaul Feb 5, 2024
4a52068
Merge pull request #632 from catenax-ng/main
ds-mmaul Feb 5, 2024
4795067
Merge pull request #973 from eclipse-tractusx/main
ds-lcapellino Feb 5, 2024
dafbb7c
chore(release): 10.3.0
ds-mmaul Feb 5, 2024
d010b73
chore(release): Prepare release for Helm version 1.3.28
ds-mmaul Feb 5, 2024
d0e675c
Merge pull request #974 from catenax-ng/chore/prepare-helm-release-1.…
ds-mmaul Feb 5, 2024
31fb7c3
chore(release): Prepare release for Helm version 1.3.28
ds-mmaul Feb 5, 2024
47fe103
Merge pull request #634 from eclipse-tractusx/chore/prepare-helm-rele…
ds-mmaul Feb 5, 2024
0535948
Merge pull request #635 from eclipse-tractusx/release/10.3.0
ds-mmaul Feb 5, 2024
ec924a4
Merge pull request #975 from catenax-ng/release/10.3.0
ds-mmaul Feb 5, 2024
bbb7470
Update Dependencies Backend Action
ds-mmaul Feb 5, 2024
a76eca7
Merge pull request #637 from catenax-ng/main
ds-mmaul Feb 5, 2024
1c75231
Merge pull request #976 from eclipse-tractusx/main
ds-lcapellino Feb 5, 2024
5b07a12
Merge pull request #972 from catenax-ng/action/dependencies
ds-ext-sceronik Feb 8, 2024
2eaadc8
chore(concept): 621 add parts view concept
ds-mmaul Feb 8, 2024
845bd85
chore(concept): #568 create concept
ds-crehm Feb 9, 2024
efaa7f7
chore(concept): 621 add parts view concept
ds-mmaul Feb 12, 2024
ee39812
chore(concept): #568 add section
ds-crehm Feb 13, 2024
bdd59c0
feature: 416 add job information when importing assets
ds-lcapellino Feb 13, 2024
109b9e1
feature: 416 add job information when importing assets
ds-lcapellino Feb 13, 2024
beeb9c0
feature(tombstone): 533 added tombstone error details to parts table …
ds-mmaul Feb 13, 2024
0423e95
feature(tombstone): 533 added tombstone error details to parts table …
ds-mmaul Feb 13, 2024
c0b85a4
chore(): [TRACEFOSS-XXX] added aspect model SingleLevelUsageAsBuilt, …
ds-jleyh Feb 14, 2024
4c08121
Merge pull request #979 from catenax-ng/feature/533-display-tombstone…
ds-mmaul Feb 14, 2024
9494b0a
Update Dependencies Backend Action
ds-mmaul Feb 14, 2024
2600346
chore-xxx-Update publish-documentation.yaml
ds-ashanmugavel Feb 14, 2024
87d1f71
chore-xxx-Update publish-documentation.yaml
ds-ashanmugavel Feb 14, 2024
cdf8959
Merge pull request #981 from catenax-ng/action/dependencies
ds-ext-sceronik Feb 14, 2024
8b7576e
feature: 416 add get endpoint to retrieve import job report
ds-lcapellino Feb 14, 2024
48349f9
chore-xxx added openapi generator plugin
Feb 14, 2024
248ebc4
chore(concept): #436 create concept
ds-crehm Feb 14, 2024
462b49c
feature: 416 add integration test, update arc42 and swagger
ds-lcapellino Feb 14, 2024
6ef58dd
Merge branch 'main' into feature/416-get-report-data-from-import
ds-lcapellino Feb 14, 2024
8794288
chore-xxx added open api plugin and removed errors
Feb 14, 2024
97febd0
chore-xxx updated action
Feb 14, 2024
51b7288
chore-xxx updated action
Feb 14, 2024
c7bfdcf
feature: 416 add not found integration test scenario, refactor
ds-lcapellino Feb 14, 2024
6a6b2c0
Merge pull request #980 from catenax-ng/chore/TRACEFOSS-XXX-compatibi…
ds-lcapellino Feb 14, 2024
d259e36
feature: 416 fix untit tests
ds-lcapellino Feb 14, 2024
8ccbdb6
Merge branch 'main' into chore/xxx-publish_documentation_workflow
Feb 14, 2024
e7568ac
ci: add docker check to dependabot
scherersebastian Feb 14, 2024
d52e3df
ci: add frontend scan to codeql
scherersebastian Feb 14, 2024
02b6cfa
ci: delete .github/workflows/veracode_backend.yml
scherersebastian Feb 14, 2024
e5e6751
ci: delete .github/workflows/veracode_frontend.yml
scherersebastian Feb 14, 2024
8bd7213
ci: setup custom build for frontend
scherersebastian Feb 14, 2024
50fb243
ci: adjust path to build script
scherersebastian Feb 14, 2024
5cb315d
ci: setup correct path for build
scherersebastian Feb 14, 2024
f072fd1
ci: install frontend dependencies
scherersebastian Feb 14, 2024
39c658a
ci: codeql init first
scherersebastian Feb 14, 2024
ab78ca3
chore(tx-backend): #414 security bumps and cves
ds-ext-sceronik Feb 15, 2024
d03ba62
chore(concept): #436 update concept
ds-crehm Feb 15, 2024
b348d8b
chore(concept): #436 update concept
ds-crehm Feb 15, 2024
61af36e
chore-xxx added dependency jackson-coreutils
Feb 15, 2024
5c22c20
chore-xxx added dependency fasterxml
Feb 15, 2024
5dd0608
feature: 416 add scenario documentation
ds-lcapellino Feb 15, 2024
b0f0459
chore(tx-backend): #414 test sonar issue
ds-ext-sceronik Feb 15, 2024
bf1384b
feature: 416 add scenario documentation
ds-lcapellino Feb 15, 2024
c280cbf
chore(tx-backend): #414 test sonar issue
ds-ext-sceronik Feb 15, 2024
fefbfea
chore(tx-backend): #414 test sonar issue
ds-ext-sceronik Feb 15, 2024
b930068
chore(tx-backend): #414 test upload-artifact issue
ds-ext-sceronik Feb 15, 2024
320fce0
chore(tx-backend): #414 test upload-artifact issue
ds-ext-sceronik Feb 15, 2024
1ca372c
chore(tx-backend): #414 test upload-artifact issue
ds-ext-sceronik Feb 15, 2024
f237028
chore(tx-backend): #414 test upload-artifact issue
ds-ext-sceronik Feb 15, 2024
e996424
chore(concept): #436 include review suggestions
ds-crehm Feb 15, 2024
04168f8
chore(tx-backend): #414 fix injection issue on callback jobId
ds-ext-sceronik Feb 15, 2024
0915a50
chore(tx-backend): #414 add changelog
ds-ext-sceronik Feb 15, 2024
5b5f25b
chore-xxx removed pluginRepo from tx-backend pom.xml
Feb 15, 2024
e07349c
chore-xxx removed swagger-core-plugin
Feb 15, 2024
26bfa64
Merge pull request #984 from catenax-ng/chore/security-minister-15-02…
ds-ext-sceronik Feb 15, 2024
59900f8
Merge pull request #657 from catenax-ng/main
ds-mmaul Feb 15, 2024
019ca20
Merge pull request #987 from eclipse-tractusx/main
ds-ext-sceronik Feb 15, 2024
f8912de
feature: 416 cancel job in case of errors
ds-lcapellino Feb 15, 2024
55b137b
Merge branch 'main' into feature/416-get-report-data-from-import
ds-lcapellino Feb 15, 2024
756723c
Merge pull request #982 from catenax-ng/feature/416-get-report-data-f…
ds-lcapellino Feb 15, 2024
7845dc7
chore(security): XXX fix medium security findings from veracode
ds-mmaul Feb 15, 2024
ea21418
Merge pull request #988 from catenax-ng/chore/XXX-fix-security-issues
ds-mmaul Feb 15, 2024
5b2063f
Update Dependencies Backend Action
ds-mmaul Feb 15, 2024
5779270
Merge pull request #986 from catenax-ng/action/dependencies
ds-mwesener Feb 16, 2024
16c99e3
chore-xxx updated pluginRepo configuration in root pom.xml
Feb 16, 2024
c6a4449
Merge branch 'main' into chore/xxx-publish_documentation_workflow
Feb 16, 2024
8f72343
chore-xxx: resolved merge conflict
Feb 16, 2024
0a4bbc5
chore(security): 516 removed investigation / alert from asPlanned ent…
ds-mwesener Feb 19, 2024
31b653c
chore(security): 516 removed investigation / alert from asPlanned ent…
ds-mwesener Feb 19, 2024
a661120
chore(security): 516 removed investigation / alert from asPlanned ent…
ds-mwesener Feb 19, 2024
de28d29
chore(security): 516 cleared database tables for notifications on as …
ds-mwesener Feb 19, 2024
ad17cf4
feature: 533 consume tombstone information from IRS and return it to …
ds-lcapellino Feb 19, 2024
2c592d5
chore(security): 516 cleared database tables for notifications on as …
ds-mwesener Feb 19, 2024
429c898
chore(security): 516 removed unused import.
ds-mwesener Feb 19, 2024
af8af6c
chore(security): 516 removed unused import.
ds-mwesener Feb 19, 2024
e36446d
chore(security): 516 removed unused import.
ds-mwesener Feb 19, 2024
367f15c
Merge pull request #990 from catenax-ng/chore/516-removal-asplanned-i…
ds-mwesener Feb 19, 2024
d6f1618
Merge pull request #674 from catenax-ng/main
ds-mmaul Feb 19, 2024
f77ffcd
Merge branch 'main' into ci/security-tooling
ds-mwesener Feb 19, 2024
49b3b7a
Merge pull request #654 from eclipse-tractusx/ci/security-tooling
ds-mwesener Feb 19, 2024
e6e3ab0
Merge branch 'main' into chore/436-intermediate-status-handling
ds-crehm Feb 19, 2024
f6ca153
chore(concept): #436 update changelog
ds-crehm Feb 19, 2024
0235eba
Update docs/concept/#621-add-parts-to-notifications/#621-add-parts-to…
ds-mmaul Feb 19, 2024
ccecf7e
Update docs/concept/#621-add-parts-to-notifications/#621-add-parts-to…
ds-mmaul Feb 19, 2024
62de8ea
Update docs/concept/#621-add-parts-to-notifications/#621-add-parts-to…
ds-mmaul Feb 19, 2024
d0f36dd
Update docs/concept/#621-add-parts-to-notifications/#621-add-parts-to…
ds-mmaul Feb 19, 2024
e01d109
Update docs/concept/#621-add-parts-to-notifications/#621-add-parts-to…
ds-mmaul Feb 19, 2024
79d5aa2
Merge branch 'main' into chore/#621-add-parts-view-concept
ds-mmaul Feb 19, 2024
5f57277
chore(concept): added changelog
ds-mmaul Feb 19, 2024
080fef2
Merge branch 'main' into chore/568-policy-management
ds-crehm Feb 19, 2024
4bc38f0
Merge pull request #977 from catenax-ng/chore/#621-add-parts-view-con…
ds-mwesener Feb 19, 2024
14b4829
chore(concept): #436 include review suggestions
ds-crehm Feb 19, 2024
0ce7e4c
chore(concept): #436 include review suggestions
ds-crehm Feb 19, 2024
aeacd19
Merge branch 'main' into chore/568-policy-management
ds-crehm Feb 19, 2024
00d9c97
chore(ux): added test
ds-mmaul Feb 19, 2024
0d891a2
chore(release): Prepare release for Helm version 1.3.29
ds-mmaul Feb 19, 2024
c4db0b7
Merge pull request #992 from catenax-ng/chore/prepare-helm-release-1.…
ds-mmaul Feb 19, 2024
1607d08
Merge pull request #993 from catenax-ng/release/10.4.0
ds-mmaul Feb 19, 2024
5a0a8ef
chore(release): Prepare release for Helm version 1.3.29
ds-mmaul Feb 19, 2024
671bc64
Merge pull request #683 from eclipse-tractusx/chore/prepare-helm-rele…
ds-mmaul Feb 19, 2024
f5a3f26
feature: 533 add as planned integration test
ds-lcapellino Feb 19, 2024
1b18376
Merge branch 'main' into chore/436-intermediate-status-handling
ds-crehm Feb 19, 2024
3b34e3c
Merge pull request #684 from eclipse-tractusx/release/10.4.0
ds-mmaul Feb 19, 2024
06fc372
feature: 416 Change status of cancelled import job to ERROR; Refactor…
ds-lcapellino Feb 19, 2024
ca19c8e
Merge branch 'main' into feature/416-get-report-data-from-import
ds-lcapellino Feb 19, 2024
1766fc7
feature: 533 update CHANGELOG.md
ds-lcapellino Feb 19, 2024
2b49c57
Merge branch 'main' into feature/533-enable-handling-of-tombstones-in-be
ds-lcapellino Feb 19, 2024
6cc8e39
feature: 533 rename V14__add_tombstone_to_assets.sql
ds-lcapellino Feb 19, 2024
458d25c
feature: 533 refactor
ds-lcapellino Feb 19, 2024
53b49f2
Merge pull request #995 from catenax-ng/feature/416-get-report-data-f…
ds-lcapellino Feb 19, 2024
f1a72e8
chore(concept): changed add parts concept to edit parts concept
ds-mmaul Feb 19, 2024
bd99238
feature: 533 refactor
ds-lcapellino Feb 19, 2024
b3cb246
chore(concept): #436 include review suggestions
ds-crehm Feb 20, 2024
a09acfb
Merge remote-tracking branch 'origin/chore/568-policy-management' int…
ds-crehm Feb 20, 2024
42fe11e
Merge pull request #985 from catenax-ng/chore/436-intermediate-status…
ds-crehm Feb 20, 2024
b1c66a4
Merge branch 'main' into chore/568-policy-management
ds-crehm Feb 20, 2024
2ba90fc
chore(documentation): 681 TRG 4.06 separate Docker Notice
ds-mmaul Feb 20, 2024
ffcf3c0
chore(documentation): 681 TRG 4.06 added base images
ds-mmaul Feb 20, 2024
01fa3e3
chore(documentation): 681 TRG 4.06 added base images
ds-mmaul Feb 20, 2024
55fe69e
Merge pull request #997 from catenax-ng/chore/681-separate-docker-ima…
ds-mwesener Feb 20, 2024
2336c7e
Merge pull request #688 from catenax-ng/main
ds-mmaul Feb 20, 2024
5561293
Merge pull request #978 from catenax-ng/chore/568-policy-management
ds-crehm Feb 20, 2024
c47b263
chore(security): 412 updated library.
ds-mwesener Feb 20, 2024
b80354a
chore(security): 412 updated irs.
ds-mwesener Feb 20, 2024
24d351c
Merge pull request #996 from catenax-ng/chore/#621-add-parts-view-con…
ds-mmaul Feb 20, 2024
81bb00a
chore-xxx: update version of dash license tool; remove Repository fro…
Feb 20, 2024
533e01d
Merge branch 'main' into chore/xxx-publish_documentation_workflow
Feb 20, 2024
311cb83
chore-xxx: resolved merge conflict
Feb 20, 2024
1eefcf9
chore(security): 412 refactored due to irs changes
ds-mwesener Feb 20, 2024
4542056
Merge branch 'main' into chore/412-updating-library
ds-mwesener Feb 20, 2024
44bdb87
chore-xxx: updated pom.xml
Feb 20, 2024
d789d1d
chore(security): 412 updated policy matcher to be nullsafe.
ds-mwesener Feb 20, 2024
7b1fdbb
chore(security): 412 updated policy matcher to be nullsafe.
ds-mwesener Feb 20, 2024
7299fdb
feature: 533 refactor Tombstone logic in new class
ds-lcapellino Feb 20, 2024
7e4d842
feature: 533 fix tests
ds-lcapellino Feb 20, 2024
a2a7f1b
feature: 533 fix CHANGELOG.md
ds-lcapellino Feb 20, 2024
0bf212a
feature: 533 fix CHANGELOG.md
ds-lcapellino Feb 20, 2024
37423b3
feature: 533 refactor JobDetailResponse
ds-lcapellino Feb 20, 2024
ac2c38c
feature: 533 refactor JobDetailResponse
ds-lcapellino Feb 20, 2024
905bf52
chore(security): 412 updated policy matcher to be nullsafe.
ds-mwesener Feb 20, 2024
7d32f85
feature: 533 refactor JobDetailResponse
ds-lcapellino Feb 20, 2024
f78c67d
feature: 533 increase code coverage
ds-lcapellino Feb 20, 2024
a1a2c40
chore(docu): Updated readme.
ds-mwesener Feb 21, 2024
ac2650f
chore(update-irs): 412 updating policy response.
ds-mwesener Feb 21, 2024
ad16cfb
Merge branch 'main' into feature/533-enable-handling-of-tombstones-in-be
ds-lcapellino Feb 21, 2024
ecd5f4a
chore(update-irs): 412 updating policy response.
ds-mwesener Feb 21, 2024
4ac71fc
feature: 416 fix response
ds-lcapellino Feb 21, 2024
a8d0274
chore(update-irs): 412 updating policy response.
ds-mwesener Feb 21, 2024
1eb7a8a
chore-xxx: change ApiModelProperty to Schema
Feb 21, 2024
331ef84
chore-xxx: change ApiModelProperty to Schema
Feb 21, 2024
85b1b7d
chore-xxx: updated Changelog
Feb 21, 2024
8f542b7
chore-xxx: updated Changelog
Feb 21, 2024
f227ae1
Merge remote-tracking branch 'origin/chore/xxx-publish_documentation_…
Feb 21, 2024
032035a
chore-xxx: updated Changelog
Feb 21, 2024
5b904eb
chore-xxx: updated Changelog
Feb 21, 2024
e1008f9
Merge pull request #983 from catenax-ng/chore/xxx-publish_documentati…
ds-lcapellino Feb 21, 2024
01bc5e6
Merge branch 'main' into feature/533-enable-handling-of-tombstones-in-be
ds-lcapellino Feb 21, 2024
7a8e270
feature: 533 refactor
ds-lcapellino Feb 21, 2024
5139826
feature: 533 refactor
ds-lcapellino Feb 21, 2024
fb2d255
feature: 533 refactor
ds-lcapellino Feb 21, 2024
65f969f
chore(update-irs): 412 updating shell response.
ds-mwesener Feb 21, 2024
66ad122
Merge branch 'main' into chore/412-updating-library
ds-mwesener Feb 21, 2024
8dee6a5
chore-xxx: added Size
Feb 21, 2024
c940d7c
Merge pull request #694 from catenax-ng/main
ds-mmaul Feb 21, 2024
203e00e
Merge branch 'main' into chore-xxx-ApiModelProperty
Feb 21, 2024
5b0e615
chore-xxx: update CHANGELOG.md
Feb 21, 2024
b22437d
chore-xxx: removed description from @Schema
Feb 21, 2024
6682e79
chore-xxx: updated traceability-foss-backend.json
Feb 21, 2024
2249ba8
chore(update-irs): 412 refactored request object.
ds-mwesener Feb 21, 2024
c86ec74
chore-xxx: removed @Schema description from enums
Feb 21, 2024
0552c6d
chore-xxx: changed @Schema
Feb 21, 2024
2f96c8c
chore-xxx: removed @Schema
Feb 21, 2024
b2c6b95
chore-xxx: removed @Schema
Feb 21, 2024
1a29ffb
Merge pull request #1001 from eclipse-tractusx/main
ds-lcapellino Feb 21, 2024
7921dab
chore-xxx: removed @Schema
Feb 21, 2024
8986ca6
chore-xxx: removed @Schema
Feb 21, 2024
1a9eeb1
chore-xxx: removed @Schema
Feb 21, 2024
a4138ce
chore-xxx: removed @Schema
Feb 21, 2024
3cd0548
chore-xxx: removed @Schema
Feb 21, 2024
ceca9a2
Merge pull request #1000 from catenax-ng/chore-xxx-ApiModelProperty
ds-ashanmugavel Feb 21, 2024
2383c48
fix(concept):[#437] update to version 3.0.0 or R24.5
mkanal Feb 21, 2024
fec221f
fix(concept):[#437] set new versions according to R24.5
mkanal Feb 21, 2024
366fdfd
chore(update-irs): 412 refactored request object.
ds-mwesener Feb 21, 2024
7827772
Merge branch 'main' into chore/412-updating-library
ds-mwesener Feb 21, 2024
a613b2b
chore(security): XXX exlude dist folder in frontend in CodeQL
ds-mmaul Feb 21, 2024
7c1a6eb
chore(security): XXX add changelog
ds-mmaul Feb 21, 2024
a33e43f
Merge pull request #998 from catenax-ng/chore/412-updating-library
ds-mwesener Feb 21, 2024
787db55
Merge pull request #1002 from catenax-ng/chore/XXX-exclude-security-s…
ds-mwesener Feb 21, 2024
9155e6d
Merge branch 'main' into feature/533-enable-handling-of-tombstones-in-be
ds-lcapellino Feb 21, 2024
59e9651
chore(security): XXX set ignore
ds-mmaul Feb 21, 2024
39348a9
feature: 533 merge main
ds-lcapellino Feb 21, 2024
be80278
Merge pull request #1003 from catenax-ng/chore/XXX-exclude-security-s…
ds-mwesener Feb 21, 2024
425c3a4
Update Dependencies Backend Action
ds-mwesener Feb 21, 2024
5d3bf92
chore(concept):[#437] update domain model changes
mkanal Feb 21, 2024
28d8703
Merge branch 'main' into feature/533-enable-handling-of-tombstones-in-be
ds-mwesener Feb 21, 2024
dbed818
chore(security): XXX exclude more paths in CodeQL
ds-mmaul Feb 21, 2024
9b3f5a4
chore(UUX): 515 log EDC request and response
ds-mmaul Feb 21, 2024
7a76289
feature: 533 delete flaky test
ds-lcapellino Feb 21, 2024
0dcb40c
Merge remote-tracking branch 'origin/feature/533-enable-handling-of-t…
ds-lcapellino Feb 21, 2024
e2419e7
chore(security): xxx remove logs
ds-mmaul Feb 21, 2024
985f1f8
Merge pull request #1005 from catenax-ng/chore/XXX-exclude-security-s…
ds-mwesener Feb 21, 2024
b7cc5c9
Merge pull request #999 from catenax-ng/action/dependencies
ds-mwesener Feb 21, 2024
f88614f
Merge pull request #994 from catenax-ng/feature/533-enable-handling-o…
ds-mwesener Feb 21, 2024
7d292c7
Merge pull request #1004 from catenax-ng/chore/#437-adapt-to-changes-…
ds-mmaul Feb 21, 2024
0ff21cb
Merge pull request #697 from catenax-ng/main
ds-mmaul Feb 22, 2024
9f1b0f6
bug: fix duplicate key value
ds-lcapellino Feb 22, 2024
7b579b4
Merge pull request #1007 from catenax-ng/bug/xxx-fix-duplicate-key-value
ds-lcapellino Feb 22, 2024
8528315
chore(release): 10.5.0
ds-mwesener Feb 22, 2024
fa70852
Merge branch 'main' into main_with_10.5.0
rogocof Feb 29, 2024
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
8 changes: 8 additions & 0 deletions .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,11 @@ query-filters:
id:
- java/unused-reference-type
- java/spring-disabled-csrf-protection

paths-ignore:
- frontend/dist
- frontend/cypress
- frontend/src/app/mocks
- frontend/src/tests
- '**/*.spec.ts'
- frontend/src/mockServiceWorker.js
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,8 @@ updates:
day: "wednesday"
time: "03:00"

- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
# open-pull-requests-limit: 5
3 changes: 3 additions & 0 deletions .github/workflows/.trivyignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# ref https://github.com/catenax-ng/product-traceability-foss-backend/security/code-scanning/1419
CVE-2022-25857
# ref https://github.com/catenax-ng/tx-traceability-foss/security/code-scanning/6879
# this is acceptable due to custom environment variable injection script which is executed upon FE container startup
AVD-KSV-0014
49 changes: 33 additions & 16 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,14 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'java' ]
language: [ 'java', 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

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

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand All @@ -95,17 +89,24 @@ jobs:
config-file: ./.github/codeql/codeql-config.yml
queries: +security-and-quality,security-extended

- name: Cache maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
# uses: github/codeql-action/autobuild@v3
# - name: Autobuild
# uses: github/codeql-action/autobuild@v3

- name: Install frontend dependencies
if: ${{ matrix.language == 'javascript' }}
run: |
cd frontend
npm install

- name: Build frontend
if: ${{ matrix.language == 'javascript' }}
run: |
cd frontend
npm run build:prod
env:
baseHrefPlaceholder: placeholder

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -114,7 +115,23 @@ jobs:
# and modify them (or add more) to build your code if your project
# uses a compiled language

- name: Set up JDK 17
if: ${{ matrix.language == 'java' }}
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Cache maven packages
if: ${{ matrix.language == 'java' }}
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Build Package
if: ${{ matrix.language == 'java' }}
run: |
mvn clean package -pl tx-models,tx-backend --batch-mode -DskipTests

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
run: mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES_BACKEND

- name: Run install
uses: borales/actions-yarn@v4
uses: borales/actions-yarn@v5
with:
cmd: install
dir: 'frontend'

- name: Generate FE Dependencies file
uses: borales/actions-yarn@v4
uses: borales/actions-yarn@v5
with:
cmd: run dependencies:generate
dir: 'frontend'
Expand All @@ -76,7 +76,7 @@ jobs:
if: ${{ env.were_files_changed }} == 'true'

- name: Create pull request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
add-paths: |
DEPENDENCIES_BACKEND
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-main_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{ env.BACKEND_IMAGE_DOCKER_HUB }}
readme-filepath: README.md
readme-filepath: ./DOCKER_NOTICE.md
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-main_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ jobs:
tags: ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{ env.FRONTEND_IMAGE_DOCKER_HUB }}:${{ github.sha }}

- name: Update Docker Hub description
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
with:
username: ${{ env.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{ env.FRONTEND_IMAGE_DOCKER_HUB }}
readme-filepath: README.md
readme-filepath: ./frontend/DOCKER_NOTICE.md
10 changes: 5 additions & 5 deletions .github/workflows/docker-image-tag-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{ env.FRONTEND_IMAGE_DOCKER_HUB }}
readme-filepath: README.md
readme-filepath: ./frontend/DOCKER_NOTICE.md

Release-docker-image-backend:
runs-on: ubuntu-latest
Expand All @@ -115,7 +115,7 @@ jobs:
cache: 'maven'

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -164,10 +164,10 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.DOCKER_HUB_REGISTRY_NAMESPACE }}/${{env.BACKEND_IMAGE_DOCKER_HUB}}
readme-filepath: README.md
readme-filepath: ./DOCKER_NOTICE.md

16 changes: 8 additions & 8 deletions .github/workflows/e2e-tests-xray_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
node-version: 18.x

- name: Run yarn install
uses: Borales/actions-yarn@v4.2.0
uses: Borales/actions-yarn@v5
with:
cmd: install # will run `yarn install` command

Expand All @@ -66,7 +66,7 @@ jobs:
run: ./scripts/xray-download-feature-files.sh

- name: Save cypress/e2e folder
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cypress - e2e
if-no-files-found: error
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
node-version: 18.x

- name: Cypress run all tests
uses: cypress-io/[email protected].0 # use the explicit version number
uses: cypress-io/[email protected].1 # use the explicit version number
with:
start: npm run start:auth:e2ea
wait-on: "http://localhost:4200"
Expand All @@ -127,7 +127,7 @@ jobs:

- name: Archive cypress artifacts
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cypress generated files - chrome
path: |
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
# node-version: 18.x
#
# - name: Cypress run all tests
# uses: cypress-io/[email protected].0 # use the explicit version number
# uses: cypress-io/[email protected].1 # use the explicit version number
# with:
# start: npm start
# wait-on: "http://localhost:4200"
Expand All @@ -182,7 +182,7 @@ jobs:
#
# - name: Archive cypress artifacts
# if: success() || failure()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: cypress generated files - firefox
# path: |
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
# run: npx playwright install --with-deps webkit
#
# - name: Cypress run all tests
# uses: cypress-io/[email protected].0 # use the explicit version number
# uses: cypress-io/[email protected].1 # use the explicit version number
# with:
# start: npm start:auth:e2ea
# wait-on: "http://localhost:4200"
Expand All @@ -245,7 +245,7 @@ jobs:
#
# - name: Archive cypress artifacts
# if: success() || failure()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: cypress generated files - webkit
# path: |
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/eclipse-dash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: DEPENDENCIES_FRONTEND

Expand All @@ -67,7 +67,7 @@ jobs:
distribution: 'temurin'

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -79,6 +79,7 @@ jobs:

- name: upload results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: DEPENDENCIES_BACKEND
overwrite: true
2 changes: 2 additions & 0 deletions .github/workflows/helm-chart-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ jobs:

- name: Run chart-releaser
uses: helm/[email protected]
with:
mark_as_latest: false
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_RELEASE_NAME_TEMPLATE: "${{ env.RELEASE_VERSION }}"
26 changes: 24 additions & 2 deletions .github/workflows/publish-documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,45 +48,64 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20

- name: Cache maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2


- name: Build API documentation with Maven
run: |
mvn clean package -pl tx-backend,tx-models -DskipTests --batch-mode
cp tx-backend/target/generated-sources/openapi/index.html docs/src/docs/api-specification/index.html

- name: Build with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
run: |
mvn -f docs/pom.xml --batch-mode generate-resources

- name: Install Asciidoctor Reducer
run: |
sudo gem install asciidoctor-reducer

- name: Reduce docs
run: |
echo $LANG
locale
asciidoctor-reducer -o docs/target/adminguide.adoc docs/src/docs/administration/administration-guide.adoc
asciidoctor-reducer -o docs/target/arc42.adoc docs/src/docs/arc42/full.adoc

- name: Cache plantuml jar
uses: actions/cache@v3
with:
path: plantuml.jar
key: ${{ runner.os }}-file-${{ hashFiles('plantuml.jar') }}

- name: Download PlantUML jar
run: |
wget -O plantuml.jar https://sourceforge.net/projects/plantuml/files/plantuml.jar/download

- name: Place PlantUML jar in specific path
run: |
mv plantuml.jar docs/src/diagram-replacer/

- name: Extract PNG-Images with PlantUML and replace PlantUML Code inside docs with PNG-Images
working-directory: docs/src/diagram-replacer/
run: |
node extract.js
node replace.js

- name: Convert to Markdown
run: |
npx downdoc -o docs/target/generated-docs/adminguide.md docs/src/diagram-replacer/generated-adocs/adminguide.adoc
npx downdoc -o docs/target/generated-docs/arc42.md docs/src/diagram-replacer/generated-adocs/arc42.adoc
npx downdoc -o docs/target/generated-docs/user-manual.md docs/src/docs/user/user-manual.adoc

- name: MD files post-processing
working-directory: docs/src/post-processing/
run: |
Expand All @@ -95,15 +114,18 @@ jobs:
node fix_no_emphasis.js
node fix_https_links.js
node fix_relative_links.js https://$GITHUB_REPOSITORY_OWNER.github.io/$REPO/docs

- name: MD linting
run: |
npm install [email protected]
npx markdownlint-cli2-config docs/.markdownlint.yaml docs/target/generated-docs/adminguide.md
npx markdownlint-cli2-config docs/.markdownlint.yaml docs/target/generated-docs/arc42.md
npx markdownlint-cli2-config docs/.markdownlint.yaml docs/target/generated-docs/user-manual.md

- name: Move assets to target directory
run: |
mv docs/src/diagram-replacer/assets/ docs/target/generated-docs/assets/

- name: GitHub Pages action
uses: peaceiris/[email protected]
with:
Expand Down
Loading
Loading