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

6 files changed, 42 insertions, 42 deletions

diff --git a/spec/fixtures/expected/python/2/pip/v2.0.json b/spec/fixtures/expected/python/2/pip/v2.0.json
index 8ed6ee7..5515387 100644
--- a/spec/fixtures/expected/python/2/pip/v2.0.json
+++ b/spec/fixtures/expected/python/2/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
     },
     {
@@ -47,7 +47,7 @@
         "."
       ],
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
@@ -80,7 +80,7 @@
         "."
       ],
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
@@ -91,7 +91,7 @@
         "."
       ],
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
@@ -113,7 +113,7 @@
         "."
       ],
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
diff --git a/spec/fixtures/expected/python/2/pip/v2.1.json b/spec/fixtures/expected/python/2/pip/v2.1.json
index 3203679..05492d6 100644
--- a/spec/fixtures/expected/python/2/pip/v2.1.json
+++ b/spec/fixtures/expected/python/2/pip/v2.1.json
@@ -7,11 +7,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"
@@ -27,6 +22,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": ""
@@ -39,7 +39,7 @@
       "package_manager": "pip",
       "path": "requirements.txt",
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
@@ -66,7 +66,7 @@
       "package_manager": "pip",
       "path": "requirements.txt",
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
@@ -75,7 +75,7 @@
       "package_manager": "pip",
       "path": "requirements.txt",
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
@@ -93,7 +93,7 @@
       "package_manager": "pip",
       "path": "requirements.txt",
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
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"
       ]
     },
     {
diff --git a/spec/fixtures/expected/python/pipenv/v2.0.json b/spec/fixtures/expected/python/pipenv/v2.0.json
index ba4d529..59913c2 100644
--- a/spec/fixtures/expected/python/pipenv/v2.0.json
+++ b/spec/fixtures/expected/python/pipenv/v2.0.json
@@ -8,9 +8,9 @@
       "count": 1
     },
     {
-      "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": 1
     },
     {
@@ -35,7 +35,7 @@
         "."
       ],
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
diff --git a/spec/fixtures/expected/python/pipenv/v2.1.json b/spec/fixtures/expected/python/pipenv/v2.1.json
index 30161e1..9e64c02 100644
--- a/spec/fixtures/expected/python/pipenv/v2.1.json
+++ b/spec/fixtures/expected/python/pipenv/v2.1.json
@@ -7,16 +7,16 @@
       "url": "https://opensource.org/licenses/Apache-2.0"
     },
     {
-      "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"
     },
     {
+      "id": "bsd",
+      "name": "BSD",
+      "url": "http://en.wikipedia.org/wiki/BSD_licenses"
+    },
+    {
       "id": "public domain, python, 2-clause bsd, gpl 3 (see copying.txt)",
       "name": "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)",
       "url": ""
@@ -29,7 +29,7 @@
       "package_manager": "pip",
       "path": "Pipfile.lock",
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {