Commit a46f75c1 authored by mo's avatar mo Committed by Can Eldem
Browse files

Update version, CHANGELOG and README

* Install license_finder ~> 6.6 into default gems
parent 2b8b49ae
......@@ -51,3 +51,4 @@ license_scanning:
name: $TMP_IMAGE
variables:
LM_REPORT_VERSION: '2.1'
needs: ['build-docker-image']
......@@ -26,6 +26,7 @@ size:
BUNDLE_PATH: 'vendor/bundle'
GIT_DEPTH: "10"
GIT_STRATEGY: fetch
LOG_LEVEL: debug
cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
......
# GitLab License management changelog
## v3.13.0
- Upgrade to [`license_finder`](https://github.com/pivotal/LicenseFinder/) [`6.6.0`](https://github.com/pivotal/LicenseFinder/releases/tag/v6.6.0). (!162) (!166)
## v3.12.3
- Update default Java versions to match [new naming convention](https://github.com/halcyon/asdf-java/pull/87 (!176)
......
PATH
remote: .
specs:
license-management (3.12.3)
license_finder (~> 6.0.0)
license-management (3.13.0)
license_finder (~> 6.6.0)
GEM
remote: https://rubygems.org/
......@@ -22,17 +22,16 @@ GEM
jaro_winkler (1.5.4)
json-schema (2.8.1)
addressable (>= 2.4)
license_finder (6.0.0)
license_finder (6.6.0)
bundler
rubyzip (>= 1, < 3)
thor
toml (= 0.2.0)
thor (~> 1.0.1)
tomlrb (~> 1.3.0)
with_env (= 1.1.0)
xml-simple
xml-simple (~> 1.1.5)
parallel (1.19.1)
parser (2.7.0.4)
ast (~> 2.4.0)
parslet (1.8.2)
public_suffix (4.0.3)
rack (2.2.2)
rainbow (3.0.0)
......@@ -76,8 +75,7 @@ GEM
simplecov (~> 0.8)
simplecov-html (0.12.2)
thor (1.0.1)
toml (0.2.0)
parslet (~> 1.8.0)
tomlrb (1.3.0)
unicode-display_width (1.6.1)
with_env (1.1.0)
xml-simple (1.1.5)
......
......@@ -37,6 +37,8 @@ You can then run License Management on some target directory:
$ docker run --rm --volume "/path/to/my/project":/code license-management analyze /code
```
### Running the tests
You can run the tests from inside a docker container:
```sh
......@@ -126,7 +128,7 @@ Please check the [Release Process documentation](https://gitlab.com/gitlab-org/s
1. Bump the license management version in [CHANGELOG.md][changelog] and in [version.rb][version_rb]
1. Update the `license_finder` version constraint in the [gemspec][gemspec]
1. Run `bundle update license_finder`
1. Test the changes locally using the `bin/test` script.
1. Test the changes by following the instructions for [running the tests](#running-the-tests)
1. Submit a merge request.
# Contributing
......
bundler ~>1.7
bundler ~>2.0
license_finder ~>6.0.0
license_finder ~>6.6.0
......@@ -35,15 +35,17 @@ apt-get install -y --no-install-recommends \
libffi-dev \
libicu-dev \
libjpeg-dev \
liblttng-ctl0 \
libkrb5-dev \
liblttng-ctl-dev \
liblttng-ctl0 \
liblzma-dev \
libncurses5-dev \
libncurses-dev \
libncurses5-dev \
libncursesw5-dev \
libonig-dev \
libpng-dev \
libpq-dev \
libre2-dev \
libreadline-dev \
libsqlite3-dev \
libssl-dev \
......
......@@ -2,6 +2,6 @@
module License
module Management
VERSION = '3.12.3'
VERSION = '3.13.0'
end
end
......@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']
spec.add_dependency 'license_finder', '~> 6.0.0'
spec.add_dependency 'license_finder', '~> 6.6.0'
spec.add_development_dependency 'byebug', '~> 11.1'
spec.add_development_dependency 'gitlab-styles', '~> 3.1'
spec.add_development_dependency 'json-schema', '~> 2.8'
......
......@@ -27,4 +27,4 @@
}
}
]
}
\ No newline at end of file
}
......@@ -21,4 +21,4 @@
]
}
]
}
\ No newline at end of file
}
......@@ -18,4 +18,4 @@
]
}
]
}
\ No newline at end of file
}
......@@ -6,7 +6,7 @@
},
{
"count": 2,
"name": "unknown"
"name": "New BSD"
},
{
"count": 1,
......@@ -18,7 +18,7 @@
},
{
"count": 1,
"name": "New BSD"
"name": "Simplified BSD"
}
],
"dependencies": [
......@@ -63,7 +63,8 @@
},
{
"license": {
"name": "unknown"
"name": "New BSD",
"url": "http://opensource.org/licenses/BSD-3-Clause"
},
"dependency": {
"name": "github.com/pmezard/go-difflib",
......@@ -127,7 +128,8 @@
},
{
"license": {
"name": "unknown"
"name": "Simplified BSD",
"url": "http://opensource.org/licenses/bsd-license"
},
"dependency": {
"name": "gopkg.in/check.v1",
......@@ -151,4 +153,4 @@
}
}
]
}
\ No newline at end of file
}
......@@ -7,7 +7,7 @@
},
{
"count": 2,
"name": "unknown"
"name": "New BSD"
},
{
"count": 1,
......@@ -19,7 +19,7 @@
},
{
"count": 1,
"name": "New BSD"
"name": "Simplified BSD"
}
],
"dependencies": [
......@@ -83,12 +83,13 @@
{
"licenses": [
{
"name": "unknown",
"url": ""
"name": "New BSD",
"url": "http://opensource.org/licenses/BSD-3-Clause"
}
],
"license": {
"name": "unknown"
"name": "New BSD",
"url": "http://opensource.org/licenses/BSD-3-Clause"
},
"dependency": {
"name": "github.com/pmezard/go-difflib",
......@@ -177,12 +178,13 @@
{
"licenses": [
{
"name": "unknown",
"url": ""
"name": "Simplified BSD",
"url": "http://opensource.org/licenses/bsd-license"
}
],
"license": {
"name": "unknown"
"name": "Simplified BSD",
"url": "http://opensource.org/licenses/bsd-license"
},
"dependency": {
"name": "gopkg.in/check.v1",
......@@ -216,4 +218,4 @@
}
}
]
}
\ No newline at end of file
}
......@@ -8,9 +8,9 @@
"count": 6
},
{
"id": "unknown",
"name": "unknown",
"url": "",
"id": "BSD-3-Clause",
"name": "BSD 3-Clause \"New\" or \"Revised\" License",
"url": "https://opensource.org/licenses/BSD-3-Clause",
"count": 2
},
{
......@@ -20,9 +20,9 @@
"count": 1
},
{
"id": "BSD-3-Clause",
"name": "BSD 3-Clause \"New\" or \"Revised\" License",
"url": "https://opensource.org/licenses/BSD-3-Clause",
"id": "BSD-2-Clause",
"name": "BSD 2-Clause \"Simplified\" License",
"url": "https://opensource.org/licenses/BSD-2-Clause",
"count": 1
},
{
......@@ -74,7 +74,7 @@
"."
],
"licenses": [
"unknown"
"BSD-3-Clause"
]
},
{
......@@ -129,7 +129,7 @@
"."
],
"licenses": [
"unknown"
"BSD-2-Clause"
]
},
{
......@@ -145,4 +145,4 @@
]
}
]
}
\ No newline at end of file
}
......@@ -6,6 +6,11 @@
"name": "Apache License 2.0",
"url": "https://opensource.org/licenses/Apache-2.0"
},
{
"id": "BSD-2-Clause",
"name": "BSD 2-Clause \"Simplified\" License",
"url": "https://opensource.org/licenses/BSD-2-Clause"
},
{
"id": "BSD-3-Clause",
"name": "BSD 3-Clause \"New\" or \"Revised\" License",
......@@ -20,11 +25,6 @@
"id": "MIT",
"name": "MIT License",
"url": "https://opensource.org/licenses/MIT"
},
{
"id": "unknown",
"name": "unknown",
"url": ""
}
],
"dependencies": [
......@@ -61,7 +61,7 @@
"package_manager": "go",
"path": "go.sum",
"licenses": [
"unknown"
"BSD-3-Clause"
]
},
{
......@@ -106,7 +106,7 @@
"package_manager": "go",
"path": "go.sum",
"licenses": [
"unknown"
"BSD-2-Clause"
]
},
{
......@@ -120,4 +120,4 @@
]
}
]
}
\ No newline at end of file
}
......@@ -362,4 +362,4 @@
}
}
]
}
}
\ No newline at end of file
......@@ -523,4 +523,4 @@
}
}
]
}
}
\ No newline at end of file
......@@ -327,4 +327,4 @@
]
}
]
}
}
\ No newline at end of file
{
"licenses": [
{ "count": 15, "name": "Apache 2.0" },
{ "count": 4, "name": "BSD" },
{ "count": 1, "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0" },
{ "count": 1, "name": "unknown" }
{
"count": 15,
"name": "Apache 2.0"
},
{
"count": 4,
"name": "BSD"
},
{
"count": 1,
"name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0"
},
{
"count": 1,
"name": "unknown"
}
],
"dependencies": [
{
"license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
"dependency": { "name": "asm", "description": "", "pathes": [ "." ] }
"license": {
"name": "BSD",
"url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
},
"dependency": {
"name": "asm",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
"dependency": { "name": "asm-commons", "description": "", "pathes": [ "." ] }
"license": {
"name": "BSD",
"url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
},
"dependency": {
"name": "asm-commons",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "BSD", "url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29" },
"dependency": { "name": "asm-tree", "description": "", "pathes": [ "." ] }
"license": {
"name": "BSD",
"url": "http://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29"
},
"dependency": {
"name": "asm-tree",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "commons-fileupload", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "commons-fileupload",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "commons-io", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "commons-io",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "commons-lang3", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "commons-lang3",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "freemarker", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "freemarker",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "jackson-annotations", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "jackson-annotations",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "jackson-core", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "jackson-core",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "jackson-databind", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "jackson-databind",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "jackson-dataformat-xml", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "jackson-dataformat-xml",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "jackson-module-jaxb-annotations", "description": "", "pathes": [ "." ] }
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "jackson-module-jaxb-annotations",
"description": "",
"pathes": [
"."
]
}
},
{
"license": { "name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.txt" },
"dependency": { "name": "javassist", "description": "", "pathes": [ "." ] }
"license": {
"name": "MPL 1.1, GNU Lesser General Public License version 2.1, Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
},
"dependency": {
"name": "javassist",
"description": "",
</