Skip to content

Commit

Permalink
Update IRS Request, Asset Table, and Asset Mapping, Removing Map, Map…
Browse files Browse the repository at this point in the history 
… component and supplierPart (#94)

* Feature/tracefoss 617 upstream visiblity (#169)
* chore: TRACEFOSS-XXX removed some excluded files from kics scan.

---------

Co-authored-by: Maximilian Wesener <[email protected]>
  • Loading branch information
@ds-mmaul @ds-mwesener
ds-mmaul and ds-mwesener authored Apr 25, 2023
1 parent 879e8ee commit cd317bd
Show file tree
Hide file tree
Showing 51 changed files with 2,628 additions and 1,374 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/eclipse-dash.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Build with Maven and check dependencies
run: |
cd tx-backend
mvn --batch-mode --update-snapshots verify -Ddash.summary=../DEPENDENCIES_BACKEND -DskipTests -Pdependency-check -Ddash.fail=true
mvn --batch-mode --update-snapshots verify -Ddash.summary=../DEPENDENCIES_BACKEND -DskipTests -Pdependency-check,license-check -Ddash.fail=true
- name: upload results
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kics.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
# Scanning directory .
path: "./tx-backend"

exclude_paths: "tx-backend/openapi/traceability-foss-backend.json,tx-backend/infrastructure/,tx-backend/src/main/resources/swagger.yml"
exclude_paths: "tx-backend/openapi/traceability-foss-backend.json"
# Fail on HIGH severity results
fail_on: high
# Disable secrets detection - we use GitGuardian
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spotbugs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
restore-keys: ${{ runner.os }}-m2

- name: run maven spotbugs plugin
run: mvn clean package -DskipTests=true spotbugs:check
run: mvn clean validate -DskipTests=true -Pspotbugs-check spotbugs:check
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Added possibility to configure realm in FE
- Added license headers to helm chart files
- Added possibility to create an alert within my parts page, marked with WIP
- Added additional irs request on irs-service to also include SingleLevelUsageAsBuilt param
- Added owner column to asset table

### Changed
- Updated spring-boot:core from 6.0.6 to 6.0.8 for cve-2023-20863
- backend directory and module to tx-backend
- backend/cucumber-tests directory to tx-cucumber-tests
- Updated mapping of assets
- Alignment of user and groups between helmchart and application
- Updated readme links
- Container labelling refactored

### Removed
- Removed usage of add-license-header script in FE hook
- Removed usage of map and map component
- Removed usage of map and map component
- Removed supplierPart boolean from asset

## [3.2.0] - 2023-04-17

Expand Down
22 changes: 22 additions & 0 deletions dev/example.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
## Query for assets with childs:

SELECT asset.id, asset.customer_part_id,asset.id_short, asset.manufacturer_id, asset.manufacturer_name, asset.manufacturer_part_id, asset.manufacturing_country, asset.manufacturing_date, asset.name_at_customer, asset.name_at_manufacturer, asset.quality_type, asset.batch_id, asset.part_instance_id, asset.van
FROM public.asset
JOIN asset_child_descriptors
ON asset.id = asset_child_descriptors.id;

## Query for assets with parents:

SELECT asset.id, asset.customer_part_id,asset.id_short, asset.manufacturer_id, asset.manufacturer_name, asset.manufacturer_part_id, asset.manufacturing_country, asset.manufacturing_date, asset.name_at_customer, asset.name_at_manufacturer, asset.quality_type, asset.batch_id, asset.part_instance_id, asset.van
FROM public.asset
JOIN asset_parent_descriptors
ON asset.id = asset_parent_descriptors.id;

## Clean up data consumption process relevant things:

delete FROM public.asset_child_descriptors;
delete FROM public.asset_parent_descriptors;
delete FROM public.asset;
delete FROM public.shell_descriptor;


120 changes: 66 additions & 54 deletions tx-backend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

<dependencies>
<!-- tx-application modules -->
<!-- <dependency>
<groupId>org.eclipse.tractusx.traceability</groupId>
<artifactId>tx-models</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>-->
<!-- <dependency>
<groupId>org.eclipse.tractusx.traceability</groupId>
<artifactId>tx-models</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>-->

<!-- managed by spring boot -->
<dependency>
Expand Down Expand Up @@ -221,6 +221,12 @@
<version>${commons-io.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>

<dependency> <!-- use a specific Groovy version rather than the one specified by spock-core -->
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
Expand Down Expand Up @@ -344,55 +350,6 @@
<build>
<finalName>traceability-app-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
<version>${eclipse-license-tool.version}</version>
<executions>
<execution>
<id>license-check</id>
<phase>package</phase>
<goals>
<goal>license-check</goal>
</goals>
</execution>
<execution>
<id>install-license</id>
<phase>install</phase>
<goals>
<goal>license-check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs-plugin.version}</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
<xmlOutput>true</xmlOutput>
<failThreshold>High</failThreshold>
<excludeFilterFile>ci/spotbugs-excludes.xml</excludeFilterFile>
<plugins>
<plugin>
<groupId>com.h3xstream.findsecbugs</groupId>
<artifactId>findsecbugs-plugin</artifactId>
<version>${findsecbugs-plugin.version}</version>
</plugin>
</plugins>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down Expand Up @@ -627,6 +584,61 @@

<!-- Maven Profiles -->
<profiles>
<profile>
<id>spotbugs-check</id>
<build>
<plugins>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs-plugin.version}</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
<xmlOutput>true</xmlOutput>
<failThreshold>High</failThreshold>
<excludeFilterFile>ci/spotbugs-excludes.xml</excludeFilterFile>
<plugins>
<plugin>
<groupId>com.h3xstream.findsecbugs</groupId>
<artifactId>findsecbugs-plugin</artifactId>
<version>${findsecbugs-plugin.version}</version>
</plugin>
</plugins>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>license-check</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
<version>${eclipse-license-tool.version}</version>
<executions>
<execution>
<id>check-license</id>
<phase>package</phase>
<goals>
<goal>license-check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>check_style</id>
<build>
Expand Down
Loading

0 comments on commit cd317bd

Please sign in to comment.