Skip to content

Commit 0a8f9d9

Browse files
sumanthkb44sumanthkb44
authored
feat: v8.1.0 (#291)
* fix: Bug fix for trigger fossology process validation. (#277) * fixed test case issue * conan processer update * updated requested code changes
1 parent 2be8fd7 commit 0a8f9d9

File tree

105 files changed

+3479
-1530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3479
-1530
lines changed

‎.github/workflows/build-and-release.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949

5050
- name: Build Docker Image
5151
run: |
52-
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v8.0.0
53-
docker save ${{ github.repository }}:continuous-clearing-v8.0.0 -o continuous-clearing-v8.0.0.tar
52+
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v8.1.0
53+
docker save ${{ github.repository }}:continuous-clearing-v8.1.0 -o continuous-clearing-v8.1.0.tar
5454
5555
- name: Upload Docker Image
5656
uses: actions/upload-artifact@v4
@@ -114,25 +114,25 @@ jobs:
114114
env:
115115
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
116116
with:
117-
tag_name: v8.0.0
118-
release_name: Release v8.0.0
117+
tag_name: v8.1.0
118+
release_name: Release v8.1.0
119119
body: |
120120
${{ github.event.head_commit.message }}
121121
draft: true
122122
prerelease: false
123123

124124
- name: Compress Full Build Output into ZIP
125125
run: |
126-
powershell -Command "& {Compress-Archive -Path ${{ github.workspace }}/out/* -DestinationPath ${{ github.workspace }}/continuous-clearing-v8.0.0.zip}"
126+
powershell -Command "& {Compress-Archive -Path ${{ github.workspace }}/out/* -DestinationPath ${{ github.workspace }}/continuous-clearing-v8.1.0.zip}"
127127
128128
- name: Upload Full Build Output ZIP to Release
129129
uses: actions/upload-release-asset@v1
130130
env:
131131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132132
with:
133133
upload_url: ${{ steps.create_release.outputs.upload_url }}
134-
asset_path: ${{ github.workspace }}/continuous-clearing-v8.0.0.zip
135-
asset_name: continuous-clearing-v8.0.0.zip
134+
asset_path: ${{ github.workspace }}/continuous-clearing-v8.1.0.zip
135+
asset_name: continuous-clearing-v8.1.0.zip
136136
asset_content_type: application/zip
137137

138138
- name: Upload Docker Image(tar) to Release
@@ -141,8 +141,8 @@ jobs:
141141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
142142
with:
143143
upload_url: ${{ steps.create_release.outputs.upload_url }}
144-
asset_path: ./continuous-clearing-v8.0.0.tar
145-
asset_name: continuous-clearing-v8.0.0.tar
144+
asset_path: ./continuous-clearing-v8.1.0.tar
145+
asset_name: continuous-clearing-v8.1.0.tar
146146
asset_content_type: application/x-tar
147147

148148
- name: Upload NuGet Package to Release

‎CA.nuspec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package >
55
<metadata>
66
<id>continuous-clearing</id>
7-
<version>8.0.0</version>
7+
<version>8.1.0</version>
88
<authors>Siemens AG</authors>
99
<owners>continuous-clearing contributors</owners>
1010
<projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>
@@ -64,6 +64,9 @@
6464
<file src="out\net8.0\Microsoft.Build.Locator.dll" target="tools\Microsoft.Build.Locator.dll"/>
6565
<file src="out\net8.0\Microsoft.CodeAnalysis.CSharp.dll" target="tools\Microsoft.CodeAnalysis.CSharp.dll"/>
6666
<file src="out\net8.0\Microsoft.CodeAnalysis.dll" target="tools\Microsoft.CodeAnalysis.dll"/>
67+
<file src="out\net8.0\Microsoft.ComponentDetection.Common.dll" target="tools\Microsoft.ComponentDetection.Common.dll"/>
68+
<file src="out\net8.0\Microsoft.ComponentDetection.Contracts.dll" target="tools\Microsoft.ComponentDetection.Contracts.dll"/>
69+
<file src="out\net8.0\Microsoft.ComponentDetection.Detectors.dll" target="tools\Microsoft.ComponentDetection.Detectors.dll"/>
6770
<file src="out\net8.0\Microsoft.Extensions.Configuration.Abstractions.dll" target="tools\Microsoft.Extensions.Configuration.Abstractions.dll"/>
6871
<file src="out\net8.0\Microsoft.Extensions.Configuration.Binder.dll" target="tools\Microsoft.Extensions.Configuration.Binder.dll"/>
6972
<file src="out\net8.0\Microsoft.Extensions.Configuration.CommandLine.dll" target="tools\Microsoft.Extensions.Configuration.CommandLine.dll"/>
@@ -125,6 +128,9 @@
125128
<file src="out\net8.0\System.Security.Permissions.dll" target="tools\System.Security.Permissions.dll"/>
126129
<file src="out\net8.0\System.Threading.AccessControl.dll" target="tools\System.Threading.AccessControl.dll"/>
127130
<file src="out\net8.0\System.Windows.Extensions.dll" target="tools\System.Windows.Extensions.dll"/>
131+
<file src="out\net8.0\System.Text.Json.dll" target="tools\System.Text.Json.dll"/>
132+
<file src="out\net8.0\System.IO.Pipelines.dll" target="tools\System.IO.Pipelines.dll"/>
133+
<file src="out\net8.0\System.Text.Encodings.Web.dll" target="tools\System.Text.Encodings.Web.dll"/>
128134
<file src="out\net8.0\LCT.Telemetry.dll" target="tools\LCT.Telemetry.dll"/>
129135
<file src="out\net8.0\Tommy.dll" target="tools\Tommy.dll"/>
130136
<file src="out\net8.0\YamlDotNet.dll" target="tools\YamlDotNet.dll"/>

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ To ensure such practises are in place, we need to provide software bill of mater
2121

2222
This tool has been logically split into 3 different executables that enable it to be used as separate modules as per the user's requirement.
2323

24+
**_Note: The SBOM created by this tool follows the CycloneDX version [v1.6](https://cyclonedx.org/docs/1.6/json/) and Siemens SBOM standard [v3](https://sbom.siemens.io/v3/format.html). These formats ensure the SBOM is detailed, secure, and meets industry and Siemens-specific requirements._**
25+
2426
**_Note: Continuous Clearing Tool internally uses [Syft](https://github.com/anchore/syft) for component detection for debian/alpine type projects._**
2527

2628

‎TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/Conan/Test_Bom.cdx.json‎

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
{
22
"bomFormat": "CycloneDX",
3-
"specVersion": "1.4",
4-
"serialNumber": "urn:uuid:3e407ffb-8ef0-4b06-bcdb-bdbe12dcd2a7",
3+
"specVersion": "1.6",
4+
"serialNumber": "urn:uuid:167dc9b4-dd8d-4f55-926a-c0f96cabf035",
55
"version": 1,
66
"metadata": {
7-
"timestamp": "2024-07-06T03:57:03Z",
8-
"tools": [
9-
{
10-
"vendor": "Siemens AG",
11-
"name": "Clearing Automation Tool",
12-
"version": "6.1.0",
13-
"externalReferences": [
14-
{
15-
"url": "https://github.com/siemens/continuous-clearing",
16-
"type": "website"
17-
}
18-
]
19-
},
20-
{
21-
"vendor": "Siemens AG",
22-
"name": "Siemens SBOM",
23-
"version": "2.0.0",
24-
"externalReferences": [
25-
{
26-
"url": "https://sbom.siemens.io/",
27-
"type": "website"
28-
}
29-
]
30-
}
31-
],
7+
"timestamp": "2025-05-26T04:19:21Z",
8+
"tools": {
9+
"components": [
10+
{
11+
"type": "application",
12+
"supplier": {
13+
"name": "Siemens AG"
14+
},
15+
"name": "Clearing Automation Tool",
16+
"version": "8.0.0",
17+
"externalReferences": [
18+
{
19+
"url": "https://github.com/siemens/continuous-clearing",
20+
"type": "website"
21+
}
22+
]
23+
}
24+
]
25+
},
3226
"component": {
3327
"type": "application",
34-
"name": "Test",
35-
"version": "1.0"
28+
"name": "continuous-clearing",
29+
"version": "v9.0.x"
3630
},
3731
"properties": [
3832
{
@@ -149,5 +143,22 @@
149143
]
150144
}
151145
],
152-
"dependencies": []
146+
"dependencies": [],
147+
"definitions": {
148+
"standards": [
149+
{
150+
"bom-ref": "standard-bom",
151+
"name": "Standard BOM",
152+
"version": "3.0.0",
153+
"description": "The Standard for Software Bills of Materials in Siemens",
154+
"owner": "Siemens AG",
155+
"externalReferences": [
156+
{
157+
"url": "https://sbom.siemens.io/",
158+
"type": "website"
159+
}
160+
]
161+
}
162+
]
163+
}
153164
}

‎TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/Npm/Test_Bom.cdx.json‎

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
{
22
"bomFormat": "CycloneDX",
3-
"specVersion": "1.4",
4-
"serialNumber": "urn:uuid:fe6bfc03-6e58-4ee4-bbe3-b1dc8fd73ad5",
3+
"specVersion": "1.6",
4+
"serialNumber": "urn:uuid:167dc9b4-dd8d-4f55-926a-c0f96cabf035",
55
"version": 1,
66
"metadata": {
7-
"timestamp": "2024-07-08T14:06:17Z",
8-
"tools": [
9-
{
10-
"vendor": "Siemens AG",
11-
"name": "Clearing Automation Tool",
12-
"version": "6.1.0",
13-
"externalReferences": [
14-
{
15-
"url": "https://github.com/siemens/continuous-clearing",
16-
"type": "website"
17-
}
18-
]
19-
},
20-
{
21-
"vendor": "Siemens AG",
22-
"name": "Siemens SBOM",
23-
"version": "2.0.0",
24-
"externalReferences": [
25-
{
26-
"url": "https://sbom.siemens.io/",
27-
"type": "website"
28-
}
29-
]
30-
}
31-
],
7+
"timestamp": "2025-05-26T04:19:21Z",
8+
"tools": {
9+
"components": [
10+
{
11+
"type": "application",
12+
"supplier": {
13+
"name": "Siemens AG"
14+
},
15+
"name": "Clearing Automation Tool",
16+
"version": "8.0.0",
17+
"externalReferences": [
18+
{
19+
"url": "https://github.com/siemens/continuous-clearing",
20+
"type": "website"
21+
}
22+
]
23+
}
24+
]
25+
},
3226
"component": {
3327
"type": "application",
34-
"name": "Test",
35-
"version": "1.0"
28+
"name": "continuous-clearing",
29+
"version": "v9.0.x"
3630
},
3731
"properties": [
3832
{
@@ -382,5 +376,22 @@
382376
"pkg:npm/webpack-sources@1.4.3"
383377
]
384378
}
385-
]
379+
],
380+
"definitions": {
381+
"standards": [
382+
{
383+
"bom-ref": "standard-bom",
384+
"name": "Standard BOM",
385+
"version": "3.0.0",
386+
"description": "The Standard for Software Bills of Materials in Siemens",
387+
"owner": "Siemens AG",
388+
"externalReferences": [
389+
{
390+
"url": "https://sbom.siemens.io/",
391+
"type": "website"
392+
}
393+
]
394+
}
395+
]
396+
}
386397
}

‎TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/Nuget/Test_Bom.cdx.json‎

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,32 @@
11
{
22
"bomFormat": "CycloneDX",
3-
"specVersion": "1.4",
4-
"serialNumber": "urn:uuid:383df7b9-7355-4912-98ce-dc0c93573a11",
3+
"specVersion": "1.6",
4+
"serialNumber": "urn:uuid:167dc9b4-dd8d-4f55-926a-c0f96cabf035",
55
"version": 1,
66
"metadata": {
7-
"timestamp": "2024-07-08T12:58:12Z",
8-
"tools": [
9-
{
10-
"vendor": "Siemens AG",
11-
"name": "Clearing Automation Tool",
12-
"version": "6.1.0",
13-
"externalReferences": [
14-
{
15-
"url": "https://github.com/siemens/continuous-clearing",
16-
"type": "website"
17-
}
18-
]
19-
},
20-
{
21-
"vendor": "Siemens AG",
22-
"name": "Siemens SBOM",
23-
"version": "2.0.0",
24-
"externalReferences": [
25-
{
26-
"url": "https://sbom.siemens.io/",
27-
"type": "website"
28-
}
29-
]
30-
}
31-
],
7+
"timestamp": "2025-05-26T04:19:21Z",
8+
"tools": {
9+
"components": [
10+
{
11+
"type": "application",
12+
"supplier": {
13+
"name": "Siemens AG"
14+
},
15+
"name": "Clearing Automation Tool",
16+
"version": "8.0.0",
17+
"externalReferences": [
18+
{
19+
"url": "https://github.com/siemens/continuous-clearing",
20+
"type": "website"
21+
}
22+
]
23+
}
24+
]
25+
},
3226
"component": {
3327
"type": "application",
34-
"name": "Test",
35-
"version": "1.0"
28+
"name": "continuous-clearing",
29+
"version": "v9.0.x"
3630
},
3731
"properties": [
3832
{
@@ -361,5 +355,22 @@
361355
]
362356
}
363357
],
364-
"dependencies": []
358+
"dependencies": [],
359+
"definitions": {
360+
"standards": [
361+
{
362+
"bom-ref": "standard-bom",
363+
"name": "Standard BOM",
364+
"version": "3.0.0",
365+
"description": "The Standard for Software Bills of Materials in Siemens",
366+
"owner": "Siemens AG",
367+
"externalReferences": [
368+
{
369+
"url": "https://sbom.siemens.io/",
370+
"type": "website"
371+
}
372+
]
373+
}
374+
]
375+
}
365376
}

0 commit comments

Comments
 (0)