diff --git a/minecode/mappers/apache.py b/minecode/mappers/apache.py index 4b3f6891..a62f7f85 100644 --- a/minecode/mappers/apache.py +++ b/minecode/mappers/apache.py @@ -107,6 +107,7 @@ def build_packages_from_projects(metadata, uri=None): if license_url in APACHE_LICENSE_URL: common_data['declared_license_expression'] = 'apache-2.0' common_data['declared_license_expression_spdx'] = 'Apache-2.0' + common_data['license_detections'] = [] keywords = [] category = project_meta.get('category', '') diff --git a/minecode/tests/testfiles/apache/map-groovy_expected.json b/minecode/tests/testfiles/apache/map-groovy_expected.json index bca6c2e4..591ea6ac 100644 --- a/minecode/tests/testfiles/apache/map-groovy_expected.json +++ b/minecode/tests/testfiles/apache/map-groovy_expected.json @@ -31,6 +31,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json b/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json index e8561cdc..bcfe363a 100644 --- a/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json +++ b/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json @@ -31,6 +31,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/apache/podling_amaterasu_expected.json b/minecode/tests/testfiles/apache/podling_amaterasu_expected.json index 31f037ec..1f27220f 100644 --- a/minecode/tests/testfiles/apache/podling_amaterasu_expected.json +++ b/minecode/tests/testfiles/apache/podling_amaterasu_expected.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/apache/projects_expected.json b/minecode/tests/testfiles/apache/projects_expected.json index 92a0ae71..56b72658 100644 --- a/minecode/tests/testfiles/apache/projects_expected.json +++ b/minecode/tests/testfiles/apache/projects_expected.json @@ -34,12 +34,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/abdera@1.7.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -89,12 +93,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/activemq?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -143,12 +151,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.7.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -197,12 +209,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.7.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -251,12 +267,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.5?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -305,12 +325,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.4?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -359,12 +383,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.3?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -413,12 +441,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.2?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -467,12 +499,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -521,12 +557,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -575,12 +615,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.4?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -629,12 +673,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.3?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -683,12 +731,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.2?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -737,12 +789,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -791,12 +847,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.4.5?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -845,12 +905,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.3.6?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -899,12 +963,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/ace@0.8.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -955,12 +1023,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/airavata@0.11?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ],