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

10 files changed, 22 insertions, 776 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63d619b..f0dabd7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,13 +85,7 @@ QA:ruby-bundler:
   extends: .QA
   variables:
     QA_PROJECT: ruby-bundler
-    QA_REF: 69654651
-
-QA:php-composer:
-  extends: .QA
-  variables:
-    QA_PROJECT: php-composer
-    QA_REF: ab6961ab
+    QA_REF: 6b858821
 
 QA:go:
   extends: .QA
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e8113..57c9bd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v1.5.0
+
+- Reverts 1.4.0
+
 ## v1.4.0
 
 - Bump LicenseFinder to 5.9.2
diff --git a/Dockerfile b/Dockerfile
index 91b7b5e..900019b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG LICENSE_FINDER_VERSION=5.9.2
+ARG LICENSE_FINDER_VERSION=5.6.2
 
 FROM licensefinder/license_finder:$LICENSE_FINDER_VERSION
 MAINTAINER GitLab
@@ -13,10 +13,6 @@ RUN cd /tmp && \
     mv jdk-11.0.2+9 /usr/lib/jvm/adoptopen_jdk11 && \
     rm /tmp/jdk-11.tgz
 
-# Install additional php packages for better composer package support
-RUN add-apt-repository ppa:ondrej/php && apt update -y && \
-    apt install php7.1-mbstring php7.1-intl php7.1-xml php7.1-soap -y
-
 RUN npm install npm-install-peers cheerio
 
 # Don't let Rubygem fail with the numerous projects using PG or MySQL,
@@ -26,6 +22,9 @@ RUN apt-get update && \
     libpq-dev libmysqlclient-dev realpath python3-dev python3-pip && \
     rm -rf /var/lib/apt/lists/*
 
+# Don't load RVM automatically, it doesn't work with GitLab-CI
+RUN mv /etc/profile.d/rvm.sh /rvm.sh
+
 # Warning! Environment variable PIP_VERSION causes the upgrade of pip to fail.
 ARG VERSION_OF_PIP=19.1.1
 ENV VERSION_OF_PIP $VERSION_OF_PIP
diff --git a/README.md b/README.md
index 18db03f..62daeaa 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,6 @@ The following table shows which languages and package managers are supported.
 | .NET       | [Nuget](https://www.nuget.org/)                                   |
 | Python     | [pip](https://pip.pypa.io/en/stable/)                             |
 | Ruby       | [gem](https://rubygems.org/)                                      |
-| PHP        | [composer](https://getcomposer.org)                               |
 
 Inject `SETUP_CMD` to the docker command to override the given package managers
 and run your custom command to setup your environment with a custom package manager.
diff --git a/run.sh b/run.sh
index 019d087..0ce0266 100755
--- a/run.sh
+++ b/run.sh
@@ -95,6 +95,9 @@ case "$COMMAND" in
   analyze)
     # Analyze project
 
+    # Load RVM
+    source /rvm.sh
+
     # Change current directory to the project path.
     APP_PATH=$1
     shift
@@ -109,9 +112,7 @@ case "$COMMAND" in
             # So we ignore the error.
             $($rvm_recommended_ruby) 2>/dev/null || true
             rvm use .
-            # rvm pulls outdated gems
-            # need this to update system bundler
-            gem update --system
+            gem install bundler
             # We need to install the license_finder gem into this Ruby version too.
             gem install license_finder -v "$LICENSE_FINDER_VERSION"
           fi
@@ -119,7 +120,7 @@ case "$COMMAND" in
           # Ignore test and development dependencies.
           license_finder ignored_groups add development
           license_finder ignored_groups add test
-          bundle install
+          bundle install --without "development test"
           skip_prepare=true
         fi
 
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": [
           "."