Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/tracefoss 617 upstream visiblity #169

Merged
merged 44 commits into from
Apr 24, 2023
Merged

Feature/tracefoss 617 upstream visiblity #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
730924a
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 13, 2023
4c1e333
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 13, 2023
3b6cf91
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 14, 2023
b776177
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 14, 2023
d4bc98e
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 15, 2023
1c285f6
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 15, 2023
47b3ffc
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 15, 2023
228da9e
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 15, 2023
c1bf97f
chore: TRACEFOSS-617 updated logic to accept upward visiblity.
ds-mwesener Apr 16, 2023
7a54b92
chore: TRACEFOSS-617 removed deprecated apis
ds-mwesener Apr 18, 2023
1a5a47d
chore: TRACEFOSS-XXX refactored maven modules.
ds-mwesener Apr 18, 2023
e1bf843
chore: TRACEFOSS-XXX Updated models and add to tx-backend
ds-mwesener Apr 18, 2023
998618e
chore: TRACEFOSS-XXX Updated models and add to tx-backend
ds-mwesener Apr 18, 2023
3e0071f
chore: TRACEFOSS-XXX Updated models and add to tx-backend
ds-mwesener Apr 18, 2023
00df923
chore: TRACEFOSS-XXX Updated models and add to tx-backend
ds-mwesener Apr 18, 2023
f7ef9c5
chore: TRACEFOSS-XXX Updated models and add to tx-backend
ds-mwesener Apr 18, 2023
1ae1527
chore: TRACEFOSS-XXX Updated models and add to tx-backend
ds-mwesener Apr 18, 2023
2fc9b5e
chore: TRACEFOSS-XXX Updated models and add to tx-backend
ds-mwesener Apr 19, 2023
f0ca3fa
chore: TRACEFOSS-1281 Added root pom, spring-boot-parent-bom and refa…
ds-mwesener Apr 19, 2023
4e4c612
Merge branch 'feature/TRACEFOSS-maven-module-models' into feature/TRA…
ds-mwesener Apr 19, 2023
6b4fd44
init
ds-mwesener Apr 19, 2023
88a77c3
chore: TRACEFOSS-XXX updated technical documentation.
ds-mwesener Apr 19, 2023
81f5bab
chore: TRACEFOSS-617 removed license check from package phase.
ds-mwesener Apr 19, 2023
1313395
chore: TRACEFOSS-617 adapt failing integration tests.
ds-mwesener Apr 19, 2023
5478114
chore: TRACEFOSS-617 adapt license-check
ds-mwesener Apr 19, 2023
47f569c
chore: TRACEFOSS-617 adapt spotbugs. Added some logic to add the aspe…
ds-mwesener Apr 19, 2023
ad1da19
chore: TRACEFOSS-617 add some first tests.
ds-mwesener Apr 19, 2023
2358c23
chore: TRACEFOSS-617 add some first tests.
ds-mwesener Apr 20, 2023
86597d8
chore: TRACEFOSS-617 refactored some logic.
ds-mwesener Apr 20, 2023
c8c264e
chore: TRACEFOSS-XXX https://github.com/eclipse-tractusx/traceability…
ds-mwesener Apr 21, 2023
2160c0b
chore: TRACEFOSS-617 adapt behaviour of localId key to match correct …
ds-mwesener Apr 21, 2023
6620cb8
chore: TRACEFOSS-617 adapt behaviour of localId key to match correct …
ds-mwesener Apr 21, 2023
4dabb42
Merge branch 'main' into feature/TRACEFOSS-617-upstream-visiblity
ds-mwesener Apr 21, 2023
7885fd1
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
ed3d663
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
46bedfc
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
8803fb5
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
69960f9
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
98d5cb5
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
5b0c327
Merge branch 'main' into feature/TRACEFOSS-617-upstream-visiblity
ds-mwesener Apr 21, 2023
c84cde8
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
64b399f
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
cff1552
chore: TRACEFOSS-617 adapt tests
ds-mwesener Apr 21, 2023
e91fc08
chore: TRACEFOSS-617 refactored
ds-mwesener Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/eclipse-dash.yml
View file
Open in desktop
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/spotbugs.yml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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