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

Usage and Readme Updation for python workflow #93

Merged
merged 9 commits into from
Oct 1, 2023
Merged

Usage and Readme Updation for python workflow #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a153629
Smoke Test Bug fixes (#86)
karthika-g Sep 8, 2023
1519b45
Merge pull request #88 from siemens/development
karthika-g Sep 8, 2023
422068c
Merge pull request #90 from siemens/development
sumanthkb44 Sep 8, 2023
0f29458
Update compile.yml
karthika-g Sep 8, 2023
ebdcfae
Update CA.nuspec
karthika-g Sep 8, 2023
ecc6bbf
Update MavenProcessor.cs
karthika-g Sep 8, 2023
adb8575
Update compile.yml
MadanReddyK Sep 8, 2023
85eb977
Update compile.yml
MadanReddyK Sep 14, 2023
71290a3
Usage and Readme Updation for python workflow,Version update
karthika-g Sep 28, 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
3 changes: 1 addition & 2 deletions .github/workflows/compile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Build & Test
on:
push:
pull_request:
schedule:
- cron: "30 0 * * 5"


jobs:

Expand Down
7 changes: 4 additions & 3 deletions CA.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package >
<metadata>
<id>continuous-clearing</id>
<version>4.0.0</version>
<version>4.1.0</version>
<authors>Siemens AG</authors>
<owners>continuous-clearing contributors</owners>
<projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>
Expand All @@ -13,12 +13,12 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>
The License clearing tool helps the Project Manager/Developer, to reduce the manual effort and enable the faster license clearing process,
by automatically identifying the third party oss components used in their project(i.e., npm, nuget, maven and Debian type) and it creates them in the sw360 and fossology
by automatically identifying the third party oss components used in their project(i.e., npm, nuget, maven,python and Debian type) and it creates them in the sw360 and fossology
for clearing license
</description>
<releaseNotes></releaseNotes>
<copyright>Copyright 2023</copyright>
<tags>ClearingTool SW360 OSS Clearing Software Continuous-Clearing NPM NUGET DEBIAN MAVEN SBOM</tags>
<tags>ClearingTool SW360 OSS Clearing Software Continuous-Clearing NPM NUGET DEBIAN MAVEN PYTHON SBOM</tags>
</metadata>

<files>
Expand Down Expand Up @@ -82,6 +82,7 @@
<file src="out\net6.0\Microsoft.Win32.Registry.AccessControl.dll" target="tools"/>
<file src="out\net6.0\Microsoft.Win32.SystemEvents.dll" target="tools"/>
<file src="out\net6.0\Namotion.Reflection.dll" target="tools"/>
<file src="out\net6.0\PackageUrl.dll" target="tools"/>
<file src="out\net6.0\Newtonsoft.Json.Bson.dll" target="tools"/>
<file src="out\net6.0\Newtonsoft.Json.dll" target="tools"/>
<file src="out\net6.0\NJsonSchema.dll" target="tools"/>
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Introduction

The Continuous Clearing Tool scans and collects the 3rd party OSS components used in a NPM/NuGet/Maven/Debian and uploads it to SW360 and Fossology by accepting respective project ID for license clearing.
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.

The tool helps the developer/project manager to enable the clearing process faster by reducing the
manual effort of creating SW360 and FOSSology workflows.
Expand Down
6 changes: 3 additions & 3 deletions doc/UsageDoc/CA_UsageDocument.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ Continuous Clearing Tool reduces the effort in creating components in SW360 and
# Continuous Clearing Tool workflow diagram

- Package Identifier
- [NPM/NUGET/MAVEN](../usagedocimg/packageIdentifiernpmnuget.PNG)
- [NPM/NUGET/MAVEN/PYTHON](../usagedocimg/packageIdentifiernpmnuget.PNG)
- [Debian](../usagedocimg/packageIdentifierdebian.PNG)
- SW360 Package Creator
- [NPM/NUGET/MAVEN](../usagedocimg/packageCreatirnpmnuget.PNG)
- [NPM/NUGET/MAVEN/PYTHON](../usagedocimg/packageCreatirnpmnuget.PNG)
- [Debian](../usagedocimg/packagecreatordebian.PNG)
- Artifactory Uploader
- [NPM/NUGET/MAVEN](../usagedocimg/artifactoryuploader.PNG)
- [NPM/NUGET/MAVEN/PYTHON](../usagedocimg/artifactoryuploader.PNG)

# Prerequisite

Expand Down
2 changes: 1 addition & 1 deletion src/LCT.Common/appSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// --------------------------------------------------------------------------------------------------------------------

{
"CaVersion": "4.0.0",
"CaVersion": "4.1.0",
"TimeOut": 200,
"ProjectType": "<Insert ProjectType>",
"SW360ProjectName": "<Insert SW360 Project Name>",
Expand Down
1 change: 1 addition & 0 deletions src/LCT.PackageIdentifier/MavenProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public Bom ParsePackageFile(CommonAppSettings appSettings)
componentsForBOM = ListOfComponents.Distinct(new ComponentEqualityComparer()).ToList();

BomCreator.bomKpiData.DuplicateComponents = totalComponentsIdentified - componentsForBOM.Count;


if (appSettings.Maven.ExcludedComponents != null)
{
Expand Down