Create new option for license URL template

etc/scripts/testdata/json2csv/full.csv

@@ -1,4 +1,4 @@
-Resource,type,name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__dejacode_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,author,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__homepage_url,package__notes,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+Resource,type,name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,author,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__homepage_url,package__notes,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
 /test_sevenzip.py,file,test_sevenzip.py,.py,2016-12-01,8773,e6ece461dc3af299ff4684081b9010a87fcd82f0,166bde096f06b5fa4ea962f94f217e0b,,text/x-python,"Python script, ASCII text executable, with very long lines",Python,,True,,,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /test_sevenzip.py,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,http://spdx.org/licenses/Apache-2.0,4,23,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,
 /test_sevenzip.py,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB Inc.,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,4,23,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,

etc/scripts/testdata/json2csv/minimal.csv

@@ -1,4 +1,4 @@
-Resource,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__dejacode_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder
+Resource,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder
 /srp_vfy.c,,,,,,,,,,,,,,,,,,
 /srp_vfy.c,,apache-2.0,53.85,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,http://spdx.org/licenses/Apache-2.0,4,5,apache-2.0_23.RULE,False,[u'apache-2.0'],,
 /srp_vfy.c,,openssl-ssleay,10.00,OpenSSL/SSLeay License,Permissive,OpenSSL,http://www.openssl.org/source/license.html,,https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay,OpenSSL,http://spdx.org/licenses/OpenSSL,4,4,openssl-ssleay_2.RULE,False,[u'openssl-ssleay'],,

etc/scripts/testdata/json2csv/minimal.json

@@ -15,7 +15,7 @@
           "owner": "Apache Software Foundation",
           "homepage_url": "http://www.apache.org/licenses/",
           "text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-          "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
           "spdx_license_key": "Apache-2.0",
           "spdx_url": "http://spdx.org/licenses/Apache-2.0",
           "start_line": 4,
@@ -36,7 +36,7 @@
           "owner": "OpenSSL",
           "homepage_url": "http://www.openssl.org/source/license.html",
           "text_url": "",
-          "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
           "spdx_license_key": "OpenSSL",
           "spdx_url": "http://spdx.org/licenses/OpenSSL",
           "start_line": 4,
@@ -77,7 +77,7 @@
           "owner": "Apache Software Foundation",
           "homepage_url": "http://www.apache.org/licenses/",
           "text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-          "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
           "spdx_license_key": "Apache-2.0",
           "spdx_url": "http://spdx.org/licenses/Apache-2.0",
           "start_line": 4,
@@ -98,7 +98,7 @@
           "owner": "OpenSSL",
           "homepage_url": "http://www.openssl.org/source/license.html",
           "text_url": "",
-          "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
           "spdx_license_key": "OpenSSL",
           "spdx_url": "http://spdx.org/licenses/OpenSSL",
           "start_line": 4,

etc/scripts/testdata/json2csv/minimal.json-expected

@@ -12,7 +12,7 @@
         "license__owner": "Apache Software Foundation",
         "license__homepage_url": "http://www.apache.org/licenses/",
         "license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
         "license__spdx_license_key": "Apache-2.0",
         "license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
         "start_line": 4,
@@ -32,7 +32,7 @@
         "license__owner": "OpenSSL",
         "license__homepage_url": "http://www.openssl.org/source/license.html",
         "license__text_url": "",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
         "license__spdx_license_key": "OpenSSL",
         "license__spdx_url": "http://spdx.org/licenses/OpenSSL",
         "start_line": 4,
@@ -68,7 +68,7 @@
         "license__owner": "Apache Software Foundation",
         "license__homepage_url": "http://www.apache.org/licenses/",
         "license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
         "license__spdx_license_key": "Apache-2.0",
         "license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
         "start_line": 4,
@@ -88,7 +88,7 @@
         "license__owner": "OpenSSL",
         "license__homepage_url": "http://www.openssl.org/source/license.html",
         "license__text_url": "",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
         "license__spdx_license_key": "OpenSSL",
         "license__spdx_url": "http://spdx.org/licenses/OpenSSL",
         "start_line": 4,

etc/scripts/testdata/json2csv/minimal.json-prefix-path-expected

@@ -12,7 +12,7 @@
         "license__owner": "Apache Software Foundation",
         "license__homepage_url": "http://www.apache.org/licenses/",
         "license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
         "license__spdx_license_key": "Apache-2.0",
         "license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
         "start_line": 4,
@@ -32,7 +32,7 @@
         "license__owner": "OpenSSL",
         "license__homepage_url": "http://www.openssl.org/source/license.html",
         "license__text_url": "",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
         "license__spdx_license_key": "OpenSSL",
         "license__spdx_url": "http://spdx.org/licenses/OpenSSL",
         "start_line": 4,
@@ -68,7 +68,7 @@
         "license__owner": "Apache Software Foundation",
         "license__homepage_url": "http://www.apache.org/licenses/",
         "license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
         "license__spdx_license_key": "Apache-2.0",
         "license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
         "start_line": 4,
@@ -88,7 +88,7 @@
         "license__owner": "OpenSSL",
         "license__homepage_url": "http://www.openssl.org/source/license.html",
         "license__text_url": "",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
         "license__spdx_license_key": "OpenSSL",
         "license__spdx_url": "http://spdx.org/licenses/OpenSSL",
         "start_line": 4,

etc/scripts/testdata/json2csv/minimal_html_app_data.json

@@ -1 +1 @@
-data=[{"path": "srp_vfy.c", "scan_errors": [], "licenses": [{"key": "apache-2.0", "score": 53.85, "short_name": "Apache 2.0", "category": "Permissive", "owner": "Apache Software Foundation", "homepage_url": "http://www.apache.org/licenses/", "text_url": "http://www.apache.org/licenses/LICENSE-2.0", "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0", "spdx_license_key": "Apache-2.0", "spdx_url": "http://spdx.org/licenses/Apache-2.0", "start_line": 4, "end_line": 5, "matched_rule": {"identifier": "apache-2.0_23.RULE", "license_choice": false, "licenses": ["apache-2.0"]}}, {"key": "openssl-ssleay", "score": 10.0, "short_name": "OpenSSL/SSLeay License", "category": "Permissive", "owner": "OpenSSL", "homepage_url": "http://www.openssl.org/source/license.html", "text_url": "", "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay", "spdx_license_key": "OpenSSL", "spdx_url": "http://spdx.org/licenses/OpenSSL", "start_line": 4, "end_line": 4, "matched_rule": {"identifier": "openssl-ssleay_2.RULE", "license_choice": false, "licenses": ["openssl-ssleay"]}}], "copyrights": [{"statements": ["Copyright 2011-2016 The OpenSSL Project"], "holders": ["OpenSSL Project"], "authors": [], "start_line": 2, "end_line": 2}], "packages": []}, {"path": "srp_lib.c", "scan_errors": [], "licenses": [{"key": "apache-2.0", "score": 53.85, "short_name": "Apache 2.0", "category": "Permissive", "owner": "Apache Software Foundation", "homepage_url": "http://www.apache.org/licenses/", "text_url": "http://www.apache.org/licenses/LICENSE-2.0", "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0", "spdx_license_key": "Apache-2.0", "spdx_url": "http://spdx.org/licenses/Apache-2.0", "start_line": 4, "end_line": 5, "matched_rule": {"identifier": "apache-2.0_23.RULE", "license_choice": false, "licenses": ["apache-2.0"]}}, {"key": "openssl-ssleay", "score": 10.0, "short_name": "OpenSSL/SSLeay License", "category": "Permissive", "owner": "OpenSSL", "homepage_url": "http://www.openssl.org/source/license.html", "text_url": "", "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay", "spdx_license_key": "OpenSSL", "spdx_url": "http://spdx.org/licenses/OpenSSL", "start_line": 4, "end_line": 4, "matched_rule": {"identifier": "openssl-ssleay_2.RULE", "license_choice": false, "licenses": ["openssl-ssleay"]}}], "copyrights": [{"statements": ["Copyright 2011-2016 The OpenSSL Project"], "holders": ["OpenSSL Project"], "authors": [], "start_line": 2, "end_line": 2}], "packages": []}, {"path": "build.info", "scan_errors": [], "licenses": [], "copyrights": [], "packages": []}]
+data=[{"path": "srp_vfy.c", "scan_errors": [], "licenses": [{"key": "apache-2.0", "score": 53.85, "short_name": "Apache 2.0", "category": "Permissive", "owner": "Apache Software Foundation", "homepage_url": "http://www.apache.org/licenses/", "text_url": "http://www.apache.org/licenses/LICENSE-2.0", "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0", "spdx_license_key": "Apache-2.0", "spdx_url": "http://spdx.org/licenses/Apache-2.0", "start_line": 4, "end_line": 5, "matched_rule": {"identifier": "apache-2.0_23.RULE", "license_choice": false, "licenses": ["apache-2.0"]}}, {"key": "openssl-ssleay", "score": 10.0, "short_name": "OpenSSL/SSLeay License", "category": "Permissive", "owner": "OpenSSL", "homepage_url": "http://www.openssl.org/source/license.html", "text_url": "", "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay", "spdx_license_key": "OpenSSL", "spdx_url": "http://spdx.org/licenses/OpenSSL", "start_line": 4, "end_line": 4, "matched_rule": {"identifier": "openssl-ssleay_2.RULE", "license_choice": false, "licenses": ["openssl-ssleay"]}}], "copyrights": [{"statements": ["Copyright 2011-2016 The OpenSSL Project"], "holders": ["OpenSSL Project"], "authors": [], "start_line": 2, "end_line": 2}], "packages": []}, {"path": "srp_lib.c", "scan_errors": [], "licenses": [{"key": "apache-2.0", "score": 53.85, "short_name": "Apache 2.0", "category": "Permissive", "owner": "Apache Software Foundation", "homepage_url": "http://www.apache.org/licenses/", "text_url": "http://www.apache.org/licenses/LICENSE-2.0", "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0", "spdx_license_key": "Apache-2.0", "spdx_url": "http://spdx.org/licenses/Apache-2.0", "start_line": 4, "end_line": 5, "matched_rule": {"identifier": "apache-2.0_23.RULE", "license_choice": false, "licenses": ["apache-2.0"]}}, {"key": "openssl-ssleay", "score": 10.0, "short_name": "OpenSSL/SSLeay License", "category": "Permissive", "owner": "OpenSSL", "homepage_url": "http://www.openssl.org/source/license.html", "text_url": "", "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay", "spdx_license_key": "OpenSSL", "spdx_url": "http://spdx.org/licenses/OpenSSL", "start_line": 4, "end_line": 4, "matched_rule": {"identifier": "openssl-ssleay_2.RULE", "license_choice": false, "licenses": ["openssl-ssleay"]}}], "copyrights": [{"statements": ["Copyright 2011-2016 The OpenSSL Project"], "holders": ["OpenSSL Project"], "authors": [], "start_line": 2, "end_line": 2}], "packages": []}, {"path": "build.info", "scan_errors": [], "licenses": [], "copyrights": [], "packages": []}]

etc/scripts/testdata/json2csv/package_license_value_null.json

@@ -15,7 +15,7 @@
           "owner": "Apache Software Foundation",
           "homepage_url": "http://www.apache.org/licenses/",
           "text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-          "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
           "spdx_license_key": "Apache-2.0",
           "spdx_url": "http://spdx.org/licenses/Apache-2.0",
           "start_line": 4,
@@ -36,7 +36,7 @@
           "owner": "OpenSSL",
           "homepage_url": "http://www.openssl.org/source/license.html",
           "text_url": "",
-          "dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+          "reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
           "spdx_license_key": "OpenSSL",
           "spdx_url": "http://spdx.org/licenses/OpenSSL",
           "start_line": 4,

etc/scripts/testdata/json2csv/package_license_value_null.json-expected

@@ -12,7 +12,7 @@
         "license__owner": "Apache Software Foundation",
         "license__homepage_url": "http://www.apache.org/licenses/",
         "license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
         "license__spdx_license_key": "Apache-2.0",
         "license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
         "start_line": 4,
@@ -32,7 +32,7 @@
         "license__owner": "OpenSSL",
         "license__homepage_url": "http://www.openssl.org/source/license.html",
         "license__text_url": "",
-        "license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
+        "license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
         "license__spdx_license_key": "OpenSSL",
         "license__spdx_url": "http://spdx.org/licenses/OpenSSL",
         "start_line": 4,

etc/scripts/testdata/livescan/expected.csv

@@ -1,4 +1,4 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__dejacode_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
+Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__summary,package__description,package__size,package__release_date,package__authors,package__homepage_url,package__notes,package__download_urls,package__bug_tracking_url,package__vcs_repository,package__copyright_top_level
 /package.json,file,package.json,package,.json,2017-06-23,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
 /package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,