Skip to content

Commit 4940064

Browse files
pombredannepombredanne
committed
Merge remote-tracking branch 'upstream/759-licref-url-template' into develop
2 parents a0f092d + d5ebfd2 commit 4940064

31 files changed

Lines changed: 1709 additions & 1634 deletions

‎etc/scripts/testdata/json2csv/full.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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
1+
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
22
/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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
33
/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']",,,,,,,,,,,,,,,,
44
/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/full.json‎

Lines changed: 390 additions & 390 deletions
Large diffs are not rendered by default.

‎etc/scripts/testdata/json2csv/full.json-expected‎

Lines changed: 390 additions & 390 deletions
Large diffs are not rendered by default.

‎etc/scripts/testdata/json2csv/minimal.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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
1+
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
22
/srp_vfy.c,,,,,,,,,,,,,,,,,,
33
/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'],,
44
/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‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"owner": "Apache Software Foundation",
1616
"homepage_url": "http://www.apache.org/licenses/",
1717
"text_url": "http://www.apache.org/licenses/LICENSE-2.0",
18-
"dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
18+
"reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
1919
"spdx_license_key": "Apache-2.0",
2020
"spdx_url": "http://spdx.org/licenses/Apache-2.0",
2121
"start_line": 4,
@@ -36,7 +36,7 @@
3636
"owner": "OpenSSL",
3737
"homepage_url": "http://www.openssl.org/source/license.html",
3838
"text_url": "",
39-
"dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
39+
"reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
4040
"spdx_license_key": "OpenSSL",
4141
"spdx_url": "http://spdx.org/licenses/OpenSSL",
4242
"start_line": 4,
@@ -77,7 +77,7 @@
7777
"owner": "Apache Software Foundation",
7878
"homepage_url": "http://www.apache.org/licenses/",
7979
"text_url": "http://www.apache.org/licenses/LICENSE-2.0",
80-
"dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
80+
"reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
8181
"spdx_license_key": "Apache-2.0",
8282
"spdx_url": "http://spdx.org/licenses/Apache-2.0",
8383
"start_line": 4,
@@ -98,7 +98,7 @@
9898
"owner": "OpenSSL",
9999
"homepage_url": "http://www.openssl.org/source/license.html",
100100
"text_url": "",
101-
"dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
101+
"reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
102102
"spdx_license_key": "OpenSSL",
103103
"spdx_url": "http://spdx.org/licenses/OpenSSL",
104104
"start_line": 4,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"license__owner": "Apache Software Foundation",
1313
"license__homepage_url": "http://www.apache.org/licenses/",
1414
"license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
15-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
15+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
1616
"license__spdx_license_key": "Apache-2.0",
1717
"license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
1818
"start_line": 4,
@@ -32,7 +32,7 @@
3232
"license__owner": "OpenSSL",
3333
"license__homepage_url": "http://www.openssl.org/source/license.html",
3434
"license__text_url": "",
35-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
35+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
3636
"license__spdx_license_key": "OpenSSL",
3737
"license__spdx_url": "http://spdx.org/licenses/OpenSSL",
3838
"start_line": 4,
@@ -68,7 +68,7 @@
6868
"license__owner": "Apache Software Foundation",
6969
"license__homepage_url": "http://www.apache.org/licenses/",
7070
"license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
71-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
71+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
7272
"license__spdx_license_key": "Apache-2.0",
7373
"license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
7474
"start_line": 4,
@@ -88,7 +88,7 @@
8888
"license__owner": "OpenSSL",
8989
"license__homepage_url": "http://www.openssl.org/source/license.html",
9090
"license__text_url": "",
91-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
91+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
9292
"license__spdx_license_key": "OpenSSL",
9393
"license__spdx_url": "http://spdx.org/licenses/OpenSSL",
9494
"start_line": 4,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"license__owner": "Apache Software Foundation",
1313
"license__homepage_url": "http://www.apache.org/licenses/",
1414
"license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
15-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
15+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
1616
"license__spdx_license_key": "Apache-2.0",
1717
"license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
1818
"start_line": 4,
@@ -32,7 +32,7 @@
3232
"license__owner": "OpenSSL",
3333
"license__homepage_url": "http://www.openssl.org/source/license.html",
3434
"license__text_url": "",
35-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
35+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
3636
"license__spdx_license_key": "OpenSSL",
3737
"license__spdx_url": "http://spdx.org/licenses/OpenSSL",
3838
"start_line": 4,
@@ -68,7 +68,7 @@
6868
"license__owner": "Apache Software Foundation",
6969
"license__homepage_url": "http://www.apache.org/licenses/",
7070
"license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
71-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
71+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
7272
"license__spdx_license_key": "Apache-2.0",
7373
"license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
7474
"start_line": 4,
@@ -88,7 +88,7 @@
8888
"license__owner": "OpenSSL",
8989
"license__homepage_url": "http://www.openssl.org/source/license.html",
9090
"license__text_url": "",
91-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
91+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
9292
"license__spdx_license_key": "OpenSSL",
9393
"license__spdx_url": "http://spdx.org/licenses/OpenSSL",
9494
"start_line": 4,

‎etc/scripts/testdata/json2csv/minimal_html_app_data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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": []}]
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", "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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"owner": "Apache Software Foundation",
1616
"homepage_url": "http://www.apache.org/licenses/",
1717
"text_url": "http://www.apache.org/licenses/LICENSE-2.0",
18-
"dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
18+
"reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
1919
"spdx_license_key": "Apache-2.0",
2020
"spdx_url": "http://spdx.org/licenses/Apache-2.0",
2121
"start_line": 4,
@@ -36,7 +36,7 @@
3636
"owner": "OpenSSL",
3737
"homepage_url": "http://www.openssl.org/source/license.html",
3838
"text_url": "",
39-
"dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
39+
"reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
4040
"spdx_license_key": "OpenSSL",
4141
"spdx_url": "http://spdx.org/licenses/OpenSSL",
4242
"start_line": 4,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"license__owner": "Apache Software Foundation",
1313
"license__homepage_url": "http://www.apache.org/licenses/",
1414
"license__text_url": "http://www.apache.org/licenses/LICENSE-2.0",
15-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
15+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0",
1616
"license__spdx_license_key": "Apache-2.0",
1717
"license__spdx_url": "http://spdx.org/licenses/Apache-2.0",
1818
"start_line": 4,
@@ -32,7 +32,7 @@
3232
"license__owner": "OpenSSL",
3333
"license__homepage_url": "http://www.openssl.org/source/license.html",
3434
"license__text_url": "",
35-
"license__dejacode_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
35+
"license__reference_url": "https://enterprise.dejacode.com/urn/urn:dje:license:openssl-ssleay",
3636
"license__spdx_license_key": "OpenSSL",
3737
"license__spdx_url": "http://spdx.org/licenses/OpenSSL",
3838
"start_line": 4,

0 commit comments

Comments
 (0)