diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-02-24 14:15:16 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-02-24 14:15:16 +0000 |
| commit | 1bd03175f997d381eaac4b2d3756b5d179e697e5 (patch) | |
| tree | 560b309ede2161c19af1c6989a7e2032333c8eb6 /lib/license/management.rb | |
| parent | 36e9f083880cfe4e886277c7242295f2506fad91 (diff) | |
| parent | 7352e16643fed6ed96d5f63476efd4b4bce71c5f (diff) | |
Merge branch '199078-update-license-finder' into 'master'v2.5.0
Update license_finder gem to 6.0.0
See merge request gitlab-org/security-products/license-management!112
Diffstat (limited to 'lib/license/management.rb')
| -rw-r--r-- | lib/license/management.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/license/management.rb b/lib/license/management.rb index ebab5e2..37fe1a0 100644 --- a/lib/license/management.rb +++ b/lib/license/management.rb @@ -6,8 +6,6 @@ require 'json' require 'license_finder' require 'license/management/loggable' require 'license/management/verifiable' -require 'license/management/python/pipenv' -require 'license/management/python/pypi' require 'license/management/repository' require 'license/management/report' require 'license/management/version' @@ -15,26 +13,6 @@ require 'license/management/version' # This applies a monkey patch to the JsonReport found in the `license_finder` gem. LicenseFinder::JsonReport.prepend(License::Management::Report) -# This monkey patch can be removed once https://github.com/pivotal/LicenseFinder/pull/659 is released -LicenseFinder::Scanner.const_set( - :PACKAGE_MANAGERS, - LicenseFinder::Scanner::PACKAGE_MANAGERS + [License::Management::Pipenv] -) - -# This monkey patch can be removed once we upgrade to license_finder 5.9.2. Details [here](https://gitlab.com/gitlab-org/gitlab/issues/13748#note_235810786). -module LicenseFinder - class Bundler < PackageManager - def definition - @definition ||= - begin - Dir.chdir(project_path.to_s) do - ::Bundler::Definition.build(detected_package_path, lockfile_path, nil) - end - end - end - end -end - module License module Management def self.root |