Merge pull request #99 from siemens/development

Python Clearance v5.0.0

.github/workflows/compile.yml

@@ -48,9 +48,9 @@ jobs:
         echo "SemVerMMP: v$($env:GitVersion_MajorMinorPatch)"
         Write-Host "Filename: '$fileName'" 
         
-        
     - name: Add msbuild to PATH
-      uses: microsoft/[email protected]
+      uses: microsoft/[email protected]
+
 
     - name: update appSettingsSW360IntegrationTest.json
       run: ./Scripts/json_update.ps1 -JsonFile 'src\TestUtilities\appSettingsSW360IntegrationTest.json' 
@@ -94,7 +94,7 @@ jobs:
         $sourceFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "*"
         $outFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "continuous-clearing" 
         New-Item -ItemType Directory -Force -Path $outFolder
-        $fileName = "continuous-clearing-4.0.0.zip"
+        $fileName = "continuous-clearing-5.0.0.zip"
         Write-Host "Filename: '$fileName'"
         Write-Host "sourceFolder: '$sourceFolder'"
         Write-Host "Outfolder: '$outFolder'"
@@ -138,8 +138,8 @@ jobs:
     - name: Create Nuget Packages 
       id: createNupkg
       run: |
-        nuget pack CA.nuspec -Version 4.0.0
-        Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.4.0.0.nupkg"
+        nuget pack CA.nuspec -Version 5.0.0
+        Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.5.0.0.nupkg"
         
     - name: Archive NuGet Packages
       uses: actions/upload-artifact@v2
@@ -152,9 +152,9 @@ jobs:
       id: builddocker
       #if: ${{ false }}  # disable for now
       run: |
-        docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v4.0.0
-        docker save ${{ github.repository }}:continuous-clearing-v4.0.0 -o continuous-clearing-v4.0.0.tar
-        Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v4.0.0.tar"
+        docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v5.0.0
+        docker save ${{ github.repository }}:continuous-clearing-v5.0.0 -o continuous-clearing-v5.0.0.tar
+        Write-Host "::set-output name=docker-LicenseClearingTool::continuous-clearing-v5.0.0.tar"
 
     - name: Archive docker image      
       #if: ${{ false }}  # disable for now
@@ -195,9 +195,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         with:
-          tag_name: v4.0.0
+          tag_name: v5.0.0
           #tag_name: ${{ needs.build.outputs.semver }}
-          release_name: Release v4.0.0
+          release_name: Release v5.0.0
           body: |
             ${{ github.event.head_commit.message }}
           draft: true

CA.nuspec

@@ -4,7 +4,7 @@
 <package >
   <metadata>
     <id>continuous-clearing</id>
-    <version>4.0.0</version>
+    <version>5.0.0</version>
     <authors>Siemens AG</authors>
     <owners>continuous-clearing contributors</owners>
     <projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>
@@ -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>
@@ -122,6 +122,7 @@
     <file src="out\net6.0\NuGet.Protocol.dll" target="tools"/>
     <file src="out\net6.0\NuGet.Versioning.dll" target="tools"/>
     <file src="out\net6.0\NuGet.Resolver.dll" target="tools"/>
+    <file src="out\net6.0\Tommy.dll" target="tools"/>
     <file src="out\net6.0\runtimes\linux-arm\native\libpsl-native.so" target="tools\runtimes\linux-arm\native"/>
     <file src="out\net6.0\runtimes\linux-arm64\native\libpsl-native.so" target="tools\runtimes\linux-arm64\native"/>
     <file src="out\net6.0\runtimes\linux-musl-x64\native\libpsl-native.so" target="tools\runtimes\linux-musl-x64\native"/>

Dockerfile

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 
 # Get parent image as latest debian patch of bullseye
-FROM mcr.microsoft.com/dotnet/runtime:6.0.15-bullseye-slim-amd64
+FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim-amd64
 WORKDIR /app/out
 
 # Creating required directories
@@ -18,10 +18,8 @@ RUN apt-get update && \
     apt-get -y install --no-install-recommends git && \
     apt-get -y install --no-install-recommends maven && \
     apt-get -y install --no-install-recommends curl && \
-    apt-get -y install --no-install-recommends dpkg-dev && \
-    apt-get -y install --no-install-recommends python3-distutils && \    
+    apt-get -y install --no-install-recommends dpkg-dev && \   
     curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /opt/DebianImageClearing && \
-    curl -sSL https://install.python-poetry.org | python3 - && \
     rm -rf /var/lib/apt/lists/* && \
     rm -rf archive.tar.gz
 

README.md

@@ -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.