diff options
| author | mo khan <mo.khan@gmail.com> | 2020-06-18 22:48:58 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-06-18 22:48:58 +0000 |
| commit | c6e39b5d3b73da148076db287c51c914f89791f2 (patch) | |
| tree | 9aac5aad8eec0b1a53a05976de903a4c01014aa3 /normalized-licenses.yml | |
| parent | a6ec54af0c51f012d4b270dc1060579b164b0b8a (diff) | |
| parent | 9d34beb90a8d47e28dd1628f3294d0695d5afc86 (diff) | |
Merge branch 'update-normalized-licenses' into 'master'v3.12.1
Detect variations of the Eclipse Public License
See merge request gitlab-org/security-products/license-management!174
Diffstat (limited to 'normalized-licenses.yml')
| -rw-r--r-- | normalized-licenses.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/normalized-licenses.yml b/normalized-licenses.yml index 28bc1c4..6e13d65 100644 --- a/normalized-licenses.yml +++ b/normalized-licenses.yml @@ -5,6 +5,8 @@ ids: Apache 2.0: Apache-2.0 Apache2: Apache-2.0 Apache License v2.0: Apache-2.0 + Apache Software License - Version 2.0: Apache-2.0 + ASF 2.0: Apache-2.0 ASL, version 2: Apache-2.0 BSD 3-Clause: BSD-3-Clause BSD (3 clause): BSD-3-Clause @@ -15,12 +17,23 @@ ids: CC0 1.0 Universal: CC0-1.0 CC01: CC0-1.0 CDDL1: CDDL-1.0 + COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0: CDDL-1.0 + Common Development and Distribution License 1.1: CDDL-1.1 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 + Eclipse Public License - v 1.0: EPL-1.0 + Eclipse Public License 1.0: EPL-1.0 + Eclipse Public License v1.0: EPL-1.0 EPL1: EPL-1.0 Gnu General Public License, Version 3: GPL-3.0 + GNU General Public License v2.0 only, with Classpath exception: GPL-2.0-only + GNU General Public License, version 2: GPL-2.0-only + GNU Lesser General Public License v2.1 or later: LGPL-2.1-or-later + GNU Library General Public License v2.1 or later: LGPL-2.1+ + GPL-2.0: GPL-2.0-only + GPL2 w/ CPE: GPL-2.0-only GPLv2: GPL-2.0 GPLv3: GPL-3.0 http://www.apache.org/licenses/LICENSE-2.0: Apache-2.0 @@ -43,6 +56,8 @@ ids: New BSD: BSD-3-Clause NewBSD: BSD-3-Clause New BSD License: BSD-3-Clause + BSD 3-Clause License: BSD-3-Clause + The BSD 3-Clause License: BSD-3-Clause Python: Python-2.0 Python Software Foundation License: Python-2.0 Ruby: Ruby |