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

1 files changed, 340 insertions, 68 deletions

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": [
+          "."
+        ]
+      }
     }
   ]
 }