From 9f1b0f68937234526ddb1f11935606b3f73127f7 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Thu, 22 Feb 2024 13:37:44 +0100 Subject: [PATCH 1/3] bug: fix duplicate key value --- .../asbuilt/repository/AssetAsBuiltRepositoryImpl.java | 3 ++- .../asplanned/repository/AssetAsPlannedRepositoryImpl.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java index c646ff0d22..abd6841d3b 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asbuilt/repository/AssetAsBuiltRepositoryImpl.java @@ -23,7 +23,6 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; -import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.exception.AssetNotFoundException; import org.eclipse.tractusx.traceability.assets.domain.asbuilt.repository.AssetAsBuiltRepository; @@ -36,6 +35,7 @@ import org.eclipse.tractusx.traceability.assets.infrastructure.base.model.AssetBaseEntity; import org.eclipse.tractusx.traceability.common.repository.CriteriaUtility; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.AbstractMap; import java.util.List; @@ -93,6 +93,7 @@ public List getAssets() { } @Override + @Transactional public AssetBase save(AssetBase asset) { return jpaAssetAsBuiltRepository.save(AssetAsBuiltEntity.from(asset)).toDomain(); } diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java index 23cee46e04..0fa9fd260d 100644 --- a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java +++ b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/assets/infrastructure/asplanned/repository/AssetAsPlannedRepositoryImpl.java @@ -95,6 +95,7 @@ public List getAssets() { } @Override + @Transactional public AssetBase save(AssetBase asset) { return AssetAsPlannedEntity.toDomain(jpaAssetAsPlannedRepository.save(AssetAsPlannedEntity.from(asset))); } From 8528315bb68feeef5f86fb2eabbdea37d02ff305 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Thu, 22 Feb 2024 14:29:46 +0100 Subject: [PATCH 2/3] chore(release): 10.5.0 --- CHANGELOG.md | 9 +++++++-- charts/traceability-foss/CHANGELOG.md | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45731318ab..035542a4b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,14 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [UNRELEASED - DD.MM.YYYY] - ### Added +### Changed + +### Removed + +## [10.5.0 - 22.02.2024] + ### Changed - updated publish-documentation workflow with two new steps - changed @ApiModelProperty annotation with @Schema - added logic to consume tombstone information from IRS for assets -- + ### Removed - removed frontend/dist folder from codeQL scan diff --git a/charts/traceability-foss/CHANGELOG.md b/charts/traceability-foss/CHANGELOG.md index d2e115f5f1..ac6527cbb0 100644 --- a/charts/traceability-foss/CHANGELOG.md +++ b/charts/traceability-foss/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.3.30] - 2024-02-19 +### No changes + ## [1.3.29] - 2024-02-19 ### No changes From 2d04f3c5ebe06db5ba411610a93de222a3982b29 Mon Sep 17 00:00:00 2001 From: ds-mwesener <124587888+ds-mwesener@users.noreply.github.com> Date: Thu, 22 Feb 2024 13:31:33 +0000 Subject: [PATCH 3/3] chore(release): Prepare release for Helm version 1.3.30 --- charts/traceability-foss/Chart.yaml | 8 ++++---- charts/traceability-foss/charts/backend/Chart.yaml | 4 ++-- charts/traceability-foss/charts/frontend/Chart.yaml | 4 ++-- frontend/package.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml index 688d78b275..abf6a00f8d 100644 --- a/charts/traceability-foss/Chart.yaml +++ b/charts/traceability-foss/Chart.yaml @@ -23,15 +23,15 @@ home: https://eclipse-tractusx.github.io/ sources: - https://github.com/eclipse-tractusx/traceability-foss type: application -version: 1.3.29 -appVersion: "10.4.0" +version: 1.3.30 +appVersion: "10.5.0" dependencies: - name: frontend repository: "file://charts/frontend" - version: 1.3.29 + version: 1.3.30 - name: backend repository: "file://charts/backend" - version: 1.3.29 + version: 1.3.30 - name: postgresql repository: https://charts.bitnami.com/bitnami version: 12.12.10 diff --git a/charts/traceability-foss/charts/backend/Chart.yaml b/charts/traceability-foss/charts/backend/Chart.yaml index e4cbf567c5..850c9a92b1 100644 --- a/charts/traceability-foss/charts/backend/Chart.yaml +++ b/charts/traceability-foss/charts/backend/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: backend description: A Helm chart for Traceability backend application. type: application -version: 1.3.29 -appVersion: "10.4.0" +version: 1.3.30 +appVersion: "10.5.0" dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami diff --git a/charts/traceability-foss/charts/frontend/Chart.yaml b/charts/traceability-foss/charts/frontend/Chart.yaml index 025e6e766a..35d9b93296 100644 --- a/charts/traceability-foss/charts/frontend/Chart.yaml +++ b/charts/traceability-foss/charts/frontend/Chart.yaml @@ -20,5 +20,5 @@ apiVersion: v2 name: frontend description: A Helm chart for Traceability frontend application. type: application -version: 1.3.29 -appVersion: "10.4.0" +version: 1.3.30 +appVersion: "10.5.0" diff --git a/frontend/package.json b/frontend/package.json index 7c463e535d..54ea417ddc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "trace-x", - "version": "10.4.0", + "version": "10.5.0", "scripts": { "analyze": "ng build --configuration=production --stats-json && webpack-bundle-analyzer dist/stats.json", "build:prod": "ng build --output-hashing=all --configuration=debugProd --base-href /{baseHrefPlaceholder}/ --deploy-url /{baseHrefPlaceholder}/ ",