From d0194bf226723746bd73b3bf8bdcdf19bec6ac95 Mon Sep 17 00:00:00 2001
From: Tetiana Chupryna <tchupryna@gitlab.com>
Date: Mon, 17 Aug 2020 19:22:25 +0300
Subject: Fix failed java specs

---
 spec/fixtures/expected/java/gradle/v2.0.json             |  9 ++++-----
 spec/fixtures/expected/java/gradle/v2.1.json             |  8 ++++----
 spec/fixtures/expected/java/maven-multimodules/v2.0.json |  2 +-
 spec/fixtures/expected/java/maven-multimodules/v2.1.json | 10 +++++-----
 spec/fixtures/expected/java/maven/v2.0.json              |  9 ++++-----
 spec/fixtures/expected/java/maven/v2.1.json              |  8 ++++----
 6 files changed, 22 insertions(+), 24 deletions(-)

(limited to 'spec/fixtures/expected/java')

diff --git a/spec/fixtures/expected/java/gradle/v2.0.json b/spec/fixtures/expected/java/gradle/v2.0.json
index 4caca99..b210fb0 100644
--- a/spec/fixtures/expected/java/gradle/v2.0.json
+++ b/spec/fixtures/expected/java/gradle/v2.0.json
@@ -20,10 +20,9 @@
       "count": 2
     },
     {
-      "id": "BSD-4-Clause",
-      "name": "BSD 4-Clause \"Original\" or \"Old\" License",
-      "url": "http://directory.fsf.org/wiki/License:BSD_4Clause",
-      "count": 1
+      "id": "bsd",
+      "name": "BSD",
+      "url": "http://en.wikipedia.org/wiki/BSD_licenses"
     },
     {
       "id": "LGPL-2.1",
@@ -47,7 +46,7 @@
         "."
       ],
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
diff --git a/spec/fixtures/expected/java/gradle/v2.1.json b/spec/fixtures/expected/java/gradle/v2.1.json
index b639938..c4e4fa2 100644
--- a/spec/fixtures/expected/java/gradle/v2.1.json
+++ b/spec/fixtures/expected/java/gradle/v2.1.json
@@ -7,9 +7,9 @@
       "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": "bsd",
+      "name": "BSD",
+      "url": "http://en.wikipedia.org/wiki/BSD_licenses"
     },
     {
       "id": "LGPL-2.1",
@@ -39,7 +39,7 @@
       "package_manager": "gradle",
       "path": "build.gradle",
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
diff --git a/spec/fixtures/expected/java/maven-multimodules/v2.0.json b/spec/fixtures/expected/java/maven-multimodules/v2.0.json
index c901899..4440793 100644
--- a/spec/fixtures/expected/java/maven-multimodules/v2.0.json
+++ b/spec/fixtures/expected/java/maven-multimodules/v2.0.json
@@ -10,7 +10,7 @@
     {
       "id": "bsd",
       "name": "BSD",
-      "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29",
+      "url": "http://en.wikipedia.org/wiki/BSD_licenses",
       "count": 4
     },
     {
diff --git a/spec/fixtures/expected/java/maven-multimodules/v2.1.json b/spec/fixtures/expected/java/maven-multimodules/v2.1.json
index 227cab0..a2336bc 100644
--- a/spec/fixtures/expected/java/maven-multimodules/v2.1.json
+++ b/spec/fixtures/expected/java/maven-multimodules/v2.1.json
@@ -6,11 +6,6 @@
       "name": "Apache License 2.0",
       "url": "https://opensource.org/licenses/Apache-2.0"
     },
-    {
-      "id": "bsd",
-      "name": "BSD",
-      "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
-    },
     {
       "id": "LGPL-2.1",
       "name": "GNU Lesser General Public License v2.1 only",
@@ -21,6 +16,11 @@
       "name": "Mozilla Public License 1.1",
       "url": "https://opensource.org/licenses/MPL-1.1"
     },
+    {
+      "id": "bsd",
+      "name": "BSD",
+      "url": "http://en.wikipedia.org/wiki/BSD_licenses"
+    },
     {
       "id": "unknown",
       "name": "unknown",
diff --git a/spec/fixtures/expected/java/maven/v2.0.json b/spec/fixtures/expected/java/maven/v2.0.json
index 4b4a06c..aeced14 100644
--- a/spec/fixtures/expected/java/maven/v2.0.json
+++ b/spec/fixtures/expected/java/maven/v2.0.json
@@ -20,10 +20,9 @@
       "count": 2
     },
     {
-      "id": "BSD-4-Clause",
-      "name": "BSD 4-Clause \"Original\" or \"Old\" License",
-      "url": "http://directory.fsf.org/wiki/License:BSD_4Clause",
-      "count": 1
+      "id": "bsd",
+      "name": "BSD",
+      "url": "http://en.wikipedia.org/wiki/BSD_licenses"
     },
     {
       "id": "LGPL-2.1",
@@ -47,7 +46,7 @@
         "."
       ],
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
diff --git a/spec/fixtures/expected/java/maven/v2.1.json b/spec/fixtures/expected/java/maven/v2.1.json
index a02947a..9d03db0 100644
--- a/spec/fixtures/expected/java/maven/v2.1.json
+++ b/spec/fixtures/expected/java/maven/v2.1.json
@@ -7,9 +7,9 @@
       "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": "bsd",
+      "name": "BSD",
+      "url": "http://en.wikipedia.org/wiki/BSD_licenses"
     },
     {
       "id": "LGPL-2.1",
@@ -39,7 +39,7 @@
       "package_manager": "maven",
       "path": "pom.xml",
       "licenses": [
-        "BSD-4-Clause"
+        "bsd"
       ]
     },
     {
-- 
cgit v1.2.3