Merge branch 'revert-0ea7eb0c' into 'master'v1.5.0

Revert "Merge branch 'upgrade-docker-license-finder' into 'master'"

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

5 files changed, 8 insertions, 759 deletions

diff --git a/test/results/java-maven.json b/test/results/java-maven.json
index 4adc58c..58e9260 100644
--- a/test/results/java-maven.json
+++ b/test/results/java-maven.json
@@ -30,7 +30,7 @@
     },
     {
       "count": 1,
-      "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0"
+      "name": "MPL 1.1, LGPL 2.1, Apache 2.0"
     },
     {
       "count": 1,
@@ -221,8 +221,8 @@
     },
     {
       "license": {
-        "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0",
-        "url": "https://opensource.org/licenses/LGPL-2.1"
+        "name": "MPL 1.1, LGPL 2.1, Apache 2.0",
+        "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
       },
       "dependency": {
         "name": "javassist",
diff --git a/test/results/php-composer.json b/test/results/php-composer.json
deleted file mode 100644
index 6b9833d..0000000
--- a/test/results/php-composer.json
+++ /dev/null
@@ -1,749 +0,0 @@
-{
-  "licenses": [
-    {
-      "count": 36,
-      "name": "MIT"
-    },
-    {
-      "count": 18,
-      "name": "New BSD"
-    },
-    {
-      "count": 1,
-      "name": "BSD-3-Clause-Attribution"
-    },
-    {
-      "count": 1,
-      "name": "Simplified BSD"
-    }
-  ],
-  "dependencies": [
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "classpreloader/classpreloader",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "dnoegel/php-xdg-base-dir",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "doctrine/inflector",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "doctrine/instantiator",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "Simplified BSD",
-        "url": "http://opensource.org/licenses/bsd-license"
-      },
-      "dependency": {
-        "name": "jakub-onderka/php-console-color",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "jakub-onderka/php-console-highlighter",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "jeremeamia/SuperClosure",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "laravel/framework",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "league/flysystem",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "monolog/monolog",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "mtdowling/cron-expression",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "myclabs/deep-copy",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "nesbot/carbon",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "nikic/php-parser",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "paragonie/random_compat",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "phpdocumentor/reflection-common",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "phpdocumentor/reflection-docblock",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "phpdocumentor/type-resolver",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "phpspec/prophecy",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "phpunit/php-code-coverage",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "phpunit/php-file-iterator",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "phpunit/php-text-template",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "phpunit/php-timer",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "phpunit/php-token-stream",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "phpunit/phpunit",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "phpunit/phpunit-mock-objects",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "psr/log",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "psy/psysh",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "ramsey/uuid",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/code-unit-reverse-lookup",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/comparator",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/diff",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/environment",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/exporter",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/global-state",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/object-enumerator",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/recursion-context",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/resource-operations",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
-      },
-      "dependency": {
-        "name": "sebastian/version",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "swiftmailer/swiftmailer",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/console",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/debug",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/event-dispatcher",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/finder",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/http-foundation",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/http-kernel",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/polyfill-mbstring",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/polyfill-php56",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/polyfill-util",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/process",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/routing",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/translation",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/var-dumper",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "symfony/yaml",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "BSD-3-Clause-Attribution"
-      },
-      "dependency": {
-        "name": "vlucas/phpdotenv",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    },
-    {
-      "license": {
-        "name": "MIT",
-        "url": "http://opensource.org/licenses/mit-license"
-      },
-      "dependency": {
-        "name": "webmozart/assert",
-        "description": "",
-        "pathes": [
-          "."
-        ]
-      }
-    }
-  ]
-}
diff --git a/test/results/python-pip.json b/test/results/python-pip.json
index 5adaedd..3aa6f39 100644
--- a/test/results/python-pip.json
+++ b/test/results/python-pip.json
@@ -14,7 +14,7 @@
     },
     {
       "count": 1,
-      "name": "New BSD"
+      "name": "New BSD License"
     },
     {
       "count": 1,
@@ -125,8 +125,7 @@
     },
     {
       "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
+        "name": "New BSD License"
       },
       "dependency": {
         "name": "django-xmlrpc",
diff --git a/test/results/python3-pip.json b/test/results/python3-pip.json
index 6cf3676..d98669d 100644
--- a/test/results/python3-pip.json
+++ b/test/results/python3-pip.json
@@ -14,7 +14,7 @@
     },
     {
       "count": 1,
-      "name": "New BSD"
+      "name": "New BSD License"
     },
     {
       "count": 1,
@@ -129,8 +129,7 @@
     },
     {
       "license": {
-        "name": "New BSD",
-        "url": "http://opensource.org/licenses/BSD-3-Clause"
+        "name": "New BSD License"
       },
       "dependency": {
         "name": "django-xmlrpc",
diff --git a/test/results/ruby-bundler.json b/test/results/ruby-bundler.json
index 03b3505..c66a9a3 100644
--- a/test/results/ruby-bundler.json
+++ b/test/results/ruby-bundler.json
@@ -21,7 +21,7 @@
       },
       "dependency": {
         "name": "bundler",
-        "url": "http://bundler.io",
+        "url": "https://bundler.io",
         "description": "The best way to manage your application's dependencies",
         "pathes": [
           "."