diff options
| author | Tetiana Chupryna <tchupryna@gitlab.com> | 2020-02-17 10:58:47 +0000 |
|---|---|---|
| committer | Tetiana Chupryna <tchupryna@gitlab.com> | 2020-02-17 10:58:47 +0000 |
| commit | a307d82c1f855b1d1b113289216911c168523a2f (patch) | |
| tree | 712c39bf7972f70669d1be33e6b653356adebcae /normalized-licenses.yml | |
| parent | c6f2ad7ea95cae4d4f4f8e192eeab8b466dfd166 (diff) | |
| parent | 94b7c0a650af89f366e5317ff6a28355528ec30b (diff) | |
Merge branch '198043-gradle-scanning' into 'master'v2.4.3
Scan projects with bundled gradle wrapper
See merge request gitlab-org/security-products/license-management!109
Diffstat (limited to 'normalized-licenses.yml')
| -rw-r--r-- | normalized-licenses.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/normalized-licenses.yml b/normalized-licenses.yml index 48e932a..5142e54 100644 --- a/normalized-licenses.yml +++ b/normalized-licenses.yml @@ -11,8 +11,13 @@ ids: BSD-like: BSD-4-Clause CC0 1.0 Universal: CC0-1.0 CC01: CC0-1.0 + CDDL1: CDDL-1.0 Common Public License Version 1.0: CPL-1.0 + Eclipse Distribution License (EDL), Version 1.0: BSD-3-Clause # https://wiki.spdx.org/view/Legal_Team/License_List/Licenses_Under_Consideration + Eclipse Public License (EPL), Version 1.0: EPL-1.0 + Eclipse Public License - Version 1.0: EPL-1.0 EPL1: EPL-1.0 + Gnu General Public License, Version 3: GPL-3.0 GPLv2: GPL-2.0 GPLv3: GPL-3.0 http://www.apache.org/licenses/LICENSE-2.0: Apache-2.0 @@ -36,3 +41,6 @@ ids: ruby: Ruby Simplified BSD: BSD-2-Clause SimplifiedBSD: BSD-2-Clause + The Apache Software License, Version 1.1: Apache-1.1 + The SAX License: SAX-PD + The W3C License: W3C-20150513 |