Skip to content

Commit 9d4af5b

Browse files
karthika-gkarthika-g
authored
Merge pull request #111 from siemens/development
Conan Implementation along with SEPP Integration v6.0.0
2 parents 94f6d30 + f3731b5 commit 9d4af5b

File tree

314 files changed

+63796
-265630
lines changed

Some content is hidden

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

314 files changed

+63796
-265630
lines changed

‎.github/workflows/compile.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
$sourceFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "*"
9595
$outFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "continuous-clearing"
9696
New-Item -ItemType Directory -Force -Path $outFolder
97-
$fileName = "continuous-clearing-5.1.1.zip"
97+
$fileName = "continuous-clearing-6.0.0.zip"
9898
Write-Host "Filename: '$fileName'"
9999
Write-Host "sourceFolder: '$sourceFolder'"
100100
Write-Host "Outfolder: '$outFolder'"
@@ -115,7 +115,7 @@ jobs:
115115
DOCKERDEVARTIFACTORY: ${{ secrets.DOCKERDEVARTIFACTORY }}
116116

117117
- name: Test
118-
if: ${{ false }} # disable for now
118+
#if: ${{ false }} # disable for now
119119
run: |
120120
$TestProjects = Get-ChildItem -Path *test*.csproj -Recurse -exclude TestUtilities.csproj,UnitTestUtilities.csproj
121121
Write-Host "**************************The test projects considered for execution: $TestProjects ******************************"
@@ -138,8 +138,8 @@ jobs:
138138
- name: Create Nuget Packages
139139
id: createNupkg
140140
run: |
141-
nuget pack CA.nuspec -Version 5.1.1
142-
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.5.1.1.nupkg"
141+
nuget pack CA.nuspec -Version 6.0.0
142+
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.6.0.0.nupkg"
143143
144144
- name: Archive NuGet Packages
145145
uses: actions/upload-artifact@v2
@@ -152,9 +152,9 @@ jobs:
152152
id: builddocker
153153
#if: ${{ false }} # disable for now
154154
run: |
155-
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v5.1.1
156-
docker save ${{ github.repository }}:continuous-clearing-v5.1.1 -o continuous-clearing-v5.1.1.tar
157-
Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v5.1.1.tar"
155+
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v6.0.0
156+
docker save ${{ github.repository }}:continuous-clearing-v6.0.0 -o continuous-clearing-v6.0.0.tar
157+
Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v6.0.0.tar"
158158
159159
- name: Archive docker image
160160
#if: ${{ false }} # disable for now
@@ -195,9 +195,9 @@ jobs:
195195
env:
196196
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
197197
with:
198-
tag_name: v5.1.1
198+
tag_name: v6.0.0
199199
#tag_name: ${{ needs.build.outputs.semver }}
200-
release_name: Release v5.1.1
200+
release_name: Release v6.0.0
201201
body: |
202202
${{ github.event.head_commit.message }}
203203
draft: true

‎CA.nuspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package >
55
<metadata>
66
<id>continuous-clearing</id>
7-
<version>5.1.1</version>
7+
<version>6.0.0</version>
88
<authors>Siemens AG</authors>
99
<owners>continuous-clearing contributors</owners>
1010
<projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>
@@ -123,6 +123,7 @@
123123
<file src="out\net6.0\NuGet.Versioning.dll" target="tools"/>
124124
<file src="out\net6.0\NuGet.Resolver.dll" target="tools"/>
125125
<file src="out\net6.0\Tommy.dll" target="tools"/>
126+
<file src="out\net6.0\YamlDotNet.dll" target="tools"/>
126127
<file src="out\net6.0\runtimes\linux-arm\native\libpsl-native.so" target="tools\runtimes\linux-arm\native"/>
127128
<file src="out\net6.0\runtimes\linux-arm64\native\libpsl-native.so" target="tools\runtimes\linux-arm64\native"/>
128129
<file src="out\net6.0\runtimes\linux-musl-x64\native\libpsl-native.so" target="tools\runtimes\linux-musl-x64\native"/>

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ RUN apt-get update && \
2727
ENV PATH="/root/.local/bin:$PATH"
2828

2929
# Copying files from host to current working directory
30-
COPY /out/net6.0 /app/out
30+
COPY /out/net6.0 /app/out

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
![Publish NuGet Packages](https://github.com/siemens/continuous-clearing/workflows/Publish%20NuGet%20Packages/badge.svg)
44

55

6+
67
# Introduction
78

89
The Continuous Clearing Tool scans and collects the 3rd party OSS components used in a NPM/NuGet/Maven/Python/Debian and uploads it to SW360 and Fossology by accepting respective project ID for license clearing.

‎ReadmeOSS_continuous-clearing_DockerImage.html

+57,731-262,852
Large diffs are not rendered by default.

‎ReadmeOSS_continuous-clearing_nupkg.html

+2,590-1,728
Large diffs are not rendered by default.

‎TestFiles/IntegrationTestFiles/ArtifactoryUploaderTestData/ConanComparisonBOM.json

+145
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
{
2+
"BomFormat": "CycloneDX",
3+
"SpecVersion": 4,
4+
"SpecVersionString": "1.4",
5+
"SerialNumber": null,
6+
"Version": null,
7+
"Metadata": {
8+
"Tools": [
9+
{
10+
"Vendor": "Siemens AG",
11+
"Name": "Clearing Automation Tool",
12+
"Version": "5.0.0",
13+
"Hashes": null
14+
}
15+
],
16+
"Authors": null,
17+
"Component": null,
18+
"Manufacture": null,
19+
"Supplier": null
20+
},
21+
"Components": [
22+
{
23+
"Type": 0,
24+
"MimeType": null,
25+
"BomRef": "pkg:conan/[email protected]",
26+
"Supplier": null,
27+
"Author": null,
28+
"Publisher": null,
29+
"Group": null,
30+
"Name": "protobuf",
31+
"Version": "3.21.9",
32+
"Description": "",
33+
"Scope": null,
34+
"Hashes": null,
35+
"Licenses": null,
36+
"Copyright": null,
37+
"Cpe": null,
38+
"Purl": "pkg:conan/[email protected]",
39+
"Swid": null,
40+
"Modified": null,
41+
"Pedigree": null,
42+
"Components": null,
43+
"Properties": [
44+
{
45+
"Name": "internal:siemens:clearing:development",
46+
"Value": "false"
47+
},
48+
{
49+
"Name": "internal:siemens:clearing:identifier-type",
50+
"Value": "Discovered"
51+
},
52+
{
53+
"Name": "internal:siemens:clearing:is-internal",
54+
"Value": "true"
55+
},
56+
{
57+
"Name": "internal:siemens:clearing:repo-name",
58+
"Value": "energy-dev-conan-egll"
59+
},
60+
{
61+
"Name": "internal:siemens:clearing:project-type",
62+
"Value": "CONAN"
63+
},
64+
{
65+
"Name": "internal:siemens:clearing:sw360:release-url",
66+
"Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/e13e0e564b004ef4adabbd01bf0b93ce"
67+
},
68+
{
69+
"Name": "internal:siemens:clearing:fossology:url",
70+
"Value": null
71+
}
72+
],
73+
"Evidence": null
74+
},
75+
{
76+
"Type": 0,
77+
"MimeType": null,
78+
"BomRef": "pkg:conan/[email protected]",
79+
"Supplier": null,
80+
"Author": null,
81+
"Publisher": null,
82+
"Group": null,
83+
"Name": "zlib",
84+
"Version": "1.2.11",
85+
"Description": "",
86+
"Scope": null,
87+
"Hashes": null,
88+
"Licenses": null,
89+
"Copyright": null,
90+
"Cpe": null,
91+
"Purl": "pkg:conan/[email protected]",
92+
"Swid": null,
93+
"Modified": null,
94+
"Pedigree": null,
95+
"Components": null,
96+
"Properties": [
97+
{
98+
"Name": "internal:siemens:clearing:development",
99+
"Value": "false"
100+
},
101+
{
102+
"Name": "internal:siemens:clearing:identifier-type",
103+
"Value": "Discovered"
104+
},
105+
{
106+
"Name": "internal:siemens:clearing:is-internal",
107+
"Value": "false"
108+
},
109+
{
110+
"Name": "internal:siemens:clearing:repo-name",
111+
"Value": "Not Found in JFrogRepo"
112+
},
113+
{
114+
"Name": "internal:siemens:clearing:project-type",
115+
"Value": "CONAN"
116+
},
117+
{
118+
"Name": "internal:siemens:clearing:clearing-state",
119+
"Value": "NEW_CLEARING"
120+
},
121+
{
122+
"Name": "internal:siemens:clearing:sw360:release-url",
123+
"Value": "http://md2pdvnc.ad001.siemens.net:8095/resource/api/releases/701403e53f254fc5a074e24fd867be2c"
124+
},
125+
{
126+
"Name": "internal:siemens:clearing:fossology:url",
127+
"Value": null
128+
}
129+
],
130+
"Evidence": null
131+
}
132+
],
133+
"Dependencies": [
134+
{
135+
"Ref": "pkg:conan/[email protected]",
136+
"Dependencies": [
137+
{
138+
"Ref": "pkg:conan/[email protected]",
139+
"Dependencies": null
140+
}
141+
]
142+
}
143+
],
144+
"Compositions": null
145+
}

0 commit comments

Comments
 (0)