diff options
| author | Olivier Gonzalez <ogonzalez@gitlab.com> | 2018-12-19 09:05:51 +0000 |
|---|---|---|
| committer | Olivier Gonzalez <ogonzalez@gitlab.com> | 2018-12-19 09:05:51 +0000 |
| commit | 75ce97e9719152033824352fef12783f51ba56e0 (patch) | |
| tree | a97675d56e95fcaa907d743f5ace377dc647e2e2 | |
| parent | 91ac63622068d70411b305ca1f363242f1e40294 (diff) | |
| parent | 46a4d0b3129175f14d84946081f68b2af9273a04 (diff) | |
Merge branch 'cherry-pick-f5ea1bc9' into '11-6-stable'11-6-stable
Backport "Bump LicenseFinder to 5.5.2" to 11.6
See merge request gitlab-org/security-products/license-management!9
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rwxr-xr-x | test/test.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cba242d..46eac10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # GitLab License management changelog ## 11-6-stable + - Backport: Bump LicenseFinder to 5.5.2 ## 11-5-stable @@ -1,4 +1,4 @@ -FROM licensefinder/license_finder:5.1.0 +FROM licensefinder/license_finder:5.5.2 MAINTAINER GitLab RUN npm install npm-install-peers cheerio diff --git a/test/test.sh b/test/test.sh index 0130492..53c1805 100755 --- a/test/test.sh +++ b/test/test.sh @@ -2,7 +2,7 @@ set -e -for project in ruby-bundler java-maven; do +for project in ruby-bundler-rails java-maven; do # Clone the test repository. echo "Cloning the test repository https://gitlab.com/gitlab-org/security-products/tests/$project.git" git clone "https://gitlab.com/gitlab-org/security-products/tests/$project.git" "/code/$project" |