diff options
| author | mo khan <mo.khan@gmail.com> | 2020-10-05 11:52:41 -0600 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-10-06 20:00:41 -0600 |
| commit | 8e4aaaf041950ae90916397cd08ab0f36f80c622 (patch) | |
| tree | 5b5af5f973e81019f52aa8bb876351014c9955c2 | |
| parent | cb0681e7b20537d8aeb5785ad09934cd9fe103f8 (diff) | |
Relocate project
* chore: do not pass artifacts to downstream jobs
* chore: expire artifacts
* chore: point to new project_id
* chore: remove after_script
* refactor: rename license-management to license-finder
* docs: Add changelog entry and update links to old repo
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/deb.yml | 1 | ||||
| -rw-r--r-- | .gitlab/deploy.yml | 9 | ||||
| -rw-r--r-- | .gitlab/test.yml | 1 | ||||
| -rw-r--r-- | CHANGELOG.md | 260 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | README.md | 24 | ||||
| -rwxr-xr-x | bin/docker-build | 2 | ||||
| -rwxr-xr-x | bin/docker-pull | 2 | ||||
| -rwxr-xr-x | bin/docker-shell | 4 | ||||
| -rwxr-xr-x | bin/omnibus | 2 | ||||
| -rwxr-xr-x | bin/setup | 2 | ||||
| -rwxr-xr-x | bin/test | 4 | ||||
| -rw-r--r-- | config/projects/license_management.rb | 2 | ||||
| -rw-r--r-- | lib/license/management/report/base.rb | 2 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 | ||||
| -rw-r--r-- | license-management.gemspec | 6 | ||||
| -rw-r--r-- | spec/fixtures/schema/v1.0.json | 2 | ||||
| -rw-r--r-- | spec/fixtures/schema/v1.1.json | 2 | ||||
| -rw-r--r-- | spec/fixtures/schema/v2.0.json | 2 | ||||
| -rw-r--r-- | spec/fixtures/schema/v2.1.json | 2 | ||||
| -rw-r--r-- | spec/integration/c/conan_spec.rb | 7 | ||||
| -rw-r--r-- | spec/integration/java/maven_spec.rb | 2 |
23 files changed, 171 insertions, 172 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a65001c..d2bb8c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: DOCKER_DRIVER: overlay2 GIT_DEPTH: "2" GIT_STRATEGY: fetch - MAJOR: 3 TMP_IMAGE: $CI_REGISTRY_IMAGE/license-finder:$CI_COMMIT_SHA include: diff --git a/.gitlab/deb.yml b/.gitlab/deb.yml index e695ebe..190b6af 100644 --- a/.gitlab/deb.yml +++ b/.gitlab/deb.yml @@ -5,6 +5,7 @@ - bin/omnibus setup - bin/omnibus build $OMNIBUS_PROJECT artifacts: + expire_in: 1 day paths: - pkg/ expire_in: 1 day diff --git a/.gitlab/deploy.yml b/.gitlab/deploy.yml index 2c649b3..6fbe6f4 100644 --- a/.gitlab/deploy.yml +++ b/.gitlab/deploy.yml @@ -37,12 +37,5 @@ major: rules: - if: $CI_COMMIT_TAG when: manual - after_script: - # Also push to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder - - docker login -u gitlab-ci-token -p $GITLAB_TOKEN $CI_REGISTRY - - export TARGET_IMAGE=$CI_REGISTRY_IMAGE:${IMAGE_TAG:-$CI_JOB_NAME} - - export DESTINATION_IMAGE=registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:${IMAGE_TAG:-$CI_JOB_NAME} - - docker tag $TARGET_IMAGE $DESTINATION_IMAGE - - docker push $DESTINATION_IMAGE variables: - IMAGE_TAG: $MAJOR + IMAGE_TAG: 3 diff --git a/.gitlab/test.yml b/.gitlab/test.yml index 43f35cc..2a5c7e3 100644 --- a/.gitlab/test.yml +++ b/.gitlab/test.yml @@ -42,6 +42,7 @@ lint: paths: - vendor artifacts: + expire_in: 1 week paths: - coverage/coverage.xml - rspec.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2875e8b..ff5e997 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,119 +1,123 @@ # GitLab License management changelog +## v3.28.0 + +- Move project from https://gitlab.com/gitlab-org/security-products/license-management to https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/ https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/3 + ## v3.27.0 -- Parse SPDX License expressions. !228 +- Parse SPDX License expressions. https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/228 ## v3.26.1 -- Switch to working directory that contains the `go.mod` file. !222 +- Switch to working directory that contains the `go.mod` file. https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/222 ## v3.26.0 -- Add Ruby version 2.7.2 to Docker image. !226 +- Add Ruby version 2.7.2 to Docker image. https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/226 ## v3.25.8 -- Remove bash functions that are not in use !224 +- Remove bash functions that are not in use https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/224 ## v3.25.7 -- Fix path to Java 11 keystore !221 +- Fix path to Java 11 keystore https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/221 ## v3.25.6 -- Install `build-essential` for development !219 -- Export `NODE_EXTRA_CA_CERTS` for self signed certificates !219 +- Install `build-essential` for development https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/219 +- Export `NODE_EXTRA_CA_CERTS` for self signed certificates https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/219 ## v3.25.5 -- Remove packages with known vulnerabilities !218 +- Remove packages with known vulnerabilities https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/218 ## v3.25.4 -- Fix patch number of `GOLANG_VERSION` being ignored, making the scan fail if there's no match for MAJOR.MINOR (!215) +- Fix patch number of `GOLANG_VERSION` being ignored, making the scan fail if there's no match for MAJOR.MINOR (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/215) ## v3.25.3 -- Ensure `apt-get` db is valid for `before_script` blocks. (!215) +- Ensure `apt-get` db is valid for `before_script` blocks. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/215) ## v3.25.2 -- Roll out `golang` version `1.15.1` to more of the project. (!216) +- Roll out `golang` version `1.15.1` to more of the project. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/216) ## v3.25.1 -- Set `golang` version to `1.15.1` in `.tool-versions` file. (!212) +- Set `golang` version to `1.15.1` in `.tool-versions` file. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/212) ## v3.25.0 -- Install tools from Debian package. (!188) +- Install tools from Debian package. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/188) ## v3.24.0 -- Removes `BSD-4-Clause` from a list of normalized licenses. (!196) +- Removes `BSD-4-Clause` from a list of normalized licenses. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/196) ## v3.23.0 -- Upgrade [LicenseFinder](https://github.com/pivotal/LicenseFinder/) to `6.8.1` (!209) -- Update SPDX catalogue to version `3.10` (!209) +- Upgrade [LicenseFinder](https://github.com/pivotal/LicenseFinder/) to `6.8.1` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/209) +- Update SPDX catalogue to version `3.10` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/209) ## v3.22.2 -- Update default PHP to `7.4.8` (!208) +- Update default PHP to `7.4.8` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/208) ## v3.22.1 -- Fix bug with loading `.bashrc`. (!206) -- Detect vendor directory for composer projects (!207) +- Fix bug with loading `.bashrc`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/206) +- Detect vendor directory for composer projects (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/207) ## v3.22.0 -- Unpack mono from custom built deb package (!204) +- Unpack mono from custom built deb package (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/204) ## v3.21.1 -- Unpack Rust Debian package before asdf attempts to compile and install it. (!205) +- Unpack Rust Debian package before asdf attempts to compile and install it. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/205) ## v3.21.0 -- Provide limited network connectivity for [cargo](https://doc.rust-lang.org/cargo/) projects (!201) -- Exclude development dependencies from [cargo](https://doc.rust-lang.org/cargo/) project scans (!201) +- Provide limited network connectivity for [cargo](https://doc.rust-lang.org/cargo/) projects (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/201) +- Exclude development dependencies from [cargo](https://doc.rust-lang.org/cargo/) project scans (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/201) ## v3.20.1 -- Ensure that error messages are converted to strings before writing to the log. (!203) -- Do not reconfigure bundler from the scanners ruby process. (!203) +- Ensure that error messages are converted to strings before writing to the log. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/203) +- Do not reconfigure bundler from the scanners ruby process. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/203) ## v3.20.0 -- Fallback to parsing the `composer.lock` file when it is present (!200) +- Fallback to parsing the `composer.lock` file when it is present (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/200) ## v3.19.5 -- Fix failing dotnet tests. (!199) +- Fix failing dotnet tests. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/199) ## v3.19.4 -- Exclude development dependencies from [composer](https://getcomposer.org) project scans (!198) +- Exclude development dependencies from [composer](https://getcomposer.org) project scans (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/198) ## v3.19.3 -- Set `golang` version to `1.14.6` in `.tool-versions` file. (!197) +- Set `golang` version to `1.14.6` in `.tool-versions` file. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/197) ## v3.19.2 -- Combine default/custom x509 certificates in TLS validation. (!194) +- Combine default/custom x509 certificates in TLS validation. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/194) ## v3.19.1 -- Choose a version of the `org.codehaus.mojo:license-maven-plugin:aggregate-download-licenses` that is compatible with the version of Maven used by the project. (!195) -- Print error messages to the console when a scan fails. (!195) +- Choose a version of the `org.codehaus.mojo:license-maven-plugin:aggregate-download-licenses` that is compatible with the version of Maven used by the project. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/195) +- Print error messages to the console when a scan fails. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/195) ## v3.19.0 -- Include the latest LTS of the .NET SDK in the Docker image. (!191) -- Include the latest LTS of Mono in the Docker image. (!193) +- Include the latest LTS of the .NET SDK in the Docker image. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/191) +- Include the latest LTS of Mono in the Docker image. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/193) ## v3.18.1 @@ -121,249 +125,249 @@ ## v3.18.0 -- Improve license detection for NuGet packages (!189) -- Detect `.vbproj` files (!189) -- Detect `.fsproj` files (!189) -- Detect `.sln` files (!189) -- Parse SPDX license expressions from `.nuspec` files (!189) -- Install custom `ADDITIONAL_CA_CERT_BUNDLE` for `dotnet` CLI projects (!189) +- Improve license detection for NuGet packages (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/189) +- Detect `.vbproj` files (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/189) +- Detect `.fsproj` files (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/189) +- Detect `.sln` files (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/189) +- Parse SPDX license expressions from `.nuspec` files (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/189) +- Install custom `ADDITIONAL_CA_CERT_BUNDLE` for `dotnet` CLI projects (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/189) ## v3.17.2 -- Return empty list of packages if bundler scanner fails. (!181) +- Return empty list of packages if bundler scanner fails. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/181) ## v3.17.1 -- Reset bundler config from within sub directories in project (!188) +- Reset bundler config from within sub directories in project (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/188) ## v3.17.0 -- Isolate the embedded LicenseFinder Ruby from the target project's Ruby (!181) +- Isolate the embedded LicenseFinder Ruby from the target project's Ruby (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/181) ## v3.16.0 -- Install `dotnet` and `mono` at scan time to decrease size of Docker image. (!185) +- Install `dotnet` and `mono` at scan time to decrease size of Docker image. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/185) ## v3.15.0 -- Detect `gems.rb` and `gems.locked` in `Bundler` projects. (!186) +- Detect `gems.rb` and `gems.locked` in `Bundler` projects. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/186) ## v3.14.0 -- Export `BUNDLE_SSL_CA_CERT` when a `ADDITIONAL_CA_CERT_BUNDLE` is provided. (!177) +- Export `BUNDLE_SSL_CA_CERT` when a `ADDITIONAL_CA_CERT_BUNDLE` is provided. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/177) ## 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) +- Upgrade to [`license_finder`](https://github.com/pivotal/LicenseFinder/) [`6.6.0`](https://github.com/pivotal/LicenseFinder/releases/tag/v6.6.0). (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/162) (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/166) ## v3.12.3 -- Update default Java versions to match [new naming convention](https://github.com/halcyon/asdf-java/pull/87 (!176) +- Update default Java versions to match [new naming convention](https://github.com/halcyon/asdf-java/pull/87 (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/176) ## v3.12.2 -- Publish latest major version to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:3 (!175) -- Print version of license in log output. (!175) +- Publish latest major version to registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:3 (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/175) +- Print version of license in log output. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/175) ## v3.12.1 -- Detect variations of the "Eclipse Public License" (!174) +- Detect variations of the "Eclipse Public License" (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/174) ## v3.12.0 -- Update default name of the generated report. (!167) +- Update default name of the generated report. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/167) ## v3.11.2 -- Ensure `LM_*_VERSION` variables take precedence over `ASDF_*_VERSION` variables. (!163) +- Ensure `LM_*_VERSION` variables take precedence over `ASDF_*_VERSION` variables. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/163) ## v3.11.1 -- Fix dependency scanning in golang projects. (!160) -- Parse `go.sum` files to support offline environments (!161) +- Fix dependency scanning in golang projects. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/160) +- Parse `go.sum` files to support offline environments (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/161) ## v3.11.0 -- Add support for providing custom [Conan](https://conan.io/) configuration. (!159) +- Add support for providing custom [Conan](https://conan.io/) configuration. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/159) ## v3.10.0 -- Add initial support for the [Conan](https://conan.io/) package manger. (!156) -- Add preview of report version `2.1`. (!156) +- Add initial support for the [Conan](https://conan.io/) package manger. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/156) +- Add preview of report version `2.1`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/156) ## v3.9.2 -- Pass `bower_ca` to bower install step. (!151) +- Pass `bower_ca` to bower install step. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/151) ## v3.9.1 -- Add `--allow-root` option when install bower packages. (!150) -- Include nested dependencies in scan report for bower projects. (!150) -- Pass `NPM_CONFIG_CAFILE` to bower install step. (!150) +- Add `--allow-root` option when install bower packages. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/150) +- Include nested dependencies in scan report for bower projects. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/150) +- Pass `NPM_CONFIG_CAFILE` to bower install step. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/150) ## v3.9.0 -- Update go list command to be compatible with 1.14 (!143) -- Forward the NPM [cafile](https://docs.npmjs.com/using-npm/config#cafile) option to `yarn`. (!148) +- Update go list command to be compatible with 1.14 (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/143) +- Forward the NPM [cafile](https://docs.npmjs.com/using-npm/config#cafile) option to `yarn`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/148) ## v3.8.1 -- Exclude `devDependencies` from `yarn` scan report. (!147) -- Remove `spandx` dependency and bring back Ruby 2.4+ support. (!147) +- Exclude `devDependencies` from `yarn` scan report. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/147) +- Remove `spandx` dependency and bring back Ruby 2.4+ support. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/147) ## v3.8.0 -- Add support for NPM [cafile](https://docs.npmjs.com/using-npm/config#cafile) option. (!145) -- Specify path to Java keystore file when listing contents. (!45) +- Add support for NPM [cafile](https://docs.npmjs.com/using-npm/config#cafile) option. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/145) +- Specify path to Java keystore file when listing contents. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/45) ## v3.7.6 -- Exclude `devDependencies` from scan report. (!141) -- Include latest NodeJS 12.16.3, 10.20.1 LTS. (!141) -- Update version of PHP to 7.4.5. (!141) -- Update Python to 2.7.18. (!141) -- Update Ruby to 2.6.6. (!141) +- Exclude `devDependencies` from scan report. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/141) +- Include latest NodeJS 12.16.3, 10.20.1 LTS. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/141) +- Update version of PHP to 7.4.5. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/141) +- Update Python to 2.7.18. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/141) +- Update Ruby to 2.6.6. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/141) ## v3.7.5 -- Install multiple x509 certificates from `ADDITIONAL_CA_CERT_BUNDLE` into system trust store. (!144) -- Install multiple x509 certificates from `ADDITIONAL_CA_CERT_BUNDLE` into java trust store. (!144) +- Install multiple x509 certificates from `ADDITIONAL_CA_CERT_BUNDLE` into system trust store. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/144) +- Install multiple x509 certificates from `ADDITIONAL_CA_CERT_BUNDLE` into java trust store. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/144) ## v3.7.4 -- Install Java key store when `ADDITIONAL_CA_CERT_BUNDLE` is provided. (!139) +- Install Java key store when `ADDITIONAL_CA_CERT_BUNDLE` is provided. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/139) ## v3.7.3 -- Add `--local` option to `gem install` step to speed up initial scan time. (!135) +- Add `--local` option to `gem install` step to speed up initial scan time. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/135) ## v3.7.2 -- Forward custom `GRADLE_CLI_OPTS` to `gradle downloadLicenses` and skip additional install step. (!121) +- Forward custom `GRADLE_CLI_OPTS` to `gradle downloadLicenses` and skip additional install step. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/121) ## v3.7.1 -- Export `PIP_CERT` when invoking `pip` when a custom root certificate is specified. (!133) +- Export `PIP_CERT` when invoking `pip` when a custom root certificate is specified. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/133) ## v3.7.0 -- Add `ADDITIONAL_CA_CERT_BUNDLE` to list of trusted root certificates. (!126) +- Add `ADDITIONAL_CA_CERT_BUNDLE` to list of trusted root certificates. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/126) ## v3.6.0 -- Change default log level to `warn`. (!132) -- Allow control of the log level via the `LOG_LEVEL` environment variable. (!132) +- Change default log level to `warn`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/132) +- Allow control of the log level via the `LOG_LEVEL` environment variable. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/132) ## v3.5.0 -- Improve license detection in go modules projects. (!129) -- Update gradle to version `6.3`. (!129) -- Update nodejs to version `10.19.0`. (!129) -- Update php to version `7.4.4`. (!129) -- Update python to version `3.8.2`. (!129) +- Improve license detection in go modules projects. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/129) +- Update gradle to version `6.3`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/129) +- Update nodejs to version `10.19.0`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/129) +- Update php to version `7.4.4`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/129) +- Update python to version `3.8.2`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/129) ## v3.4.0 -- Scan pipenv projects with [pip-licenses](https://pypi.org/project/pip-licenses/). (!130) -- Read pipenv spec data from the sources listed in `Pipfile.lock`. (!130) +- Scan pipenv projects with [pip-licenses](https://pypi.org/project/pip-licenses/). (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/130) +- Read pipenv spec data from the sources listed in `Pipfile.lock`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/130) ## v3.3.1 -- Fix bug with forwarding `LICENSE_FINDER_CLI_OPTS` (!131) +- Fix bug with forwarding `LICENSE_FINDER_CLI_OPTS` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/131) ## v3.3.0 -- Scan Python projects with [pip-licenses](https://pypi.org/project/pip-licenses/). (!128) +- Scan Python projects with [pip-licenses](https://pypi.org/project/pip-licenses/). (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/128) ## v3.2.0 -- Install packages from `PIP_INDEX_URL`. (!125) +- Install packages from `PIP_INDEX_URL`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/125) ## v3.1.4 -- Print `license-maven-plugin` logs to console. (!127) +- Print `license-maven-plugin` logs to console. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/127) ## v3.1.3 -- Install `license-maven-plugin` into local repository. (!124) +- Install `license-maven-plugin` into local repository. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/124) ## v3.1.2 -- Use `license-maven-plugin:aggreate-download-licenses` for multi-module projects. (!123) +- Use `license-maven-plugin:aggreate-download-licenses` for multi-module projects. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/123) ## v3.1.1 -- Fix invocation of `SETUP_CMD`. (!122) +- Fix invocation of `SETUP_CMD`. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/122) ## v3.1.0 -- Forward custom `MAVEN_CLI_OPTS` to `LicenseFinder` so that it can use it in the license scan task. (!120) +- Forward custom `MAVEN_CLI_OPTS` to `LicenseFinder` so that it can use it in the license scan task. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/120) ## v3.0.0 -- Use asdf version manager to install custom tools (!98) +- Use asdf version manager to install custom tools (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/98) ## v2.8.0 -- Install `php-gd` package to support default Drupal configurations. (!114) -- Allow to set JAVA_VERSION when you use SETUP_CMD. (!119) +- Install `php-gd` package to support default Drupal configurations. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/114) +- Allow to set JAVA_VERSION when you use SETUP_CMD. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/119) ## v2.7.0 -- Install project specific versions of gradle at scan time. (!118) +- Install project specific versions of gradle at scan time. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/118) ## v2.6.0 -- Upgrade to license finder 6.0.0 docker image (!115) +- Upgrade to license finder 6.0.0 docker image (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/115) ## v2.5.2 -- Exclude development/test dependencies by default (!117) +- Exclude development/test dependencies by default (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/117) ## v2.5.1 -- Install bundler `1.x` and `2.x` (!116) +- Install bundler `1.x` and `2.x` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/116) ## v2.5.0 -- Upgrade [LicenseFinder](https://github.com/pivotal/LicenseFinder/releases/tag/v6.0.0) to version `6.0.0` (!112) +- Upgrade [LicenseFinder](https://github.com/pivotal/LicenseFinder/releases/tag/v6.0.0) to version `6.0.0` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/112) ## v2.4.3 -- Add support for `gradlew` (!109) -- Install [license-gradle-plugin](https://github.com/hierynomus/license-gradle-plugin) in gradle init script. (!109) +- Add support for `gradlew` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/109) +- Install [license-gradle-plugin](https://github.com/hierynomus/license-gradle-plugin) in gradle init script. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/109) ## v2.4.2 -- Fix word splitting in default gradle options (!110) +- Fix word splitting in default gradle options (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/110) ## v2.4.1 -- Include a default NuGet configuration file (!105) +- Include a default NuGet configuration file (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/105) ## v2.4.0 -- Add support for `Pipfile.lock` (!103) +- Add support for `Pipfile.lock` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/103) ## v2.3.1 -- Run gradle without tests by default. (!102) +- Run gradle without tests by default. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/102) ## v2.3.0 -- Install Python 3.8.1 as the default python (!101) +- Install Python 3.8.1 as the default python (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/101) ## v2.2.3 -- Add a mapping for `BSD-like` software licenses. (!97) +- Add a mapping for `BSD-like` software licenses. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/97) ## v2.2.2 -- Install the latest version of pip for both Python 2 and 3 at build time (!99) +- Install the latest version of pip for both Python 2 and 3 at build time (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/99) ## v2.2.1 -- Use `--prepare-no-fail` option to try to scan as much as possible. (!92) +- Use `--prepare-no-fail` option to try to scan as much as possible. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/92) ## v2.2.0 @@ -388,7 +392,7 @@ ## v2.0.0 -- Update the default report version to v2.0 (!66) +- Update the default report version to v2.0 (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/66) ## v1.8.3 @@ -396,15 +400,15 @@ ## v1.8.2 -- Ignore node version for installing npm dependencies(!79) +- Ignore node version for installing npm dependencies(https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/79) ## v1.8.1 -- Add mapping for `Apache License v2.0` to `Apache-2.0` (!78) +- Add mapping for `Apache License v2.0` to `Apache-2.0` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/78) ## v1.8.0 -- Add ability to configure the `license_finder` execution via `LICENSE_FINDER_CLI_OPTS` (!77) +- Add ability to configure the `license_finder` execution via `LICENSE_FINDER_CLI_OPTS` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/77) ## v1.7.4 @@ -437,11 +441,11 @@ ## v1.6.1 -- Fix `The engine "node" is incompatible with this module.` error (!61) +- Fix `The engine "node" is incompatible with this module.` error (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/61) ## v1.6.0 -- Make Python 3.5 the default. (!56) +- Make Python 3.5 the default. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/56) ## v1.5.0 @@ -454,24 +458,24 @@ ## v1.3.0 -- Add `LM_PYTHON_VERSION` variable, to be set to `3` to switch to Python 3.5, pip 19.1.1. (!36) +- Add `LM_PYTHON_VERSION` variable, to be set to `3` to switch to Python 3.5, pip 19.1.1. (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/36) ## v1.2.6 -- Fix: better support of go projects (!31) +- Fix: better support of go projects (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/31) ## v1.2.5 -- Feature: support Java 11 via an ENV variable (@haynes !26) +- Feature: support Java 11 via an ENV variable (@haynes https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/26) ## v1.2.4 -- Fix: support multiple MAVEN_CLI_OPTS options (@haynes !27) +- Fix: support multiple MAVEN_CLI_OPTS options (@haynes https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/27) ## v1.2.3 -- Add ability to configure the `mvn install` execution for Maven projects via `MAVEN_CLI_OPTS` (!24) -- Skip `"test"` phase by default when running `mvn install` for Maven projects (!24) +- Add ability to configure the `mvn install` execution for Maven projects via `MAVEN_CLI_OPTS` (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/24) +- Skip `"test"` phase by default when running `mvn install` for Maven projects (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/24) ## v1.2.2 @@ -479,7 +483,7 @@ ## v1.2.1 -- Better support for js npm projects (!14) +- Better support for js npm projects (https://gitlab.com/gitlab-org/security-products/license-management/-/merge_requests/14) ## v1.2.0 diff --git a/Gemfile.lock b/Gemfile.lock index 78e794e..f9157a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - license-management (3.27.0) + license-management (3.28.0) license_finder (~> 6.7) spandx (~> 0.13) @@ -1,7 +1,7 @@ # GitLab License Management -[](https://gitlab.com/gitlab-org/security-products/license-management/commits/master) -[](https://gitlab.com/gitlab-org/security-products/license-management/commits/master) +[](https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/commits/master) +[](https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/commits/master) GitLab tool for detecting licenses of the dependencies used by the provided source. It is currently based on [License Finder][license_finder] @@ -16,10 +16,10 @@ only, but this may change in the future. docker run \ --volume "$PWD":/code \ --rm \ - registry.gitlab.com/gitlab-org/security-products/license-management:latest analyze /code + registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:latest analyze /code ``` -1. The results will be stored in the `gl-license-management-report.json` file in the application directory. +1. The results will be stored in the `gl-license-scanning-report.json` file in the application directory. ## Development @@ -34,7 +34,7 @@ $ ./bin/docker-build You can then run License Management on some target directory: ```sh -$ docker run --rm --volume "/path/to/my/project":/code license-management analyze /code +$ docker run --rm --volume "/path/to/my/project":/code --env CI_PROJECT_DIR=/code ``` ### Running the tests @@ -58,7 +58,7 @@ $ enable_dev_mode $ bundle open license_finder ``` -The `docker-shell` script will mount the current project as a volume into `/builds/gitlab-org/security-products/license-management`. +The `docker-shell` script will mount the current project as a volume into `/builds/gitlab-org/security-products/analyzers/license-finder`. This allows you to edit code from your host machine using your preferred editor and see the affect of those changes from within the running docker container. @@ -94,7 +94,7 @@ docker run \ --volume "$PWD":/code \ --env "SETUP_CMD=./my-custom-install-script.sh" \ --rm \ - registry.gitlab.com/gitlab-org/security-products/license-management:latest analyze /code + registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:latest analyze /code ``` ## Settings @@ -135,16 +135,16 @@ Please check the [Release Process documentation](https://gitlab.com/gitlab-org/s If you want to help, read the [contribution guidelines](CONTRIBUTING.md). If an unknown license is detected, please consider updating the mapping defined -in [normalized-licenses.yml](https://gitlab.com/gitlab-org/security-products/license-management/blob/master/normalized-licenses.yml). A mapping can be for a detected name or url and must correspond to an SPDX identifier found in [spdx-licenses.json](https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spdx-licenses.json). +in [normalized-licenses.yml](https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/normalized-licenses.yml). A mapping can be for a detected name or url and must correspond to an SPDX identifier found in [spdx-licenses.json](https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spdx-licenses.json). [bower]: https://bower.io/ [bundler]: https://bundler.io/ -[changelog]: https://gitlab.com/gitlab-org/security-products/license-management/-/blob/master/CHANGELOG.md +[changelog]: https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/blob/master/CHANGELOG.md [composer]: https://getcomposer.org [conan]: https://conan.io/ [dotnet_core]: https://docs.microsoft.com/en-us/dotnet/core/tools/ -[gemfile_lock]: https://gitlab.com/gitlab-org/security-products/license-management/-/blob/master/Gemfile.lock -[gemspec]: https://gitlab.com/gitlab-org/security-products/license-management/-/blob/master/license-management.gemspec +[gemfile_lock]: https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/blob/master/Gemfile.lock +[gemspec]: https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/blob/master/license-management.gemspec [godep]: https://github.com/tools/godep [gomod]: https://github.com/golang/go/wiki/Modules [gradle]: https://gradle.org/ @@ -154,5 +154,5 @@ in [normalized-licenses.yml](https://gitlab.com/gitlab-org/security-products/lic [nuget]: https://www.nuget.org/ [pip]: https://pip.pypa.io/en/stable/ [pipenv]: https://github.com/pypa/pipenv -[version_rb]: https://gitlab.com/gitlab-org/security-products/license-management/-/blob/master/lib/license/management/version.rb +[version_rb]: https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/blob/master/lib/license/management/version.rb [yarn]: https://yarnpkg.com/ diff --git a/bin/docker-build b/bin/docker-build index 263b690..edbab77 100755 --- a/bin/docker-build +++ b/bin/docker-build @@ -4,7 +4,7 @@ set -e cd "$(dirname "$0")/.." -LATEST_IMAGE=${LATEST_IMAGE:='registry.gitlab.com/gitlab-org/security-products/license-management:latest'} +LATEST_IMAGE=${LATEST_IMAGE:='registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:latest'} IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} export DOCKER_BUILDKIT=1 diff --git a/bin/docker-pull b/bin/docker-pull index aced17d..0878036 100755 --- a/bin/docker-pull +++ b/bin/docker-pull @@ -5,7 +5,7 @@ set -e cd "$(dirname "$0")/.." IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} -LATEST_IMAGE=registry.gitlab.com/gitlab-org/security-products/license-management:latest +LATEST_IMAGE=registry.gitlab.com/gitlab-org/security-products/analyzers/license-finder:latest docker pull $LATEST_IMAGE docker tag $LATEST_IMAGE "$IMAGE_NAME" diff --git a/bin/docker-shell b/bin/docker-shell index c6c03a0..d75bd7c 100755 --- a/bin/docker-shell +++ b/bin/docker-shell @@ -9,5 +9,5 @@ IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} docker run --rm -it \ --entrypoint='' \ --network=host \ - --volume "$PWD":/builds/gitlab-org/security-products/license-management \ - "$IMAGE_NAME" sh -c 'cd /builds/gitlab-org/security-products/license-management && exec bash -l' + --volume "$PWD":/builds/gitlab-org/security-products/analyzers/license-finder \ + "$IMAGE_NAME" sh -c 'cd /builds/gitlab-org/security-products/analyzers/license-finder && exec bash -l' diff --git a/bin/omnibus b/bin/omnibus index 94622f4..68d14cb 100755 --- a/bin/omnibus +++ b/bin/omnibus @@ -78,7 +78,7 @@ case $1 in pull) mkdir -p pkg/ - repo_url="https://gitlab.com/gitlab-org/security-products/license-management/-/jobs/artifacts/master/raw/pkg" + repo_url="https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/jobs/artifacts/master/raw/pkg" grep '.*-.*:' < .gitlab/deb.yml | sed 's/://' | while IFS= read -r job do @@ -4,7 +4,7 @@ set -e cd "$(dirname "$0")/.." -export PATH="/builds/gitlab-org/security-products/license-management/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +export PATH="/builds/gitlab-org/security-products/analyzers/license-finder/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" if [ ! -f /usr/sbin/haproxy ] && command -v apt-get; then curl https://haproxy.debian.net/bernat.debian.org.gpg | apt-key add - @@ -4,8 +4,8 @@ set -e cd "$(dirname "$0")/.." -export PATH="/builds/gitlab-org/security-products/license-management/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -export RUBYLIB="/builds/gitlab-org/security-products/license-management/lib" +export PATH="/builds/gitlab-org/security-products/analyzers/license-finder/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +export RUBYLIB="/builds/gitlab-org/security-products/analzyers/license-finder/lib" if ! command -v bundle; then ./bin/setup diff --git a/config/projects/license_management.rb b/config/projects/license_management.rb index 9e23406..88524e8 100644 --- a/config/projects/license_management.rb +++ b/config/projects/license_management.rb @@ -3,7 +3,7 @@ require_relative '../../lib/license/management/version.rb' name "license-management" maintainer "GitLab B.V." -homepage "https://gitlab.com/gitlab-org/security-products/license-management" +homepage "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder" license_file "LICENSE" install_dir "#{default_root}/gitlab" diff --git a/lib/license/management/report/base.rb b/lib/license/management/report/base.rb index 3c1a6f7..c2a38c7 100644 --- a/lib/license/management/report/base.rb +++ b/lib/license/management/report/base.rb @@ -7,7 +7,7 @@ module License include Loggable include Verifiable - CONTRIBUTION_URL = "https://gitlab.com/gitlab-org/security-products/license-management#contributing" + CONTRIBUTION_URL = "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder#contributing" attr_reader :dependencies, :repository diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 3c28192..5f83679 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.27.0' + VERSION = '3.28.0' end end diff --git a/license-management.gemspec b/license-management.gemspec index de62d28..3a92f12 100644 --- a/license-management.gemspec +++ b/license-management.gemspec @@ -12,13 +12,13 @@ Gem::Specification.new do |spec| spec.summary = 'License Management job for GitLab CI.' spec.description = 'License Management job for GitLab CI. https://docs.gitlab.com/ee/user/compliance/license_compliance/index.html' - spec.homepage = 'https://gitlab.com/gitlab-org/security-products/license-management' + spec.homepage = 'https://gitlab.com/gitlab-org/security-products/analyzers/license-finder' spec.license = 'Nonstandard' spec.metadata['allowed_push_host'] = 'https://example.com' spec.metadata['homepage_uri'] = spec.homepage - spec.metadata['source_code_uri'] = 'https://gitlab.com/gitlab-org/security-products/license-management' - spec.metadata['changelog_uri'] = 'https://gitlab.com/gitlab-org/security-products/license-management/blob/master/CHANGELOG.md' + spec.metadata['source_code_uri'] = 'https://gitlab.com/gitlab-org/security-products/analyzers/license-finder' + spec.metadata['changelog_uri'] = 'https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/CHANGELOG.md' spec.files = Dir.chdir(File.expand_path(__dir__)) do Dir.glob('exe/*') + Dir.glob('lib/**/**/*.{rb,yml}') + Dir.glob('*.{md,yml,json}') diff --git a/spec/fixtures/schema/v1.0.json b/spec/fixtures/schema/v1.0.json index 61d6e2e..395f111 100644 --- a/spec/fixtures/schema/v1.0.json +++ b/spec/fixtures/schema/v1.0.json @@ -1,5 +1,5 @@ { - "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v1.0.json", + "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v1.0.json", "type": "object", "required": [ "licenses", diff --git a/spec/fixtures/schema/v1.1.json b/spec/fixtures/schema/v1.1.json index 99314e7..713e0fb 100644 --- a/spec/fixtures/schema/v1.1.json +++ b/spec/fixtures/schema/v1.1.json @@ -1,5 +1,5 @@ { - "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v1.1.json", + "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v1.1.json", "type": "object", "required": [ "version", diff --git a/spec/fixtures/schema/v2.0.json b/spec/fixtures/schema/v2.0.json index d5903ad..efdd070 100644 --- a/spec/fixtures/schema/v2.0.json +++ b/spec/fixtures/schema/v2.0.json @@ -1,5 +1,5 @@ { - "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v2.0.json", + "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v2.0.json", "type": "object", "required": [ "version", diff --git a/spec/fixtures/schema/v2.1.json b/spec/fixtures/schema/v2.1.json index b1eb44f..0226eb8 100644 --- a/spec/fixtures/schema/v2.1.json +++ b/spec/fixtures/schema/v2.1.json @@ -1,5 +1,5 @@ { - "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v2.1.json", + "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v2.1.json", "type": "object", "required": [ "version", diff --git a/spec/integration/c/conan_spec.rb b/spec/integration/c/conan_spec.rb index 4b60dc4..693b83a 100644 --- a/spec/integration/c/conan_spec.rb +++ b/spec/integration/c/conan_spec.rb @@ -72,8 +72,8 @@ RSpec.describe "conan" do context "when pulling packages from a custom conan remote" do let(:package_name) { "#{project_namespace.tr('/', '+')}+#{project_name}/stable" } - let(:project_namespace) { ENV.fetch('CI_PROJECT_NAMESPACE', 'gitlab-org/security-products') } - let(:project_name) { ENV.fetch('CI_PROJECT_NAME', 'license-management') } + let(:project_namespace) { ENV.fetch('CI_PROJECT_NAMESPACE', 'gitlab-org/security-products/analyzers') } + let(:project_name) { ENV.fetch('CI_PROJECT_NAME', 'license-finder') } let(:api_url) { ENV.fetch('CI_API_V4_URL', 'https://gitlab.com/api/v4') } before do @@ -92,7 +92,8 @@ RSpec.describe "conan" do end end - specify do + # https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/3/diffs#note_424952493 + pending do expect(subject).to match_schema expect(subject.dependency_names).to match_array(['example']) expect(subject.licenses_for('example')).to match_array(['MIT']) diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb index ca26d28..95a6cb0 100644 --- a/spec/integration/java/maven_spec.rb +++ b/spec/integration/java/maven_spec.rb @@ -11,7 +11,7 @@ RSpec.describe "maven" do include_examples "each report version", "java", "maven-multimodules" context "when the maven dependencies come from the same projects public maven repository" do - let(:env) { { 'CI_PROJECT_ID' => '6130122' } } + let(:env) { { 'CI_PROJECT_ID' => '18446184' } } before do runner.mount(dir: fixture_file('java/maven/gitlab-repo')) |
