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

Conversation

rogocof
Copy link

@rogocof rogocof commented Feb 29, 2024

No description provided.

mkanal and others added 30 commits February 1, 2024 15:27
…-tractusx#437-adapt-to-changes-of-industry-core

Chore/eclipse-tractusx#437 adapt to changes of industry core
                 - Bumped cypress-io/github-action from 6.6.0 to 6.6.1
                 - Bumped tj-actions/changed-files from v41 to v42
                 - Bumped junit-bom version from 5.9.3 to 5.10.1
                 - Fixed some response type descriptions within swagger documentation
                 - Bumped cypress-io/github-action from 6.6.0 to 6.6.1
                 - Bumped tj-actions/changed-files from v41 to v42
                 - Bumped junit-bom version from 5.9.3 to 5.10.1
                 - Fixed some response type descriptions within swagger documentation
                 - Bumped cypress-io/github-action from 6.6.0 to 6.6.1
                 - Bumped tj-actions/changed-files from v41 to v42
                 - Bumped junit-bom version from 5.9.3 to 5.10.1
                 - Fixed some response type descriptions within swagger documentation
chore: bump versions of dependencies and fix response descriptions
…mprove-logging

feature: 534 improve logging
# Conflicts:
#	CHANGELOG.md
#	tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/PublishServiceImpl.java
…lishAssets

chore[xxx] updated error handling in publishAssets method
chore: update error handling when publishing assets
ds-mmaul and others added 14 commits February 21, 2024 16:35
…ombstones-in-be' into feature/533-enable-handling-of-tombstones-in-be
…clude-security-scope

chore(security): XXX exclude more paths in CodeQL
…nable-handling-of-tombstones-in-be

Feature/533 enable handling of tombstones in be
…e-tractusx#437-adapt-to-changes-of-industry-core

Chore/eclipse-tractusx#437 adapt to changes of industry core
…duplicate-key-value

bug: fix duplicate key value
# Conflicts:
#	pom.xml
#	tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/application/asplanned/rest/AssetAsPlannedController.java
#	tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/domain/importpoc/service/MainAspectAsPlannedStrategy.java
@rogocof rogocof self-assigned this Feb 29, 2024
@rogocof rogocof requested a review from hgo-ds February 29, 2024 11:47
Copy link

Integration Test Results

322 tests   322 ✅  1m 9s ⏱️
 37 suites    0 💤
 37 files      0 ❌

Results for commit fa70852.

Copy link

Unit Test Results

218 tests   218 ✅  20s ⏱️
 55 suites    0 💤
 55 files      0 ❌

Results for commit fa70852.

Copy link

@rogocof rogocof changed the title Changes from 10.5.0 [BA-750] Merge changes from upstream 10.5.0 into cfx main Feb 29, 2024
Copy link

‼️ Dependency Check findings ‼️

One or more high/critical findings have been found during dependency check. Please check the depenency report:
https://github.com/catenax-ng/tx-traceability-foss/actions/runs/8095452975

@rogocof rogocof merged commit d7d4fb7 into main Feb 29, 2024
22 of 23 checks passed
@rogocof rogocof deleted the main_with_10.5.0 branch February 29, 2024 13:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.