summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-05-25 11:01:03 -0600
committermo khan <mo.khan@gmail.com>2020-05-26 19:33:44 -0600
commit80fa34dd2bd72af88efcb85844302d04450a0e1e (patch)
tree2a5ba8dfc9bdb61c58633373be122ae2f83df1e7 /README.md
parentbff873a938de126d2b79e799df325f3d5c31295b (diff)
Scan Conan projects
* Scan the conan examples project * Split licenses by comma * Add integration test job for c projects * Add package_manager, version and path to v2.1 report * Detect collisions between names from different package managers * Add CHANGELOG entry * Update README to indicate Conan support * Print timestamps in install script
Diffstat (limited to 'README.md')
-rw-r--r--README.md18
1 files changed, 10 insertions, 8 deletions
diff --git a/README.md b/README.md
index 76d957e..908933a 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,7 @@ The following table shows which languages and package managers are supported.
| Language | Package managers |
|------------|-------------------------------------------------------------------|
| .NET | [.NET Core CLI][dotnet_core], [Nuget][nuget] |
+| C/C++ | [Conan][conan] |
| Go | [Go modules][gomod], [Godep][godep], go get |
| Java | [Gradle][gradle], [Maven][maven] |
| JavaScript | [npm][npm], [yarn][yarn], [Bower][bower] |
@@ -135,20 +136,21 @@ 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).
[bower]: https://bower.io/
+[bundler]: https://bundler.io/
[changelog]: https://gitlab.com/gitlab-org/security-products/license-management/-/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
-[license_finder]: https://rubygems.org/gems/license_finder
-[npm]: https://www.npmjs.com/
-[version_rb]: https://gitlab.com/gitlab-org/security-products/license-management/-/blob/master/lib/license/management/version.rb
-[yarn]: https://yarnpkg.com/
-[gomod]: https://github.com/golang/go/wiki/Modules
[godep]: https://github.com/tools/godep
+[gomod]: https://github.com/golang/go/wiki/Modules
[gradle]: https://gradle.org/
+[license_finder]: https://rubygems.org/gems/license_finder
[maven]: https://maven.apache.org/
+[npm]: https://www.npmjs.com/
[nuget]: https://www.nuget.org/
-[dotnet_core]: https://docs.microsoft.com/en-us/dotnet/core/tools/
[pip]: https://pip.pypa.io/en/stable/
[pipenv]: https://github.com/pypa/pipenv
-[bundler]: https://bundler.io/
-[composer]: https://getcomposer.org
+[version_rb]: https://gitlab.com/gitlab-org/security-products/license-management/-/blob/master/lib/license/management/version.rb
+[yarn]: https://yarnpkg.com/