From e3f093f73989b690d8fc333fa15a11a6e1c336c0 Mon Sep 17 00:00:00 2001 From: Chalapala RaghavendraReddy Date: Fri, 12 Jul 2024 08:49:30 +0530 Subject: [PATCH] updated property repo name --- .../ArtifactoryUTTestFiles/CyclonedxBom.json | 12 +++++------ .../PackageUploadHelperTest.cs | 4 ++-- .../PackageUploadHelper.cs | 8 ++++---- src/LCT.Common/Constants/Dataconstant.cs | 2 +- .../ConanParserTests.cs | 4 ++-- .../CycloneBomProcessorTests.cs | 2 +- .../NugetParserTests.cs | 8 ++++---- src/LCT.PackageIdentifier/ConanProcessor.cs | 2 +- .../CycloneBomProcessor.cs | 2 +- src/LCT.PackageIdentifier/DebianProcessor.cs | 2 +- src/LCT.PackageIdentifier/MavenProcessor.cs | 2 +- src/LCT.PackageIdentifier/NpmProcessor.cs | 2 +- src/LCT.PackageIdentifier/NugetProcessor.cs | 2 +- src/LCT.PackageIdentifier/PythonProcessor.cs | 2 +- .../Alpine/CCTComparisonBOMAlpineInitial.json | 8 ++++---- .../CCTComparisonBOMNugetTemplateInitial.json | 6 +++--- .../Conan/CCTComparisonBOMConanInitial.json | 4 ++-- .../Debian/CCTComparisonBOMDebianInitial.json | 8 ++++---- .../Maven/CCTComparisonBOMMavenUpdated.json | 6 +++--- .../Npm/CCTComparisonBOMNpmInitial.json | 12 +++++------ .../Npm/CCTComparisonBOMNpmUpdated.json | 8 ++++---- .../Nuget/CCTComparisonBOMNugetInitial.json | 12 +++++------ .../Python/CCTComparisonBOMPythonInitial.json | 8 ++++---- .../Alpine/CCTLocalBOMAlpineInitial.json | 8 ++++---- .../CCTLocalBOMTemplateNugetInitial.json | 6 +++--- .../Conan/CCTLocalBOMConanInitial.json | 2 +- .../Debian/CCTLocalBOMDebianInitial.json | 8 ++++---- .../Maven/CCTLocalBOMMavenInitial.json | 6 +++--- .../Npm/CCTLocalBOMNpmInitial.json | 12 +++++------ .../Npm/CCTLocalBOMNpmMultiplePackages.json | 20 +++++++++---------- .../Npm/CCTLocalBOMNpmUpdated.json | 8 ++++---- .../Nuget/CCTLocalBOMNugetInitial.json | 12 +++++------ .../Python/CCTLocalBOMPythonInitial.json | 8 ++++---- 33 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/AritfactoryUploader.UTest/ArtifactoryUTTestFiles/CyclonedxBom.json b/src/AritfactoryUploader.UTest/ArtifactoryUTTestFiles/CyclonedxBom.json index a333c47e..2ddb2951 100644 --- a/src/AritfactoryUploader.UTest/ArtifactoryUTTestFiles/CyclonedxBom.json +++ b/src/AritfactoryUploader.UTest/ArtifactoryUTTestFiles/CyclonedxBom.json @@ -76,7 +76,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -128,7 +128,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -180,7 +180,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -231,7 +231,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -282,7 +282,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -334,7 +334,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { diff --git a/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs b/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs index e0e1dff7..a723fd42 100644 --- a/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs +++ b/src/AritfactoryUploader.UTest/PackageUploadHelperTest.cs @@ -168,7 +168,7 @@ public void UpdateBomArtifactoryRepoUrl_GivenBomAndComponentsUploadedToArtifacto PackageUploadHelper.UpdateBomArtifactoryRepoUrl(ref bom, components); //Assert - var repoUrl = bom.Components.First(x => x.Properties[3].Name == "internal:siemens:clearing:repo-name").Properties[3].Value; + var repoUrl = bom.Components.First(x => x.Properties[3].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[3].Value; Assert.AreEqual("org1-npmjs-npm-remote", repoUrl); } @@ -193,7 +193,7 @@ public void UpdateBomArtifactoryRepoUrl_GivenBomAndComponentsUploadedToArtifacto PackageUploadHelper.UpdateBomArtifactoryRepoUrl(ref bom, components); //Assert - var repoUrl = bom.Components.First(x => x.Properties[3].Name == "internal:siemens:clearing:repo-name").Properties[3].Value; + var repoUrl = bom.Components.First(x => x.Properties[3].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[3].Value; Assert.AreNotEqual("org1-npmjs-npm-remote", repoUrl); } diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs index abd0bbb9..6aadf369 100644 --- a/src/ArtifactoryUploader/PackageUploadHelper.cs +++ b/src/ArtifactoryUploader/PackageUploadHelper.cs @@ -87,7 +87,7 @@ public async static Task> GetComponentsToBeUploade ComponentType = GetComponentType(item), PackageType = packageType, DryRun = !appSettings.Release, - SrcRepoName = item.Properties.Find(s => s.Name == Dataconstant.Cdx_ArtifactoryRepoUrl)?.Value, + SrcRepoName = item.Properties.Find(s => s.Name == Dataconstant.Cdx_ArtifactoryRepoName)?.Value, DestRepoName = GetDestinationRepo(item, appSettings), ApiKey = appSettings.ArtifactoryUploadApiKey, Email = appSettings.ArtifactoryUploadUser, @@ -954,7 +954,7 @@ private async static Task GetSrcRepoDetailsForPyPiOrConanPackages(Com if (item.Purl.Contains("pypi", StringComparison.OrdinalIgnoreCase)) { // get the component list from Jfrog for given repo - aqlResultList = await GetListOfComponentsFromRepo(new string[] { item.Properties.Find(x => x.Name == Dataconstant.Cdx_ArtifactoryRepoUrl)?.Value }, jFrogService); + aqlResultList = await GetListOfComponentsFromRepo(new string[] { item.Properties.Find(x => x.Name == Dataconstant.Cdx_ArtifactoryRepoName)?.Value }, jFrogService); if (aqlResultList.Count > 0) { return GetArtifactoryRepoName(aqlResultList, item); @@ -962,7 +962,7 @@ private async static Task GetSrcRepoDetailsForPyPiOrConanPackages(Com } else if (item.Purl.Contains("conan", StringComparison.OrdinalIgnoreCase)) { - var aqlConanResultList = await GetListOfComponentsFromRepo(new string[] { item.Properties.Find(x => x.Name == Dataconstant.Cdx_ArtifactoryRepoUrl)?.Value }, jFrogService); + var aqlConanResultList = await GetListOfComponentsFromRepo(new string[] { item.Properties.Find(x => x.Name == Dataconstant.Cdx_ArtifactoryRepoName)?.Value }, jFrogService); if (aqlConanResultList.Count > 0) { @@ -1175,7 +1175,7 @@ public static void UpdateBomArtifactoryRepoUrl(ref Bom bom, List x.Purl.Equals(component.Purl, StringComparison.OrdinalIgnoreCase)); if (component.DestRepoName != null && !component.DryRun) { - bomComponent.Properties.First(x => x.Name == Dataconstant.Cdx_ArtifactoryRepoUrl).Value = component.DestRepoName; + bomComponent.Properties.First(x => x.Name == Dataconstant.Cdx_ArtifactoryRepoName).Value = component.DestRepoName; } } } diff --git a/src/LCT.Common/Constants/Dataconstant.cs b/src/LCT.Common/Constants/Dataconstant.cs index 6ec1b831..70dd02f9 100644 --- a/src/LCT.Common/Constants/Dataconstant.cs +++ b/src/LCT.Common/Constants/Dataconstant.cs @@ -52,7 +52,7 @@ public static class Dataconstant public const string ReleaseAttachmentComment = "Attached by CA Tool"; public const char ForwardSlash = '/'; public const string SourceURLSuffix = "/srcfiles?fileinfo=1"; - public const string Cdx_ArtifactoryRepoUrl = "internal:siemens:clearing:repo-name"; + public const string Cdx_ArtifactoryRepoName = "internal:siemens:clearing:jfrog-repo-name"; public const string Cdx_ProjectType = "internal:siemens:clearing:project-type"; public const string Cdx_ClearingState = "internal:siemens:clearing:clearing-state"; public const string Cdx_IsInternal = "internal:siemens:clearing:is-internal"; diff --git a/src/LCT.PackageIdentifier.UTest/ConanParserTests.cs b/src/LCT.PackageIdentifier.UTest/ConanParserTests.cs index 6dde7e67..2e69b33f 100644 --- a/src/LCT.PackageIdentifier.UTest/ConanParserTests.cs +++ b/src/LCT.PackageIdentifier.UTest/ConanParserTests.cs @@ -203,7 +203,7 @@ public async Task GetJfrogRepoDetailsOfAComponent_ReturnsWithData_SuccessFully() ConanProcessor conanProcessor = new ConanProcessor(cycloneDXBomParser.Object); var actual = await conanProcessor.GetJfrogRepoDetailsOfAComponent( components, appSettings, mockJfrogService.Object, mockBomHelper.Object); - var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-name").Properties[0].Value; + var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[0].Value; // Assert Assert.That(actual, Is.Not.Null); @@ -245,7 +245,7 @@ public async Task GetArtifactoryRepoName_Conan_ReturnsNotFound_ReturnsFailure() var actual = await conanProcessor.GetJfrogRepoDetailsOfAComponent( components, appSettings, mockJfrogService.Object, mockBomHelper.Object); - var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-name").Properties[0].Value; + var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[0].Value; Assert.That("Not Found in JFrogRepo", Is.EqualTo(reponameActual)); } diff --git a/src/LCT.PackageIdentifier.UTest/CycloneBomProcessorTests.cs b/src/LCT.PackageIdentifier.UTest/CycloneBomProcessorTests.cs index 52927bcf..3294a806 100644 --- a/src/LCT.PackageIdentifier.UTest/CycloneBomProcessorTests.cs +++ b/src/LCT.PackageIdentifier.UTest/CycloneBomProcessorTests.cs @@ -112,7 +112,7 @@ public void SetProperties_GivenComponent_SetsPropertiesInBOM() List expectedpropList = new List() { new Property(){ Name = Dataconstant.Cdx_ProjectType,Value = "NPM"}, - new Property(){ Name = Dataconstant.Cdx_ArtifactoryRepoUrl,Value = repo}, + new Property(){ Name = Dataconstant.Cdx_ArtifactoryRepoName,Value = repo}, new Property(){ Name = Dataconstant.Cdx_IsInternal,Value = "false"}, }; diff --git a/src/LCT.PackageIdentifier.UTest/NugetParserTests.cs b/src/LCT.PackageIdentifier.UTest/NugetParserTests.cs index 9aafe71b..771ee157 100644 --- a/src/LCT.PackageIdentifier.UTest/NugetParserTests.cs +++ b/src/LCT.PackageIdentifier.UTest/NugetParserTests.cs @@ -793,7 +793,7 @@ public async Task GetArtifactoryRepoName_Nuget_ReturnsRepoName_SuccessFully() var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent( components, appSettings, mockJfrogService.Object, mockBomHelper.Object); - var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-name").Properties[0].Value; + var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[0].Value; Assert.That(reponameActual, Is.EqualTo(aqlResult.Repo)); } @@ -833,7 +833,7 @@ public async Task GetArtifactoryRepoName_Nuget_ReturnsRepoName_ReturnsFailure() var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent( components, appSettings, mockJfrogService.Object, mockBomHelper.Object); - var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-name").Properties[0].Value; + var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[0].Value; Assert.That("Not Found in JFrogRepo", Is.EqualTo(reponameActual)); } @@ -873,7 +873,7 @@ public async Task GetArtifactoryRepoName_Nuget_ReturnsRepoName_ReturnsSuccess() var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent( components, appSettings, mockJfrogService.Object, mockBomHelper.Object); - var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-name").Properties[0].Value; + var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[0].Value; Assert.That("internalrepo1", Is.EqualTo(reponameActual)); @@ -914,7 +914,7 @@ public async Task GetArtifactoryRepoName_Nuget_ReturnsNotFound_ReturnsFailure() var actual = await nugetProcessor.GetJfrogRepoDetailsOfAComponent( components, appSettings, mockJfrogService.Object, mockBomHelper.Object); - var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:repo-name").Properties[0].Value; + var reponameActual = actual.First(x => x.Properties[0].Name == "internal:siemens:clearing:jfrog-repo-name").Properties[0].Value; Assert.That("Not Found in JFrogRepo", Is.EqualTo(reponameActual)); } diff --git a/src/LCT.PackageIdentifier/ConanProcessor.cs b/src/LCT.PackageIdentifier/ConanProcessor.cs index c5870fa4..fde5e496 100644 --- a/src/LCT.PackageIdentifier/ConanProcessor.cs +++ b/src/LCT.PackageIdentifier/ConanProcessor.cs @@ -130,7 +130,7 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List x.Path.Contains(jfrogpackageName, StringComparison.OrdinalIgnoreCase)); - Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName }; + Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoName, Value = repoName }; Property jfrogRepoPathProperty = new() { Name = Dataconstant.Cdx_JfrogRepoPath, Value = jfrogRepoPath }; Component componentVal = component; diff --git a/src/LCT.PackageIdentifier/CycloneBomProcessor.cs b/src/LCT.PackageIdentifier/CycloneBomProcessor.cs index 3223b411..980b5ee8 100644 --- a/src/LCT.PackageIdentifier/CycloneBomProcessor.cs +++ b/src/LCT.PackageIdentifier/CycloneBomProcessor.cs @@ -92,7 +92,7 @@ public static void SetProperties(CommonAppSettings appSettings, Component compon Property artifactoryrepo = new() { - Name = Dataconstant.Cdx_ArtifactoryRepoUrl, + Name = Dataconstant.Cdx_ArtifactoryRepoName, Value = repo }; diff --git a/src/LCT.PackageIdentifier/DebianProcessor.cs b/src/LCT.PackageIdentifier/DebianProcessor.cs index 1349150c..8a04641b 100644 --- a/src/LCT.PackageIdentifier/DebianProcessor.cs +++ b/src/LCT.PackageIdentifier/DebianProcessor.cs @@ -138,7 +138,7 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List x.Name == jfrogpackageName); - Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName }; + Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoName, Value = repoName }; Property jfrogFileNameProperty = new() { Name = Dataconstant.Cdx_Siemensfilename, Value = jfrogRepoPackageName }; Property jfrogRepoPathProperty = new() { Name = Dataconstant.Cdx_JfrogRepoPath, Value = jfrogRepoPath }; Component componentVal = component; diff --git a/src/LCT.PackageIdentifier/MavenProcessor.cs b/src/LCT.PackageIdentifier/MavenProcessor.cs index 89d2f348..3f840b93 100644 --- a/src/LCT.PackageIdentifier/MavenProcessor.cs +++ b/src/LCT.PackageIdentifier/MavenProcessor.cs @@ -221,7 +221,7 @@ public async Task> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List> GetJfrogRepoDetailsOfAComponent(List x.Name.Contains( jfrogpackageName, StringComparison.OrdinalIgnoreCase) && (x.Name.EndsWith(ApiConstant.PythonExtension))); - Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName }; + Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoName, Value = repoName }; Property fileNameProperty = new() { Name = Dataconstant.Cdx_Siemensfilename, Value = jfrogPackageNameWhlExten }; Property jfrogRepoPathProperty = new() { Name = Dataconstant.Cdx_JfrogRepoPath, Value = jfrogRepoPath }; Component componentVal = component; diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Alpine/CCTComparisonBOMAlpineInitial.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Alpine/CCTComparisonBOMAlpineInitial.json index 677e02e6..cf61b619 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Alpine/CCTComparisonBOMAlpineInitial.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Alpine/CCTComparisonBOMAlpineInitial.json @@ -66,7 +66,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -119,7 +119,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -172,7 +172,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -225,7 +225,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/CCTComparisonBOMNugetTemplateInitial.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/CCTComparisonBOMNugetTemplateInitial.json index 30f5b443..57119253 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/CCTComparisonBOMNugetTemplateInitial.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/CCTComparisonBOMNugetTemplateInitial.json @@ -77,7 +77,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -130,7 +130,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -184,7 +184,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Conan/CCTComparisonBOMConanInitial.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Conan/CCTComparisonBOMConanInitial.json index 6d77dbe0..a0eed829 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Conan/CCTComparisonBOMConanInitial.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Conan/CCTComparisonBOMConanInitial.json @@ -70,7 +70,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -111,7 +111,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Debian/CCTComparisonBOMDebianInitial.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Debian/CCTComparisonBOMDebianInitial.json index fd05a732..958fc349 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Debian/CCTComparisonBOMDebianInitial.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Debian/CCTComparisonBOMDebianInitial.json @@ -88,7 +88,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -129,7 +129,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -170,7 +170,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -211,7 +211,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Maven/CCTComparisonBOMMavenUpdated.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Maven/CCTComparisonBOMMavenUpdated.json index 3cfed356..025ff778 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Maven/CCTComparisonBOMMavenUpdated.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Maven/CCTComparisonBOMMavenUpdated.json @@ -132,7 +132,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -256,7 +256,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -357,7 +357,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmInitial.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmInitial.json index ea1e8633..3c88b004 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmInitial.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmInitial.json @@ -62,7 +62,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -112,7 +112,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -162,7 +162,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -199,7 +199,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -236,7 +236,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -274,7 +274,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmUpdated.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmUpdated.json index e248afa8..dbd986a6 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmUpdated.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Npm/CCTComparisonBOMNpmUpdated.json @@ -63,7 +63,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -112,7 +112,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -161,7 +161,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -210,7 +210,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Nuget/CCTComparisonBOMNugetInitial.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Nuget/CCTComparisonBOMNugetInitial.json index cdd07c73..3d36e89b 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Nuget/CCTComparisonBOMNugetInitial.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Nuget/CCTComparisonBOMNugetInitial.json @@ -66,7 +66,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -119,7 +119,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -172,7 +172,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -225,7 +225,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -278,7 +278,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -331,7 +331,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageCreatorTestFiles/Python/CCTComparisonBOMPythonInitial.json b/src/SW360IntegrationTest/PackageCreatorTestFiles/Python/CCTComparisonBOMPythonInitial.json index 677e02e6..cf61b619 100644 --- a/src/SW360IntegrationTest/PackageCreatorTestFiles/Python/CCTComparisonBOMPythonInitial.json +++ b/src/SW360IntegrationTest/PackageCreatorTestFiles/Python/CCTComparisonBOMPythonInitial.json @@ -66,7 +66,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -119,7 +119,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -172,7 +172,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -225,7 +225,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Alpine/CCTLocalBOMAlpineInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Alpine/CCTLocalBOMAlpineInitial.json index ee7ed6f8..5808ffad 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Alpine/CCTLocalBOMAlpineInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Alpine/CCTLocalBOMAlpineInitial.json @@ -58,7 +58,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -99,7 +99,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -140,7 +140,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -181,7 +181,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/CCTLocalBOMTemplateNugetInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/CCTLocalBOMTemplateNugetInitial.json index 140f6616..53a6e008 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/CCTLocalBOMTemplateNugetInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/CCTLocalBOMTemplateNugetInitial.json @@ -77,7 +77,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -118,7 +118,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -172,7 +172,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Conan/CCTLocalBOMConanInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Conan/CCTLocalBOMConanInitial.json index 2fd54058..9846c025 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Conan/CCTLocalBOMConanInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Conan/CCTLocalBOMConanInitial.json @@ -70,7 +70,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Debian/CCTLocalBOMDebianInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Debian/CCTLocalBOMDebianInitial.json index fd05a732..958fc349 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Debian/CCTLocalBOMDebianInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Debian/CCTLocalBOMDebianInitial.json @@ -88,7 +88,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -129,7 +129,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -170,7 +170,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -211,7 +211,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Maven/CCTLocalBOMMavenInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Maven/CCTLocalBOMMavenInitial.json index f4fc1604..86a731f3 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Maven/CCTLocalBOMMavenInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Maven/CCTLocalBOMMavenInitial.json @@ -132,7 +132,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -244,7 +244,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -333,7 +333,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmInitial.json index a333c47e..2ddb2951 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmInitial.json @@ -76,7 +76,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -128,7 +128,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -180,7 +180,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -231,7 +231,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -282,7 +282,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -334,7 +334,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmMultiplePackages.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmMultiplePackages.json index c304992f..59463a86 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmMultiplePackages.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmMultiplePackages.json @@ -98,7 +98,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -150,7 +150,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -202,7 +202,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -253,7 +253,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -304,7 +304,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -356,7 +356,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -408,7 +408,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -459,7 +459,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -510,7 +510,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -561,7 +561,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmUpdated.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmUpdated.json index 501b61cb..f688f62c 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmUpdated.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Npm/CCTLocalBOMNpmUpdated.json @@ -77,7 +77,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-npmjs-npm-remote-cache" }, { @@ -128,7 +128,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -179,7 +179,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { @@ -230,7 +230,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "siparty-release-npm-egll" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Nuget/CCTLocalBOMNugetInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Nuget/CCTLocalBOMNugetInitial.json index 2349f3eb..ae854280 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Nuget/CCTLocalBOMNugetInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Nuget/CCTLocalBOMNugetInitial.json @@ -66,7 +66,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -107,7 +107,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -148,7 +148,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -189,7 +189,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -230,7 +230,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -271,7 +271,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { diff --git a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Python/CCTLocalBOMPythonInitial.json b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Python/CCTLocalBOMPythonInitial.json index 7fd731bb..a449f0b6 100644 --- a/src/SW360IntegrationTest/PackageIdentifierTestFiles/Python/CCTLocalBOMPythonInitial.json +++ b/src/SW360IntegrationTest/PackageIdentifierTestFiles/Python/CCTLocalBOMPythonInitial.json @@ -80,7 +80,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-pythonhosted-pypi-remote-cache" }, { @@ -121,7 +121,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, { @@ -176,7 +176,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "org1-pythonhosted-pypi-remote-cache" }, { @@ -217,7 +217,7 @@ "value": "false" }, { - "name": "internal:siemens:clearing:repo-name", + "name": "internal:siemens:clearing:jfrog-repo-name", "value": "Not Found in JFrogRepo" }, {