Skip to content

Commit

Permalink
Merge pull request #699 from catenax-ng/main
Browse files Browse the repository at this point in the history
10.5.0
  • Loading branch information
ds-mwesener authored Feb 22, 2024
2 parents 9442a5b + 33744de commit c656f30
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions charts/traceability-foss/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -93,6 +93,7 @@ public List<AssetBase> getAssets() {
}

@Override
@Transactional
public AssetBase save(AssetBase asset) {
return jpaAssetAsBuiltRepository.save(AssetAsBuiltEntity.from(asset)).toDomain();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public List<AssetBase> getAssets() {
}

@Override
@Transactional
public AssetBase save(AssetBase asset) {
return AssetAsPlannedEntity.toDomain(jpaAssetAsPlannedRepository.save(AssetAsPlannedEntity.from(asset)));
}
Expand Down

0 comments on commit c656f30

Please sign in to comment.