Merge branch 'aeroscan-nl/license-management-upgrade_license_finder' into 'master'v3.13.0

Upgrade LicenseFinder to 6.6.0

See merge request gitlab-org/security-products/license-management!166

26 files changed, 891 insertions, 186 deletions

diff --git a/spec/fixtures/expected/c/conan/v1.1.json b/spec/fixtures/expected/c/conan/v1.1.json
index fe746ed..b4fa0cf 100644
--- a/spec/fixtures/expected/c/conan/v1.1.json
+++ b/spec/fixtures/expected/c/conan/v1.1.json
@@ -27,4 +27,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/c/conan/v2.0.json b/spec/fixtures/expected/c/conan/v2.0.json
index 862a083..33d4475 100644
--- a/spec/fixtures/expected/c/conan/v2.0.json
+++ b/spec/fixtures/expected/c/conan/v2.0.json
@@ -21,4 +21,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/c/conan/v2.1.json b/spec/fixtures/expected/c/conan/v2.1.json
index cc01320..b4da7e4 100644
--- a/spec/fixtures/expected/c/conan/v2.1.json
+++ b/spec/fixtures/expected/c/conan/v2.1.json
@@ -18,4 +18,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/go/modules/v1.0.json b/spec/fixtures/expected/go/modules/v1.0.json
index 1433dbf..4902d39 100644
--- a/spec/fixtures/expected/go/modules/v1.0.json
+++ b/spec/fixtures/expected/go/modules/v1.0.json
@@ -6,7 +6,7 @@
     },
     {
       "count": 2,
-      "name": "unknown"
+      "name": "New BSD"
     },
     {
       "count": 1,
@@ -18,7 +18,7 @@
     },
     {
       "count": 1,
-      "name": "New BSD"
+      "name": "Simplified BSD"
     }
   ],
   "dependencies": [
@@ -63,7 +63,8 @@
     },
     {
       "license": {
-        "name": "unknown"
+        "name": "New BSD",
+        "url": "http://opensource.org/licenses/BSD-3-Clause"
       },
       "dependency": {
         "name": "github.com/pmezard/go-difflib",
@@ -127,7 +128,8 @@
     },
     {
       "license": {
-        "name": "unknown"
+        "name": "Simplified BSD",
+        "url": "http://opensource.org/licenses/bsd-license"
       },
       "dependency": {
         "name": "gopkg.in/check.v1",
@@ -151,4 +153,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/go/modules/v1.1.json b/spec/fixtures/expected/go/modules/v1.1.json
index 6316bec..f0b9112 100644
--- a/spec/fixtures/expected/go/modules/v1.1.json
+++ b/spec/fixtures/expected/go/modules/v1.1.json
@@ -7,7 +7,7 @@
     },
     {
       "count": 2,
-      "name": "unknown"
+      "name": "New BSD"
     },
     {
       "count": 1,
@@ -19,7 +19,7 @@
     },
     {
       "count": 1,
-      "name": "New BSD"
+      "name": "Simplified BSD"
     }
   ],
   "dependencies": [
@@ -83,12 +83,13 @@
     {
       "licenses": [
         {
-          "name": "unknown",
-          "url": ""
+          "name": "New BSD",
+          "url": "http://opensource.org/licenses/BSD-3-Clause"
         }
       ],
       "license": {
-        "name": "unknown"
+        "name": "New BSD",
+        "url": "http://opensource.org/licenses/BSD-3-Clause"
       },
       "dependency": {
         "name": "github.com/pmezard/go-difflib",
@@ -177,12 +178,13 @@
     {
       "licenses": [
         {
-          "name": "unknown",
-          "url": ""
+          "name": "Simplified BSD",
+          "url": "http://opensource.org/licenses/bsd-license"
         }
       ],
       "license": {
-        "name": "unknown"
+        "name": "Simplified BSD",
+        "url": "http://opensource.org/licenses/bsd-license"
       },
       "dependency": {
         "name": "gopkg.in/check.v1",
@@ -216,4 +218,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/go/modules/v2.0.json b/spec/fixtures/expected/go/modules/v2.0.json
index 0e60fb8..49289a8 100644
--- a/spec/fixtures/expected/go/modules/v2.0.json
+++ b/spec/fixtures/expected/go/modules/v2.0.json
@@ -8,9 +8,9 @@
       "count": 6
     },
     {
-      "id": "unknown",
-      "name": "unknown",
-      "url": "",
+      "id": "BSD-3-Clause",
+      "name": "BSD 3-Clause \"New\" or \"Revised\" License",
+      "url": "https://opensource.org/licenses/BSD-3-Clause",
       "count": 2
     },
     {
@@ -20,9 +20,9 @@
       "count": 1
     },
     {
-      "id": "BSD-3-Clause",
-      "name": "BSD 3-Clause \"New\" or \"Revised\" License",
-      "url": "https://opensource.org/licenses/BSD-3-Clause",
+      "id": "BSD-2-Clause",
+      "name": "BSD 2-Clause \"Simplified\" License",
+      "url": "https://opensource.org/licenses/BSD-2-Clause",
       "count": 1
     },
     {
@@ -74,7 +74,7 @@
         "."
       ],
       "licenses": [
-        "unknown"
+        "BSD-3-Clause"
       ]
     },
     {
@@ -129,7 +129,7 @@
         "."
       ],
       "licenses": [
-        "unknown"
+        "BSD-2-Clause"
       ]
     },
     {
@@ -145,4 +145,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/go/modules/v2.1.json b/spec/fixtures/expected/go/modules/v2.1.json
index 1782d06..c86fe8e 100644
--- a/spec/fixtures/expected/go/modules/v2.1.json
+++ b/spec/fixtures/expected/go/modules/v2.1.json
@@ -7,6 +7,11 @@
       "url": "https://opensource.org/licenses/Apache-2.0"
     },
     {
+      "id": "BSD-2-Clause",
+      "name": "BSD 2-Clause \"Simplified\" License",
+      "url": "https://opensource.org/licenses/BSD-2-Clause"
+    },
+    {
       "id": "BSD-3-Clause",
       "name": "BSD 3-Clause \"New\" or \"Revised\" License",
       "url": "https://opensource.org/licenses/BSD-3-Clause"
@@ -20,11 +25,6 @@
       "id": "MIT",
       "name": "MIT License",
       "url": "https://opensource.org/licenses/MIT"
-    },
-    {
-      "id": "unknown",
-      "name": "unknown",
-      "url": ""
     }
   ],
   "dependencies": [
@@ -61,7 +61,7 @@
       "package_manager": "go",
       "path": "go.sum",
       "licenses": [
-        "unknown"
+        "BSD-3-Clause"
       ]
     },
     {
@@ -106,7 +106,7 @@
       "package_manager": "go",
       "path": "go.sum",
       "licenses": [
-        "unknown"
+        "BSD-2-Clause"
       ]
     },
     {
@@ -120,4 +120,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/java/gradle/v1.0.json b/spec/fixtures/expected/java/gradle/v1.0.json
index f0bb0f5..25fdece 100644
--- a/spec/fixtures/expected/java/gradle/v1.0.json
+++ b/spec/fixtures/expected/java/gradle/v1.0.json
@@ -362,4 +362,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/expected/java/gradle/v1.1.json b/spec/fixtures/expected/java/gradle/v1.1.json
index e337e49..7df7233 100644
--- a/spec/fixtures/expected/java/gradle/v1.1.json
+++ b/spec/fixtures/expected/java/gradle/v1.1.json
@@ -523,4 +523,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/expected/java/gradle/v2.0.json b/spec/fixtures/expected/java/gradle/v2.0.json
index 4b4a06c..4caca99 100644
--- a/spec/fixtures/expected/java/gradle/v2.0.json
+++ b/spec/fixtures/expected/java/gradle/v2.0.json
@@ -327,4 +327,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/expected/java/maven-multimodules/v1.0.json b/spec/fixtures/expected/java/maven-multimodules/v1.0.json
index ac9f480..e165360 100644
--- a/spec/fixtures/expected/java/maven-multimodules/v1.0.json
+++ b/spec/fixtures/expected/java/maven-multimodules/v1.0.json
@@ -1,94 +1,294 @@
 {
   "licenses": [
-    { "count": 15, "name": "Apache 2.0" },
-    { "count": 4, "name": "BSD" },
-    { "count": 1, "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0" },
-    { "count": 1, "name": "unknown" }
+    {
+      "count": 15,
+      "name": "Apache 2.0"
+    },
+    {
+      "count": 4,
+      "name": "BSD"
+    },
+    {
+      "count": 1,
+      "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0"
+    },
+    {
+      "count": 1,
+      "name": "unknown"
+    }
   ],
   "dependencies": [
     {
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "asm", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "asm",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "asm-commons", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "asm-commons",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "asm-tree", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "asm-tree",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "commons-fileupload", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "commons-fileupload",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "commons-io", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "commons-io",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "commons-lang3", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "commons-lang3",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "freemarker", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "freemarker",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-annotations", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-annotations",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-core", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-databind", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-databind",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-dataformat-xml", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-dataformat-xml",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-module-jaxb-annotations", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-module-jaxb-annotations",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "javassist", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "javassist",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "log4j-api", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "log4j-api",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "log4j-api", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "log4j-api",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "log4j-core", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "log4j-core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "unknown" },
-      "dependency": { "name": "model", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "model",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "netty-all", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "netty-all",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "ognl", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "ognl",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "stax2-api", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "stax2-api",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "struts2-core", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "struts2-core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     }
   ]
 }
diff --git a/spec/fixtures/expected/java/maven-multimodules/v1.1.json b/spec/fixtures/expected/java/maven-multimodules/v1.1.json
index a8e2841..9fb043a 100644
--- a/spec/fixtures/expected/java/maven-multimodules/v1.1.json
+++ b/spec/fixtures/expected/java/maven-multimodules/v1.1.json
@@ -1,126 +1,353 @@
 {
   "version": "1.1",
   "licenses": [
-    { "count": 15, "name": "Apache 2.0" },
-    { "count": 4, "name": "BSD" },
-    { "count": 1, "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0" },
-    { "count": 1, "name": "unknown" }
+    {
+      "count": 15,
+      "name": "Apache 2.0"
+    },
+    {
+      "count": 4,
+      "name": "BSD"
+    },
+    {
+      "count": 1,
+      "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0"
+    },
+    {
+      "count": 1,
+      "name": "unknown"
+    }
   ],
   "dependencies": [
     {
       "licenses": [
-        { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" }
+        {
+          "name": "BSD",
+          "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+        }
       ],
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "asm", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "asm",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "licenses": [ { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" } ],
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "asm-commons", "description": "", "pathes": [ "." ] }
+      "licenses": [
+        {
+          "name": "BSD",
+          "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+        }
+      ],
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "asm-commons",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "licenses": [ { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" } ],
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "asm-tree", "description": "", "pathes": [ "." ] }
+      "licenses": [
+        {
+          "name": "BSD",
+          "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+        }
+      ],
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "asm-tree",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
-      "licenses": [ { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" } ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "commons-fileupload", "description": "", "pathes": [ "." ] }
+      "licenses": [
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
+      ],
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "commons-fileupload",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "commons-io", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "commons-io",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "commons-lang3", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "commons-lang3",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "freemarker", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "freemarker",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-annotations", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-annotations",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-core", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-databind", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-databind",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-dataformat-xml", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-dataformat-xml",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "jackson-module-jaxb-annotations", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "jackson-module-jaxb-annotations",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-        { "name": "GNU Lesser General Public License version 2.1", "url": "https://opensource.org/licenses/LGPL-2.1" },
-        { "name": "MPL 1.1", "url": "" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+          "name": "GNU Lesser General Public License version 2.1",
+          "url": "https://opensource.org/licenses/LGPL-2.1"
+        },
+        {
+          "name": "MPL 1.1",
+          "url": ""
+        }
       ],
-      "license": { "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "javassist", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "javassist",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "log4j-api", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "log4j-api",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "log4j-api", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "log4j-api",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "log4j-core", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "log4j-core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "unknown", "url": "" }
+        {
+          "name": "unknown",
+          "url": ""
+        }
       ],
-      "license": { "name": "unknown" },
-      "dependency": { "name": "model", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "model",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
@@ -129,29 +356,74 @@
           "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "netty-all", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "netty-all",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "ognl", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "ognl",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" }
+        {
+          "name": "BSD",
+          "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+        }
       ],
-      "license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
-      "dependency": { "name": "stax2-api", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "BSD",
+        "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
+      },
+      "dependency": {
+        "name": "stax2-api",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     },
     {
       "licenses": [
-        { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" }
+        {
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        }
       ],
-      "license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
-      "dependency": { "name": "struts2-core", "description": "", "pathes": [ "." ] }
+      "license": {
+        "name": "Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      },
+      "dependency": {
+        "name": "struts2-core",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
     }
   ]
 }
diff --git a/spec/fixtures/expected/java/maven-multimodules/v2.0.json b/spec/fixtures/expected/java/maven-multimodules/v2.0.json
index aa08ef9..594c36e 100644
--- a/spec/fixtures/expected/java/maven-multimodules/v2.0.json
+++ b/spec/fixtures/expected/java/maven-multimodules/v2.0.json
@@ -33,26 +33,238 @@
     }
   ],
   "dependencies": [
-    { "name": "asm", "url": "", "description": "", "paths": [ "." ], "licenses": [ "BSD-4-Clause" ] },
-    { "name": "asm-commons", "url": "", "description": "", "paths": [ "." ], "licenses": [ "BSD-4-Clause" ] },
-    { "name": "asm-tree", "url": "", "description": "", "paths": [ "." ], "licenses": [ "BSD-4-Clause" ] },
-    { "name": "commons-fileupload", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "commons-io", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "commons-lang3", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "freemarker", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "jackson-annotations", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "jackson-core", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "jackson-databind", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "jackson-dataformat-xml", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "jackson-module-jaxb-annotations", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "javassist", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0", "LGPL-2.1", "MPL-1.1" ] },
-    { "name": "log4j-api", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "log4j-api", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "log4j-core", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "model", "url": "", "description": "", "paths": [ "." ], "licenses": [ "unknown" ] },
-    { "name": "netty-all", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "ognl", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] },
-    { "name": "stax2-api", "url": "", "description": "", "paths": [ "." ], "licenses": [ "BSD-4-Clause" ] },
-    { "name": "struts2-core", "url": "", "description": "", "paths": [ "." ], "licenses": [ "Apache-2.0" ] }
+    {
+      "name": "asm",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "BSD-4-Clause"
+      ]
+    },
+    {
+      "name": "asm-commons",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "BSD-4-Clause"
+      ]
+    },
+    {
+      "name": "asm-tree",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "BSD-4-Clause"
+      ]
+    },
+    {
+      "name": "commons-fileupload",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "commons-io",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "commons-lang3",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "freemarker",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "jackson-annotations",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "jackson-core",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "jackson-databind",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "jackson-dataformat-xml",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "jackson-module-jaxb-annotations",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "javassist",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0",
+        "LGPL-2.1",
+        "MPL-1.1"
+      ]
+    },
+    {
+      "name": "log4j-api",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "log4j-api",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "log4j-core",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "model",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "unknown"
+      ]
+    },
+    {
+      "name": "netty-all",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "ognl",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    },
+    {
+      "name": "stax2-api",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "BSD-4-Clause"
+      ]
+    },
+    {
+      "name": "struts2-core",
+      "url": "",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "Apache-2.0"
+      ]
+    }
   ]
 }
diff --git a/spec/fixtures/expected/java/maven/v2.1.json b/spec/fixtures/expected/java/maven/v2.1.json
index 6855593..a02947a 100644
--- a/spec/fixtures/expected/java/maven/v2.1.json
+++ b/spec/fixtures/expected/java/maven/v2.1.json
@@ -269,4 +269,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/js/bower/v1.0.json b/spec/fixtures/expected/js/bower/v1.0.json
index cbffaa2..f71e6b5 100644
--- a/spec/fixtures/expected/js/bower/v1.0.json
+++ b/spec/fixtures/expected/js/bower/v1.0.json
@@ -10,7 +10,7 @@
     },
     {
       "count": 1,
-      "name": "New BSD, MIT, ISC, Apache 2.0"
+      "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0"
     },
     {
       "count": 1,
@@ -20,7 +20,7 @@
   "dependencies": [
     {
       "license": {
-        "name": "New BSD, MIT, ISC, Apache 2.0",
+        "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0",
         "url": "http://en.wikipedia.org/wiki/ISC_license"
       },
       "dependency": {
diff --git a/spec/fixtures/expected/js/bower/v1.1.json b/spec/fixtures/expected/js/bower/v1.1.json
index 7351634..9abb729 100644
--- a/spec/fixtures/expected/js/bower/v1.1.json
+++ b/spec/fixtures/expected/js/bower/v1.1.json
@@ -11,7 +11,7 @@
     },
     {
       "count": 1,
-      "name": "New BSD, MIT, ISC, Apache 2.0"
+      "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0"
     },
     {
       "count": 1,
@@ -36,10 +36,14 @@
         {
           "name": "New BSD",
           "url": "http://opensource.org/licenses/BSD-3-Clause"
+        },
+        {
+          "name": "Simplified BSD",
+          "url": "http://opensource.org/licenses/bsd-license"
         }
       ],
       "license": {
-        "name": "New BSD, MIT, ISC, Apache 2.0",
+        "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0",
         "url": "http://en.wikipedia.org/wiki/ISC_license"
       },
       "dependency": {
diff --git a/spec/fixtures/expected/js/bower/v2.0.json b/spec/fixtures/expected/js/bower/v2.0.json
index a8183e6..8d62873 100644
--- a/spec/fixtures/expected/js/bower/v2.0.json
+++ b/spec/fixtures/expected/js/bower/v2.0.json
@@ -20,6 +20,12 @@
       "count": 1
     },
     {
+      "id": "BSD-2-Clause",
+      "name": "BSD 2-Clause \"Simplified\" License",
+      "url": "https://opensource.org/licenses/BSD-2-Clause",
+      "count": 1
+    },
+    {
       "id": "BSD-3-Clause",
       "name": "BSD 3-Clause \"New\" or \"Revised\" License",
       "url": "https://opensource.org/licenses/BSD-3-Clause",
@@ -42,6 +48,7 @@
       ],
       "licenses": [
         "Apache-2.0",
+        "BSD-2-Clause",
         "BSD-3-Clause",
         "ISC",
         "MIT"
diff --git a/spec/fixtures/expected/js/bower/v2.1.json b/spec/fixtures/expected/js/bower/v2.1.json
index 3933832..cf41514 100644
--- a/spec/fixtures/expected/js/bower/v2.1.json
+++ b/spec/fixtures/expected/js/bower/v2.1.json
@@ -7,6 +7,11 @@
       "url": "https://opensource.org/licenses/Apache-2.0"
     },
     {
+      "id": "BSD-2-Clause",
+      "name": "BSD 2-Clause \"Simplified\" License",
+      "url": "https://opensource.org/licenses/BSD-2-Clause"
+    },
+    {
       "id": "BSD-3-Clause",
       "name": "BSD 3-Clause \"New\" or \"Revised\" License",
       "url": "https://opensource.org/licenses/BSD-3-Clause"
@@ -35,6 +40,7 @@
       "path": "bower.json",
       "licenses": [
         "Apache-2.0",
+        "BSD-2-Clause",
         "BSD-3-Clause",
         "ISC",
         "MIT"
@@ -122,4 +128,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/expected/js/npm/v1.0.json b/spec/fixtures/expected/js/npm/v1.0.json
index 4978ad4..fecd1ac 100644
--- a/spec/fixtures/expected/js/npm/v1.0.json
+++ b/spec/fixtures/expected/js/npm/v1.0.json
@@ -70,4 +70,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/js/npm/v1.1.json b/spec/fixtures/expected/js/npm/v1.1.json
index 8294741..4c2e0dd 100644
--- a/spec/fixtures/expected/js/npm/v1.1.json
+++ b/spec/fixtures/expected/js/npm/v1.1.json
@@ -99,4 +99,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/js/npm/v2.0.json b/spec/fixtures/expected/js/npm/v2.0.json
index dcba5ef..5419d06 100644
--- a/spec/fixtures/expected/js/npm/v2.0.json
+++ b/spec/fixtures/expected/js/npm/v2.0.json
@@ -61,4 +61,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/js/yarn/v1.0.json b/spec/fixtures/expected/js/yarn/v1.0.json
index 3264ddb..f944b03 100644
--- a/spec/fixtures/expected/js/yarn/v1.0.json
+++ b/spec/fixtures/expected/js/yarn/v1.0.json
@@ -15953,4 +15953,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/js/yarn/v1.1.json b/spec/fixtures/expected/js/yarn/v1.1.json
index d197e7b..ddb581f 100644
--- a/spec/fixtures/expected/js/yarn/v1.1.json
+++ b/spec/fixtures/expected/js/yarn/v1.1.json
@@ -22770,4 +22770,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/js/yarn/v2.0.json b/spec/fixtures/expected/js/yarn/v2.0.json
index 7553d39..5819cd3 100644
--- a/spec/fixtures/expected/js/yarn/v2.0.json
+++ b/spec/fixtures/expected/js/yarn/v2.0.json
@@ -12632,4 +12632,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/python/pipenv/v2.1.json b/spec/fixtures/expected/python/pipenv/v2.1.json
index 2a5f945..30161e1 100644
--- a/spec/fixtures/expected/python/pipenv/v2.1.json
+++ b/spec/fixtures/expected/python/pipenv/v2.1.json
@@ -60,4 +60,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/expected/ruby/bundler/v2.1.json b/spec/fixtures/expected/ruby/bundler/v2.1.json
index 9171241..ae83b84 100644
--- a/spec/fixtures/expected/ruby/bundler/v2.1.json
+++ b/spec/fixtures/expected/ruby/bundler/v2.1.json
@@ -163,4 +163,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}