Merge branch 'upgrade-license-finder' into 'master'v3.23.0

Upgrade license finder to 6.8.1

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

16 files changed, 524 insertions, 2 deletions

diff --git a/spec/fixtures/dotnet/nuget-csproj/Program.cs b/spec/fixtures/dotnet/nuget-csproj/Program.cs
new file mode 100644
index 0000000..9e98aa4
--- /dev/null
+++ b/spec/fixtures/dotnet/nuget-csproj/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace nuget_csproj
+{
+  class Program
+  {
+    static void Main(string[] args)
+    {
+      Console.WriteLine("Hello World!");
+    }
+  }
+}
diff --git a/spec/fixtures/dotnet/nuget-csproj/nuget-csproj.csproj b/spec/fixtures/dotnet/nuget-csproj/nuget-csproj.csproj
new file mode 100644
index 0000000..7bdb8cc
--- /dev/null
+++ b/spec/fixtures/dotnet/nuget-csproj/nuget-csproj.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RootNamespace>nuget_csproj</RootNamespace>
+  </PropertyGroup>
+</Project>
diff --git a/spec/fixtures/expected/js/bower/v2.1.json b/spec/fixtures/expected/js/bower/v2.1.json
index 78a4a05..b1a140a 100644
--- a/spec/fixtures/expected/js/bower/v2.1.json
+++ b/spec/fixtures/expected/js/bower/v2.1.json
@@ -35,7 +35,7 @@
   "dependencies": [
     {
       "name": "cli",
-      "version": "6.14.7",
+      "version": "6.14.8",
       "package_manager": "bower",
       "path": "bower.json",
       "licenses": [
@@ -137,4 +137,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/java/maven/java-version/.java-version b/spec/fixtures/java/maven/java-version/.java-version
new file mode 100644
index 0000000..be6dcc8
--- /dev/null
+++ b/spec/fixtures/java/maven/java-version/.java-version
@@ -0,0 +1 @@
+java-version
diff --git a/spec/fixtures/java/maven/tool-versions/.tool-versions b/spec/fixtures/java/maven/tool-versions/.tool-versions
new file mode 100644
index 0000000..ecf6810
--- /dev/null
+++ b/spec/fixtures/java/maven/tool-versions/.tool-versions
@@ -0,0 +1 @@
+java tool-versions
diff --git a/spec/fixtures/js/10.21.0-tool-versions/.tool-versions b/spec/fixtures/js/10.21.0-tool-versions/.tool-versions
new file mode 100644
index 0000000..d5c42e2
--- /dev/null
+++ b/spec/fixtures/js/10.21.0-tool-versions/.tool-versions
@@ -0,0 +1 @@
+nodejs 10.21.0
diff --git a/spec/fixtures/python/pip/requirements/requirements.txt b/spec/fixtures/python/pip/requirements/requirements.txt
new file mode 100644
index 0000000..11b4935
--- /dev/null
+++ b/spec/fixtures/python/pip/requirements/requirements.txt
@@ -0,0 +1 @@
+beets==1.4.9
diff --git a/spec/fixtures/python/simple-Pipfile b/spec/fixtures/python/pipenv/simple/Pipfile
index 2a4ffeb..2a4ffeb 100644
--- a/spec/fixtures/python/simple-Pipfile
+++ b/spec/fixtures/python/pipenv/simple/Pipfile
diff --git a/spec/fixtures/python/simple-Pipfile.lock b/spec/fixtures/python/pipenv/simple/Pipfile.lock
index 655ee42..655ee42 100644
--- a/spec/fixtures/python/simple-Pipfile.lock
+++ b/spec/fixtures/python/pipenv/simple/Pipfile.lock
diff --git a/spec/fixtures/python/pipenv/specific-python-version/.tool-versions b/spec/fixtures/python/pipenv/specific-python-version/.tool-versions
new file mode 100644
index 0000000..5f51665
--- /dev/null
+++ b/spec/fixtures/python/pipenv/specific-python-version/.tool-versions
@@ -0,0 +1 @@
+python 3.4.10
diff --git a/spec/fixtures/python/pipenv/specific-python-version/Pipfile b/spec/fixtures/python/pipenv/specific-python-version/Pipfile
new file mode 100644
index 0000000..ba1512c
--- /dev/null
+++ b/spec/fixtures/python/pipenv/specific-python-version/Pipfile
@@ -0,0 +1,14 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+docutils = "==0.13.1"
+Django = "==1.11.3"
+requests = "==2.5.3"
+
+[requires]
+python_version = "3.4"
diff --git a/spec/fixtures/python/pipenv/specific-python-version/Pipfile.lock b/spec/fixtures/python/pipenv/specific-python-version/Pipfile.lock
new file mode 100644
index 0000000..82cfacb
--- /dev/null
+++ b/spec/fixtures/python/pipenv/specific-python-version/Pipfile.lock
@@ -0,0 +1,53 @@
+{
+  "_meta": {
+    "hash": {
+      "sha256": "1ac44ce43bdf23591652454e72811bc45465877c4a40721707a4a21323e14fb3"
+    },
+    "pipfile-spec": 6,
+    "requires": {
+      "python_version": "3.4"
+    },
+    "sources": [
+      {
+        "name": "pypi",
+        "url": "https://pypi.org/simple",
+        "verify_ssl": true
+      }
+    ]
+  },
+  "default": {
+    "django": {
+      "hashes": [
+        "sha256:9ef9de0a957245ed3a29c4162ed2fd493252ca249a755f9e2b4a9be82caf8f6b",
+        "sha256:c69e0c0416f2376b677830304d4c5fa8793b9c815af77be659a3c50d1f46c2e6"
+      ],
+      "index": "pypi",
+      "version": "==1.11.3"
+    },
+    "docutils": {
+      "hashes": [
+        "sha256:718c0f5fb677be0f34b781e04241c4067cbd9327b66bdd8e763201130f5175be",
+        "sha256:cb3ebcb09242804f84bdbf0b26504077a054da6772c6f4d625f335cc53ebf94d",
+        "sha256:de454f1015958450b72641165c08afe7023cd7e3944396448f2fb1b0ccba9d77"
+      ],
+      "index": "pypi",
+      "version": "==0.13.1"
+    },
+    "pytz": {
+      "hashes": [
+        "sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32",
+        "sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"
+      ],
+      "version": "==2019.2"
+    },
+    "requests": {
+      "hashes": [
+        "sha256:3e66d7ba78e7a6a8eccd2e901079ab8d24e408b5375cf32eb51f291306302418",
+        "sha256:55d7f5619daae94ec49ee81ed8c865e5a2a47f0bbf8e06cf94636bee103eaf65"
+      ],
+      "index": "pypi",
+      "version": "==2.5.3"
+    }
+  },
+  "develop": {}
+}
diff --git a/spec/fixtures/ruby/bundler-jruby/.tool-versions b/spec/fixtures/ruby/bundler-jruby/.tool-versions
new file mode 100644
index 0000000..e966fd0
--- /dev/null
+++ b/spec/fixtures/ruby/bundler-jruby/.tool-versions
@@ -0,0 +1,2 @@
+java adoptopenjdk-8.0.252+9.1
+ruby jruby-9.2.11.1
diff --git a/spec/fixtures/ruby/bundler-jruby/Gemfile b/spec/fixtures/ruby/bundler-jruby/Gemfile
new file mode 100644
index 0000000..c6e1267
--- /dev/null
+++ b/spec/fixtures/ruby/bundler-jruby/Gemfile
@@ -0,0 +1,66 @@
+source "https://rubygems.org"
+
+gem "rails", "5.2.4.3"
+
+gem "action_subscriber"
+gem "action_subscriber-opentracing"
+gem "activerecord-import"
+gem "active_remote"
+gem "aws-sdk-sns"
+gem "bcrypt"
+gem "pluck_each"
+gem "httpclient"
+gem "md-logstasher"
+gem "protobuf", ">= 3.10.0.pre0"
+gem "protobuf-activerecord", ">= 5.2.0"
+gem "protobuf-nats"
+gem "protobuf-opentracing"
+gem "rails-html-sanitizer", "~> 1.0.3"
+gem "redis-namespace"
+gem "redis-rails"
+gem "ruby-saml", "~> 1.2"
+gem "sidekiq"
+gem "sidekiq-cron"
+gem "spectacles"
+gem "sprockets", "~>3.7.2"
+gem "urlcrypt"
+gem "harness"
+gem "harness-action_subscriber"
+gem "harness-active_publisher"
+gem "harness-sidekiq"
+gem "trebuchet", :group => :development
+gem "rspec-rails", group: [:development, :test]
+
+platforms :ruby do
+  gem "pg"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcpostgresql-adapter"
+  gem "protobuf_java_helpers"
+  gem "fast_blank_java"
+end
+
+group :development, :test do
+  gem "benchmark-ips", require: false
+  gem "brakeman", require: false
+  gem "bundler-audit", require: false
+  gem "mad_rubocop", require: false
+  gem "pry"
+  platforms :jruby do
+    gem "jruby-profiler-flame_graph_profile_printer", require: false
+  end
+end
+
+group :test do
+  gem "factory_bot_rails"
+  gem "protobuf-rspec"
+  gem "rspec-pride", require: false
+  gem "shoulda"
+  gem "simplecov", require: false
+  gem "timecop"
+end
+
+group :doc do
+  gem "sdoc", require: false
+end
diff --git a/spec/fixtures/ruby/bundler-jruby/Gemfile.lock b/spec/fixtures/ruby/bundler-jruby/Gemfile.lock
new file mode 100644
index 0000000..2dedaae
--- /dev/null
+++ b/spec/fixtures/ruby/bundler-jruby/Gemfile.lock
@@ -0,0 +1,362 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    action_subscriber (5.2.1-java)
+      activesupport (>= 3.2)
+      concurrent-ruby
+      march_hare (>= 2.7.0)
+      middleware
+      thor
+    action_subscriber-opentracing (1.0.3)
+      opentracing
+    actioncable (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.4.3)
+      actionview (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.4.3)
+      activesupport (= 5.2.4.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    active_remote (5.2.0)
+      activemodel (~> 5.2)
+      activesupport (~> 5.2)
+      protobuf (>= 3.0)
+    activejob (5.2.4.3)
+      activesupport (= 5.2.4.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
+      arel (>= 9.0)
+    activerecord-import (1.0.5)
+      activerecord (>= 3.2)
+    activerecord-jdbc-adapter (52.6-java)
+      activerecord (~> 5.2.0)
+    activerecord-jdbcpostgresql-adapter (52.6-java)
+      activerecord-jdbc-adapter (= 52.6)
+      jdbc-postgres (>= 9.4, < 43)
+    activestorage (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    ast (2.4.1)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.341.0)
+    aws-sdk-core (3.103.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-sns (1.28.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    bcrypt (3.1.13-java)
+    benchmark-ips (2.8.2)
+    brakeman (4.8.2)
+    builder (3.2.4)
+    bundler-audit (0.7.0.1)
+      bundler (>= 1.2.0, < 3)
+      thor (>= 0.18, < 2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.6)
+    connection_pool (2.2.3)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    erubi (1.9.0)
+    et-orbi (1.2.4)
+      tzinfo
+    factory_bot (6.1.0)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.1.0)
+      factory_bot (~> 6.1.0)
+      railties (>= 5.0.0)
+    fast_blank_java (0.0.2-java)
+    ffi (1.13.1-java)
+    fugit (1.3.6)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.3)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    harness (2.0.0)
+      statsd-ruby
+    harness-action_subscriber (0.0.4)
+      action_subscriber (>= 2.0.0)
+      activesupport (>= 3.2)
+      harness (>= 2.0.0)
+    harness-active_publisher (1.1.3)
+      activesupport (>= 3.2)
+      harness (>= 2.0.0)
+    harness-sidekiq (0.1.0)
+      harness
+      sidekiq
+    heredity (0.1.2)
+    httpclient (2.8.3)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4-java)
+    jdbc-postgres (42.2.14)
+    jmespath (1.4.0)
+    jruby-profiler-flame_graph_profile_printer (0.2.0-java)
+    logstash-event (1.2.02)
+    loofah (2.6.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mad_rubocop (3.64.0)
+      rubocop (~> 0.64.0)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    march_hare (4.2.0-java)
+    md-logstasher (1.2.0)
+      logstash-event (~> 1.2)
+    method_source (1.0.0)
+    middleware (0.1.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    minitest (5.14.1)
+    nats-pure (0.3.0)
+    nio4r (2.5.2-java)
+    nokogiri (1.10.10-java)
+    opentracing (0.5.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pluck_each (0.1.3)
+      activerecord (> 3.2.0)
+      activesupport (> 3.0.0)
+    powerpack (0.1.2)
+    protobuf (3.10.3)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    protobuf-activerecord (5.2.0)
+      activerecord (~> 5.2.0)
+      activesupport (~> 5.2.0)
+      concurrent-ruby
+      heredity (>= 0.1.1)
+      protobuf (>= 3.0)
+    protobuf-nats (0.10.2)
+      activesupport (>= 3.2)
+      connection_pool
+      nats-pure (~> 0.3, < 0.4)
+      protobuf (~> 3.7, >= 3.7.2)
+    protobuf-opentracing (1.0.7)
+      activesupport (>= 3.2)
+      opentracing
+    protobuf-rspec (1.1.4)
+      protobuf (>= 3.0.0)
+      rspec (>= 2.14, < 4.0)
+    protobuf_java_helpers (0.2.0-java)
+    pry (0.13.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      spoon (~> 0.0)
+    raabro (1.3.1)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.4.3)
+      actioncable (= 5.2.4.3)
+      actionmailer (= 5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
+      activestorage (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.4.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rdoc (6.2.1)
+    redis (4.2.1)
+    redis-actionpack (5.2.0)
+      actionpack (>= 5, < 7)
+      redis-rack (>= 2.1.0, < 3)
+      redis-store (>= 1.1.0, < 2)
+    redis-activesupport (5.2.0)
+      activesupport (>= 3, < 7)
+      redis-store (>= 1.3, < 2)
+    redis-namespace (1.7.0)
+      redis (>= 3.0.4)
+    redis-rack (2.1.2)
+      rack (>= 2.0.8, < 3)
+      redis-store (>= 1.2, < 2)
+    redis-rails (5.0.2)
+      redis-actionpack (>= 5.0, < 6)
+      redis-activesupport (>= 5.0, < 6)
+      redis-store (>= 1.2, < 2)
+    redis-store (1.9.0)
+      redis (>= 4, < 5)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-pride (3.2.1)
+      rspec (~> 3.0)
+    rspec-rails (4.0.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.3)
+    rubocop (0.64.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.1)
+    ruby-saml (1.11.0)
+      nokogiri (>= 1.5.10)
+    sdoc (1.1.0)
+      rdoc (>= 5.0)
+    shoulda (4.0.0)
+      shoulda-context (~> 2.0)
+      shoulda-matchers (~> 4.0)
+    shoulda-context (2.0.0)
+    shoulda-matchers (4.3.0)
+      activesupport (>= 4.2.0)
+    sidekiq (6.1.0)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    sidekiq-cron (1.2.0)
+      fugit (~> 1.1)
+      sidekiq (>= 4.2.1)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    spectacles (2.0.0)
+      activerecord (>= 3.2.0, < 6.0)
+      activesupport (>= 3.2.0, < 6.0)
+    spoon (0.0.6)
+      ffi
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    statsd-ruby (1.4.0)
+    thor (1.0.1)
+    thread_safe (0.3.6-java)
+    timecop (0.9.1)
+    trebuchet (0.1)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.4.1)
+    urlcrypt (0.1.1)
+    websocket-driver (0.7.3-java)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  action_subscriber
+  action_subscriber-opentracing
+  active_remote
+  activerecord-import
+  activerecord-jdbcpostgresql-adapter
+  aws-sdk-sns
+  bcrypt
+  benchmark-ips
+  brakeman
+  bundler-audit
+  factory_bot_rails
+  fast_blank_java
+  harness
+  harness-action_subscriber
+  harness-active_publisher
+  harness-sidekiq
+  httpclient
+  jruby-profiler-flame_graph_profile_printer
+  mad_rubocop
+  md-logstasher
+  pg
+  pluck_each
+  protobuf (>= 3.10.0.pre0)
+  protobuf-activerecord (>= 5.2.0)
+  protobuf-nats
+  protobuf-opentracing
+  protobuf-rspec
+  protobuf_java_helpers
+  pry
+  rails (= 5.2.4.3)
+  rails-html-sanitizer (~> 1.0.3)
+  redis-namespace
+  redis-rails
+  rspec-pride
+  rspec-rails
+  ruby-saml (~> 1.2)
+  sdoc
+  shoulda
+  sidekiq
+  sidekiq-cron
+  simplecov
+  spectacles
+  sprockets (~> 3.7.2)
+  timecop
+  trebuchet
+  urlcrypt
+
+BUNDLED WITH
+   2.1.4
diff --git a/spec/fixtures/ruby/bundler/ruby-2.6.0-tool-versions/.tool-versions b/spec/fixtures/ruby/bundler/ruby-2.6.0-tool-versions/.tool-versions
new file mode 100644
index 0000000..cf8ec42
--- /dev/null
+++ b/spec/fixtures/ruby/bundler/ruby-2.6.0-tool-versions/.tool-versions
@@ -0,0 +1 @@
+ruby 2.6.0