-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature/missing fields datamodel (#236)
* Correct handling of new data model fields in ModelImporterExporter. * adapt master-solicitor.asciidoc * fixed issue with test data * removed two duplicated lines --------- Co-authored-by: ohecker <[email protected]>
- Loading branch information
1 parent
d60fc02
commit 1b2368d
Showing
4 changed files
with
205 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| { | ||
| "executionTime" : "Fri Oct 01 18:38:31 CEST 2021", | ||
| "modelVersion" : 6, | ||
| "solicitorVersion" : "1.3.0-SNAPSHOT", | ||
| "solicitorGitHash" : "a507f22", | ||
| "solicitorBuilddate" : "2021-10-01 18:34:12 +0200", | ||
| "extensionArtifactId" : "cap-solicitor-extension", | ||
| "extensionVersion" : "1.3.0-RC1", | ||
| "extensionGitHash" : "043a961", | ||
| "extensionBuilddate" : "2021-09-13 22:24:45", | ||
| "engagement" : { | ||
| "engagementName" : "Some Engagement", | ||
| "engagementType" : "INTERN", | ||
| "clientName" : "none", | ||
| "goToMarketModel" : "LICENSE", | ||
| "contractAllowsOss" : true, | ||
| "ossPolicyFollowed" : true, | ||
| "customerProvidesOss" : false, | ||
| "applications" : [ { | ||
| "name" : "Some Application", | ||
| "releaseId" : "1.2.3-SNAPSHOT", | ||
| "releaseDate" : "-UNDEFINED-", | ||
| "sourceRepo" : "https://point/to/your/repo.git", | ||
| "programmingEcosystem" : "Java8", | ||
| "applicationComponents" : [ { | ||
| "usagePattern" : "DYNAMIC_LINKING", | ||
| "ossModified" : false, | ||
| "ossHomepage" : null, | ||
| "sourceRepoUrl" : "https://github.com/qos-ch/logback", | ||
| "noticeFileUrl" : "http://some.url", | ||
| "noticeFileContentKey" : "31cb574375eadadae8835a406879719d85da9fbb5f0f0c6fdc62da741dc49de5", | ||
| "groupId" : "ch.qos.logback", | ||
| "artifactId" : "logback-classic", | ||
| "version" : "1.2.3", | ||
| "repoType" : "maven", | ||
| "packageUrl" : "pkg:maven/ch.qos.logback/[email protected]", | ||
| "copyrights" : null, | ||
| "packageDownloadUrl" : "https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar", | ||
| "sourceDownloadUrl" : "https://github.com/qos-ch/logback/archive/refs/tags/logback-1.2.3.zip", | ||
| "normalizedLicenses" : [ { | ||
| "declaredLicense" : "Eclipse Public License - v 1.0", | ||
| "licenseUrl" : "http://www.eclipse.org/legal/epl-v10.html", | ||
| "declaredLicenseContentKey" : "cf630ee3446f9e10c1b0814fb8a652f4733b491eaea9d5d1f89f803daaaa6075", | ||
| "normalizedLicenseType" : "OSS-SPDX", | ||
| "normalizedLicense" : "EPL-1.0", | ||
| "normalizedLicenseUrl" : "http://www.eclipse.org/legal/epl-v10.html", | ||
| "normalizedLicenseContentKey" : "cf630ee3446f9e10c1b0814fb8a652f4733b491eaea9d5d1f89f803daaaa6075", | ||
| "effectiveNormalizedLicenseType" : "IGNORE", | ||
| "effectiveNormalizedLicense" : "Ignore", | ||
| "effectiveNormalizedLicenseUrl" : null, | ||
| "effectiveNormalizedLicenseContentKey" : "9d086420212f290c944042014500f00716c30d53f316d224b4cdd0c20756ab6b", | ||
| "legalPreApproved" : "N/A", | ||
| "copyLeft" : "N/A", | ||
| "licenseCompliance" : "N/A", | ||
| "licenseRefUrl" : "http://another.url", | ||
| "licenseRefContentKey" : "7dbd9399a4684cdc5c1c51d6359294caea160c648f1792e273a9489e46321b88", | ||
| "includeLicense" : "no", | ||
| "includeSource" : "no", | ||
| "reviewedForRelease" : null, | ||
| "comments" : null, | ||
| "legalApproved" : "N/A", | ||
| "legalComments" : null, | ||
| "trace" : "+ Component/License info read in '[maven]' format from 'file:./input/licenses_starter.xml'\r\n+ Rule Group: LicenseNameMappingDefaults; RuleId: 57; Matching: declaredLicense==Eclipse Public License - v 1.0; Setting: normalizedLicenseType=OSS-SPDX, normalizedLicense=EPL-1.0, normalizedLicenseUrl=http://www.eclipse.org/legal/epl-v10.html (taking data from input)\r\n+ Rule Group: MultiLicenseSelection; RuleId: 6; Matching: groupId==ch.qos.logback, normalizedLicense==EPL-1.0; Setting: effectiveNormalizedLicenseType=IGNORE (multilicensing: ignore this, prefer LGPL-2.1), effectiveNormalizedLicense=Ignore\r\n+ Rule Group: LegalPreEvaluation; RuleId: 29; Matching: effectiveNormalizedLicenseType==IGNORE; Setting: legalPreApproved=N/A, copyLeft=N/A, licenseCompliance=N/A, includeLicense=no, includeSource=no\r\n+ Rule Group: LegalEvaluation; RuleId: 1; Matching: effectiveNormalizedLicenseType==IGNORE; Setting: legalApproved=N/A", | ||
| "guessedLicenseUrl" : null, | ||
| "guessedLicenseContentKey" : "90fa1cb2ff3629e0f7a3c78dc887134e5e05224de1b13fed1dedb33b1e920724", | ||
| "guessedLicenseUrlAuditInfo" : null | ||
| }, { | ||
| "declaredLicense" : "GNU Lesser General Public License", | ||
| "licenseUrl" : "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", | ||
| "declaredLicenseContentKey" : "cf630ee3446f9e10c1b0814fb8a652f4733b491eaea9d5d1f89f803daaaa6075", | ||
| "normalizedLicenseType" : "OSS-SPDX", | ||
| "normalizedLicense" : "LGPL-2.1", | ||
| "normalizedLicenseUrl" : "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", | ||
| "normalizedLicenseContentKey" : "cf630ee3446f9e10c1b0814fb8a652f4733b491eaea9d5d1f89f803daaaa6075", | ||
| "effectiveNormalizedLicenseType" : "OSS-SPDX", | ||
| "effectiveNormalizedLicense" : "LGPL-2.1", | ||
| "effectiveNormalizedLicenseUrl" : "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", | ||
| "effectiveNormalizedLicenseContentKey" : "cf630ee3446f9e10c1b0814fb8a652f4733b491eaea9d5d1f89f803daaaa6075", | ||
| "legalPreApproved" : "no", | ||
| "copyLeft" : "weak", | ||
| "licenseCompliance" : "check legal", | ||
| "licenseRefUrl" : "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt", | ||
| "licenseRefContentKey" : "7dbd9399a4684cdc5c1c51d6359294caea160c648f1792e273a9489e46321b88", | ||
| "includeLicense" : "yes", | ||
| "includeSource" : "yes", | ||
| "reviewedForRelease" : null, | ||
| "comments" : null, | ||
| "legalApproved" : "Conditional", | ||
| "legalComments" : "OK, in case of dynamic linking.", | ||
| "trace" : "+ Component/License info read in '[maven]' format from 'file:./input/licenses_starter.xml'\r\n+ Rule Group: LicenseNameMappingDefaults; RuleId: 101; Matching: licenseUrl==REGEX:https?://www.gnu.org/licenses/old-licenses/lgpl-2.1.*; Setting: normalizedLicenseType=OSS-SPDX, normalizedLicense=LGPL-2.1, normalizedLicenseUrl=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html (taking data from input)\r\n+ Rule Group: LicenseSelection; RuleId: DEFAULT; Matching: -default-; Setting: effectiveNormalizedLicenseType=OSS-SPDX (taking data from input), effectiveNormalizedLicense=LGPL-2.1 (taking data from input), effectiveNormalizedLicenseUrl=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html (taking data from input)\r\n+ Rule Group: LegalPreEvaluation; RuleId: 6; Matching: effectiveNormalizedLicenseType==OSS-SPDX, effectiveNormalizedLicense==LGPL-2.1; Setting: legalPreApproved=no, copyLeft=weak, licenseCompliance=check legal, licenseRefUrl=https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt, includeLicense=yes, includeSource=yes\r\n+ Rule Group: LegalEvaluation; RuleId: 14; Matching: usagePattern==DYNAMIC_LINKING, effectiveNormalizedLicenseType==OSS-SPDX, effectiveNormalizedLicense==LGPL-2.1; Setting: legalApproved=Conditional, legalComments=OK, in case of dynamic linking.", | ||
| "guessedLicenseUrl" : "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", | ||
| "guessedLicenseContentKey" : "90fa1cb2ff3629e0f7a3c78dc887134e5e05224de1b13fed1dedb33b1e920724", | ||
| "guessedLicenseUrlAuditInfo" : "" | ||
| } ], | ||
| "rawLicenses" : [ { | ||
| "declaredLicense" : "Eclipse Public License - v 1.0", | ||
| "licenseUrl" : "http://www.eclipse.org/legal/epl-v10.html", | ||
| "declaredLicenseContentKey" : null, | ||
| "trace" : "+ Component/License info read in '[maven]' format from 'file:./input/licenses_starter.xml'", | ||
| "origin" : "scancode", | ||
| "specialHandling" : true | ||
| }, { | ||
| "declaredLicense" : "GNU Lesser General Public License", | ||
| "licenseUrl" : "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", | ||
| "declaredLicenseContentKey" : null, | ||
| "trace" : "+ Component/License info read in '[maven]' format from 'file:./input/licenses_starter.xml'", | ||
| "origin" : "scancode", | ||
| "specialHandling" : true | ||
| } ], | ||
| "dataStatus" : "DA:NO_ISSUES", | ||
| "traceabilityNotes" : "" | ||
| } ] | ||
| } ] | ||
| }, | ||
| "textPool" : { | ||
| "dataMap" : { | ||
| "31cb574375eadadae8835a406879719d85da9fbb5f0f0c6fdc62da741dc49de5" : "Some content of a NOTICE file", | ||
| "7dbd9399a4684cdc5c1c51d6359294caea160c648f1792e273a9489e46321b88" : "Even some other license text", | ||
| "90fa1cb2ff3629e0f7a3c78dc887134e5e05224de1b13fed1dedb33b1e920724" : "Some license text", | ||
| "9d086420212f290c944042014500f00716c30d53f316d224b4cdd0c20756ab6b" : "Yet another license text", | ||
| "cf630ee3446f9e10c1b0814fb8a652f4733b491eaea9d5d1f89f803daaaa6075" : "Some other license text" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters