diff options
| author | mo khan <mo.khan@gmail.com> | 2020-08-21 19:07:16 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-08-21 19:07:16 +0000 |
| commit | eb11eeb1018c4d32e8dbaf3f734e588205f0671f (patch) | |
| tree | e0595b6d9b1ad9f85969b1c304613420e777b993 /spec/fixtures/expected/python/3 | |
| parent | 366fbf58b1334f771e76b313dac58f568a420e0e (diff) | |
| parent | 50a62393fe6ba477deb224480a2133482238754e (diff) | |
Merge branch '207904-bsd-not-precise' into 'master'v3.24.0
Denormalize BSD-4-Clause license
See merge request gitlab-org/security-products/license-management!196
Diffstat (limited to 'spec/fixtures/expected/python/3')
| -rw-r--r-- | spec/fixtures/expected/python/3/pip/v2.0.json | 14 | ||||
| -rw-r--r-- | spec/fixtures/expected/python/3/pip/v2.1.json | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/spec/fixtures/expected/python/3/pip/v2.0.json b/spec/fixtures/expected/python/3/pip/v2.0.json index b5c23ae..49c7328 100644 --- a/spec/fixtures/expected/python/3/pip/v2.0.json +++ b/spec/fixtures/expected/python/3/pip/v2.0.json @@ -2,9 +2,9 @@ "version": "2.0", "licenses": [ { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause", + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses", "count": 4 }, { @@ -53,7 +53,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -86,7 +86,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -97,7 +97,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -119,7 +119,7 @@ "." ], "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { diff --git a/spec/fixtures/expected/python/3/pip/v2.1.json b/spec/fixtures/expected/python/3/pip/v2.1.json index 787b800..a23b401 100644 --- a/spec/fixtures/expected/python/3/pip/v2.1.json +++ b/spec/fixtures/expected/python/3/pip/v2.1.json @@ -12,11 +12,6 @@ "url": "https://opensource.org/licenses/BSD-3-Clause" }, { - "id": "BSD-4-Clause", - "name": "BSD 4-Clause \"Original\" or \"Old\" License", - "url": "http://directory.fsf.org/wiki/License:BSD_4Clause" - }, - { "id": "MIT", "name": "MIT License", "url": "https://opensource.org/licenses/MIT" @@ -32,6 +27,11 @@ "url": "https://opensource.org/licenses/Python-2.0" }, { + "id": "bsd", + "name": "BSD", + "url": "http://en.wikipedia.org/wiki/BSD_licenses" + }, + { "id": "copyright (c) 2015, julien fache", "name": "Copyright (c) 2015, Julien Fache", "url": "" @@ -44,7 +44,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -71,7 +71,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -80,7 +80,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { @@ -98,7 +98,7 @@ "package_manager": "pip", "path": "requirements.txt", "licenses": [ - "BSD-4-Clause" + "bsd" ] }, { |