Skip to content

Commit a4e11c9

Browse files
author
Aditya Narayan
committed
Merge branch 'development' of https://github.com/siemens/continuous-clearing into chore/azure-pipeline-integration
2 parents 763a2b0 + 09dfceb commit a4e11c9

File tree

345 files changed

+1990
-2084
lines changed

Some content is hidden

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

345 files changed

+1990
-2084
lines changed

‎.github/workflows/compile.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
$sourceFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "*"
9797
$outFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "continuous-clearing"
9898
New-Item -ItemType Directory -Force -Path $outFolder
99-
$fileName = "continuous-clearing-v7.0.2.zip"
99+
$fileName = "continuous-clearing-v8.0.0.zip"
100100
Write-Host "Filename: '$fileName'"
101101
Write-Host "sourceFolder: '$sourceFolder'"
102102
Write-Host "Outfolder: '$outFolder'"
@@ -129,8 +129,8 @@ jobs:
129129
- name: Create Nuget Packages
130130
id: createNupkg
131131
run: |
132-
nuget pack CA.nuspec -Version 7.0.2
133-
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.7.0.2.nupkg"
132+
nuget pack CA.nuspec -Version 8.0.0
133+
Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.8.0.0.nupkg"
134134
135135
- name: Archive NuGet Packages
136136
uses: actions/upload-artifact@v4
@@ -164,9 +164,9 @@ jobs:
164164
#if: ${{ false }} # disable for now
165165
run: |
166166
echo "Files in directory:"
167-
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v7.0.2
168-
docker save ${{ github.repository }}:continuous-clearing-v7.0.2 -o continuous-clearing-v7.0.2.tar
169-
echo "::set-output name=docker-LicenseClearingTool::continuous-clearing-v7.0.2.tar"
167+
docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v8.0.0
168+
docker save ${{ github.repository }}:continuous-clearing-v8.0.0 -o continuous-clearing-v8.0.0.tar
169+
echo "::set-output name=docker-LicenseClearingTool::continuous-clearing-v8.0.0.tar"
170170
171171
- name: Archive docker image
172172
#if: ${{ false }} # disable for now
@@ -214,8 +214,8 @@ jobs:
214214
env:
215215
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
216216
with:
217-
tag_name: v7.0.2
218-
release_name: Release v7.0.2
217+
tag_name: v8.0.0
218+
release_name: Release v8.0.0
219219
body: |
220220
${{ github.event.head_commit.message }}
221221
draft: true

‎CA.nuspec‎

Lines changed: 1 addition & 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>7.0.2</version>
7+
<version>8.0.0</version>
88
<authors>Siemens AG</authors>
99
<owners>continuous-clearing contributors</owners>
1010
<projectUrl>https://github.com/siemens/continuous-clearing</projectUrl>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"name": "internal:siemens:clearing:project-type",
74-
"value": "PYTHON"
74+
"value": "POETRY"
7575
},
7676
{
7777
"name": "internal:siemens:clearing:siemens:filename",
@@ -124,7 +124,7 @@
124124
},
125125
{
126126
"name": "internal:siemens:clearing:project-type",
127-
"value": "PYTHON"
127+
"value": "POETRY"
128128
},
129129
{
130130
"name": "internal:siemens:clearing:siemens:filename",
@@ -177,7 +177,7 @@
177177
},
178178
{
179179
"name": "internal:siemens:clearing:project-type",
180-
"value": "PYTHON"
180+
"value": "POETRY"
181181
},
182182
{
183183
"name": "internal:siemens:clearing:siemens:filename",
@@ -230,7 +230,7 @@
230230
},
231231
{
232232
"name": "internal:siemens:clearing:project-type",
233-
"value": "PYTHON"
233+
"value": "POETRY"
234234
},
235235
{
236236
"name": "internal:siemens:clearing:siemens:filename",

‎src/AritfactoryUploader.UTest/ArtifactoryUploaderTest.cs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
// --------------------------------------------------------------------------------------------------------------------
2-
// SPDX-FileCopyrightText: 2024 Siemens AG
2+
// SPDX-FileCopyrightText: 2025 Siemens AG
33
//
44
// SPDX-License-Identifier: MIT
55
// --------------------------------------------------------------------------------------------------------------------
66

7+
using LCT.APICommunications;
78
using LCT.APICommunications.Interfaces;
89
using LCT.APICommunications.Model;
9-
using Moq;
10-
using System.Net;
10+
using LCT.APICommunications.Model.AQL;
1111
using LCT.ArtifactoryUploader;
12-
using System.Net.Http;
13-
using NUnit.Framework;
14-
using System.Threading.Tasks;
15-
using LCT.APICommunications;
12+
using LCT.ArtifactoryUploader.Model;
1613
using LCT.Common;
17-
using LCT.Facade.Interfaces;
1814
using LCT.Facade;
19-
using LCT.Services.Interface;
15+
using LCT.Facade.Interfaces;
2016
using LCT.Services;
21-
using UnitTestUtilities;
22-
using LCT.ArtifactoryUploader.Model;
23-
using LCT.APICommunications.Model.AQL;
17+
using LCT.Services.Interface;
18+
using Moq;
19+
using NUnit.Framework;
2420
using System;
25-
using LCT.Common.Interface;
26-
using LCT.Common.Model;
21+
using System.Net;
22+
using System.Net.Http;
23+
using System.Threading.Tasks;
24+
using UnitTestUtilities;
2725

2826
namespace AritfactoryUploader.UTest
2927
{
@@ -35,7 +33,7 @@ public void Setup()
3533
{
3634
// Method intentionally left empty.
3735
}
38-
36+
3937

4038
[Test]
4139
public async Task UploadPackageToRepo_InputEmptyCreds_ReturnsPackgeNotFound()
@@ -136,7 +134,7 @@ public async Task UploadPackageToRepo_WhenPackageTypeIsClearedThirdPartyOrDevelo
136134
ArtfactoryUploader.jFrogService = jFrogServiceMock.Object;
137135
ArtfactoryUploader.JFrogApiCommInstance = jfrogApicommunicationMock.Object;
138136
// Act
139-
_= await ArtfactoryUploader.UploadPackageToRepo(component, timeout, displayPackagesInfo);
137+
_ = await ArtfactoryUploader.UploadPackageToRepo(component, timeout, displayPackagesInfo);
140138

141139
// Assert
142140
jfrogApicommunicationMock.Verify(x => x.CopyFromRemoteRepo(component), Times.Once);

‎src/AritfactoryUploader.UTest/ArtifactoryValidatorTest.cs‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
// --------------------------------------------------------------------------------------------------------------------
2-
// SPDX-FileCopyrightText: 2024 Siemens AG
2+
// SPDX-FileCopyrightText: 2025 Siemens AG
33
//
44
// SPDX-License-Identifier: MIT
55
// --------------------------------------------------------------------------------------------------------------------
66

7-
using LCT.Common;
8-
using LCT.APICommunications;
9-
using LCT.APICommunications.Model;
7+
using LCT.APICommunications.Interfaces;
108
using LCT.ArtifactoryUploader;
11-
using LCT.ArtifactoryUploader.Model;
129
using Moq;
1310
using NUnit.Framework;
14-
using System.IO;
1511
using System.Net;
1612
using System.Net.Http;
17-
using System.Net.Http.Formatting;
1813
using System.Threading.Tasks;
19-
using UnitTestUtilities;
20-
using LCT.APICommunications.Interfaces;
2114

2215
namespace AritfactoryUploader.UTest
2316
{

‎src/AritfactoryUploader.UTest/JfrogRepoUpdaterTest.cs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
using LCT.APICommunications.Model;
2-
using LCT.ArtifactoryUploader.Model;
1+
// --------------------------------------------------------------------------------------------------------------------
2+
// SPDX-FileCopyrightText: 2025 Siemens AG
3+
//
4+
// SPDX-License-Identifier: MIT
5+
// --------------------------------------------------------------------------------------------------------------------
6+
7+
using LCT.APICommunications.Model.AQL;
38
using LCT.ArtifactoryUploader;
9+
using LCT.Services.Interface;
10+
using Moq;
411
using NUnit.Framework;
5-
using System;
612
using System.Collections.Generic;
7-
using System.Linq;
8-
using System.Net.Http;
9-
using System.Net;
10-
using System.Text;
1113
using System.Threading.Tasks;
12-
using LCT.APICommunications.Model.AQL;
13-
using LCT.Services.Interface;
14-
using Moq;
1514

1615
namespace AritfactoryUploader.UTest
1716
{
@@ -41,7 +40,7 @@ public async Task GetJfrogRepoInfoForAllTypePackages_GivenDestRepoNames_ReturnsA
4140
// Assert
4241
Assert.That(actualAqlResultList.Count, Is.GreaterThan(2));
4342
}
44-
45-
43+
44+
4645
}
4746
}

‎src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
11
// --------------------------------------------------------------------------------------------------------------------
2-
// SPDX-FileCopyrightText: 2024 Siemens AG
2+
// SPDX-FileCopyrightText: 2025 Siemens AG
33
//
44
// SPDX-License-Identifier: MIT
55
// --------------------------------------------------------------------------------------------------------------------
66

7-
using LCT.Common;
87
using CycloneDX.Models;
8+
using LCT.APICommunications;
99
using LCT.APICommunications.Model;
1010
using LCT.ArtifactoryUploader;
11-
using LCT.Common.Constants;
11+
using LCT.ArtifactoryUploader.Model;
12+
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
1213
using NUnit.Framework;
1314
using System.Collections.Generic;
1415
using System.IO;
15-
using UnitTestUtilities;
16-
using System.Threading.Tasks;
1716
using System.Linq;
18-
using LCT.ArtifactoryUploader.Model;
19-
using LCT.APICommunications;
2017
using System.Net.Http;
21-
using System.Net;
22-
using LCT.APICommunications.Model.AQL;
23-
using LCT.Services.Interface;
24-
using Moq;
25-
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
26-
using LCT.Common.Interface;
27-
using LCT.Common.Model;
18+
using System.Threading.Tasks;
2819

2920
namespace AritfactoryUploader.UTest
3021
{
@@ -132,8 +123,8 @@ public void UpdateBomArtifactoryRepoUrl_GivenBomAndComponentsUploadedToArtifacto
132123
//Assert
133124
var repoUrl = bom.Components.First(x => x.Properties[3].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[3].Value;
134125
Assert.AreNotEqual("org1-npmjs-npm-remote", repoUrl);
135-
}
136-
126+
}
127+
137128

138129
[Test]
139130
public void GetJfrogApiCommInstance_GivenComponent_ReturnsJfrogApiCommunicationInstance()
@@ -308,8 +299,8 @@ public async Task JfrogFoundPackagesAsync_CoversAllScenarios(string compType)
308299
Assert.AreEqual(1, displayPackagesInfo.JfrogFoundPackagesDebian.Count);
309300
Assert.That(displayPackagesInfo.JfrogFoundPackagesDebian[0], Is.Not.Null);
310301
}
311-
}
302+
}
303+
312304

313-
314305
}
315306
}

‎src/AritfactoryUploader.UTest/PackageUploadInformationTest.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
using LCT.APICommunications;
1+
// --------------------------------------------------------------------------------------------------------------------
2+
// SPDX-FileCopyrightText: 2025 Siemens AG
3+
//
4+
// SPDX-License-Identifier: MIT
5+
// --------------------------------------------------------------------------------------------------------------------
6+
7+
using LCT.APICommunications;
28
using LCT.APICommunications.Model;
39
using LCT.ArtifactoryUploader;
410
using LCT.ArtifactoryUploader.Model;
11+
using LCT.Common.Constants;
512
using LCT.Common.Interface;
613
using Moq;
14+
using Newtonsoft.Json;
715
using NUnit.Framework;
8-
using System;
916
using System.Collections.Generic;
10-
using System.Linq;
11-
using System.Net.Http;
12-
using System.Net;
13-
using System.Text;
14-
using System.Threading.Tasks;
15-
using LCT.Common.Constants;
16-
using Newtonsoft.Json;
1717
using System.IO;
18+
using System.Net;
19+
using System.Net.Http;
1820

1921
namespace AritfactoryUploader.UTest
2022
{

‎src/AritfactoryUploader.UTest/PackageUploaderTest.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
// --------------------------------------------------------------------------------------------------------------------
2-
// SPDX-FileCopyrightText: 2024 Siemens AG
2+
// SPDX-FileCopyrightText: 2025 Siemens AG
33
//
44
// SPDX-License-Identifier: MIT
55
// --------------------------------------------------------------------------------------------------------------------
66

77
using ArtifactoryUploader;
8+
using CycloneDX.Models;
9+
using LCT.APICommunications;
10+
using LCT.APICommunications.Interfaces;
11+
using LCT.APICommunications.Model;
812
using LCT.ArtifactoryUploader;
913
using LCT.Common;
14+
using LCT.Common.Constants;
15+
using LCT.Common.Model;
16+
using LCT.Facade;
17+
using LCT.Facade.Interfaces;
18+
using LCT.Services;
19+
using LCT.Services.Interface;
1020
using NUnit.Framework;
21+
using System.Collections.Generic;
1122
using System.Diagnostics;
1223
using System.IO;
1324
using System.Threading;
1425
using System.Threading.Tasks;
1526
using UnitTestUtilities;
16-
using LCT.Services.Interface;
17-
using LCT.APICommunications.Model;
18-
using LCT.APICommunications.Interfaces;
19-
using LCT.APICommunications;
20-
using LCT.Facade.Interfaces;
21-
using LCT.Facade;
22-
using LCT.Services;
23-
using CycloneDX.Models;
24-
using LCT.Common.Constants;
25-
using LCT.Common.Model;
26-
using System.Collections.Generic;
2727

2828
namespace AritfactoryUploader.UTest
2929
{
@@ -80,7 +80,7 @@ public async Task UploadPackageToArtifactory_GivenAppsettings()
8080
IJFrogService jFrogService = GetJfrogService(commonAppSettings);
8181
PackageUploadHelper.jFrogService = jFrogService;
8282
UploadToArtifactory.jFrogService = jFrogService;
83-
ArtfactoryUploader.jFrogService= jFrogService;
83+
ArtfactoryUploader.jFrogService = jFrogService;
8484

8585
Program.UploaderStopWatch = new Stopwatch();
8686
Program.UploaderStopWatch.Start();

‎src/AritfactoryUploader.UTest/UploadToArtifactoryTest.cs‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
using LCT.APICommunications.Model;
2-
using LCT.ArtifactoryUploader.Model;
1+
// --------------------------------------------------------------------------------------------------------------------
2+
// SPDX-FileCopyrightText: 2025 Siemens AG
3+
//
4+
// SPDX-License-Identifier: MIT
5+
// --------------------------------------------------------------------------------------------------------------------
6+
7+
using CycloneDX.Models;
8+
using LCT.APICommunications.Model;
9+
using LCT.APICommunications.Model.AQL;
310
using LCT.ArtifactoryUploader;
4-
using LCT.Common.Model;
11+
using LCT.ArtifactoryUploader.Model;
512
using LCT.Common;
13+
using LCT.Common.Constants;
14+
using LCT.Common.Model;
615
using LCT.Services.Interface;
716
using Moq;
817
using NUnit.Framework;
9-
using System;
1018
using System.Collections.Generic;
1119
using System.IO;
12-
using System.Linq;
13-
using System.Text;
1420
using System.Threading.Tasks;
1521
using UnitTestUtilities;
16-
using CycloneDX.Models;
17-
using LCT.Common.Constants;
18-
using LCT.APICommunications.Model.AQL;
1922

2023
namespace AritfactoryUploader.UTest
2124
{

0 commit comments

Comments
 (0)