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

BA-198: Merge upstream (10.5.0) Sprint 1.1 #181

Closed
wants to merge 431 commits into from
Closed

BA-198: Merge upstream (10.5.0) Sprint 1.1 #181

wants to merge 431 commits into from

Conversation

rogocof
Copy link

@rogocof rogocof commented Mar 5, 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
mkanal and others added 29 commits February 21, 2024 14:39
…ating-library

Chore/412 updating library
…clude-security-scope

chore(security): XXX exlude dist folder in frontend in CodeQL
# Conflicts:
#	CHANGELOG.md
#	tx-backend/src/test/java/org/eclipse/tractusx/traceability/assets/infrastructure/base/irs/IrsServiceTest.java
#	tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200.json
#	tx-backend/src/test/resources/stubs/irs/get/jobs/id/response_200_downward_asPlanned.json
#	tx-models/src/main/java/assets/response/base/response/AssetBaseResponse.java
#	tx-models/src/main/java/assets/response/base/response/SemanticDataModelResponse.java
…clude-security-scope

chore(security): XXX set ignore
…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
[BA-750] Merge changes from upstream 10.5.0 into cfx main
@rogocof rogocof closed this Mar 5, 2024
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.

10 participants