diff options
| author | mo khan <mo.khan@gmail.com> | 2019-10-22 20:24:29 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2019-10-22 20:24:29 +0000 |
| commit | 431f07f8d11b2bc2a8fd09351a4323c9df676822 (patch) | |
| tree | 4f40b60925a4edf8eace71ae8af65bb5d67c7b6b /normalized-licenses.yml | |
| parent | 7f175952a5a047d785b5ea72c15a10642523c62a (diff) | |
| parent | 561556fbd1f59492cfa8fdd790f2ce39c90f3a8d (diff) | |
Merge branch 'remove-tech-debt' into 'master'v1.7.2
Remove feature flags and temporary mappings
See merge request gitlab-org/security-products/license-management!75
Diffstat (limited to 'normalized-licenses.yml')
| -rw-r--r-- | normalized-licenses.yml | 71 |
1 files changed, 8 insertions, 63 deletions
diff --git a/normalized-licenses.yml b/normalized-licenses.yml index cc184d5..3bfed18 100644 --- a/normalized-licenses.yml +++ b/normalized-licenses.yml @@ -1,88 +1,33 @@ --- ids: - ASL, version 2: Apache-2.0 - Apache 2.0: Apache-2.0 Apache1_1: Apache-1.1 + Apache 2.0: Apache-2.0 Apache2: Apache-2.0 + ASL, version 2: Apache-2.0 BSD: BSD-4-Clause CC0 1.0 Universal: CC0-1.0 CC01: CC0-1.0 EPL1: EPL-1.0 GPLv2: GPL-2.0 GPLv3: GPL-3.0 + http://www.apache.org/licenses/LICENSE-2.0: Apache-2.0 ISC: ISC LGPL 2.1: LGPL-2.1 - LGPL, version 2.1: LGPL-2.1 LGPL2_1: LGPL-2.1 LGPL: LGPL-3.0-only + LGPL, version 2.1: LGPL-2.1 MIT: MIT + Mozilla Public License 2.0: MPL-2.0 MPL 1.1: MPL-1.1 MPL1_1: MPL-1.1 MPL2: MPL-2.0 - Mozilla Public License 2.0: MPL-2.0 - New BSD License: BSD-3-Clause New BSD: BSD-3-Clause NewBSD: BSD-3-Clause - Python Software Foundation License: Python-2.0 + New BSD License: BSD-3-Clause Python: Python-2.0 + Python Software Foundation License: Python-2.0 Ruby: Ruby + ruby: Ruby Simplified BSD: BSD-2-Clause SimplifiedBSD: BSD-2-Clause - http://www.apache.org/licenses/LICENSE-2.0: Apache-2.0 - ruby: Ruby unknown: unknown -licenses: - GPL-3.0: - name: GPL 3.0 - url: https://www.gnu.org/licenses/gpl-3.0.txt - BSD-2-Clause: - name: Simplified BSD - url: https://opensource.org/licenses/bsd-license - ISC: - name: ISC - url: https://en.wikipedia.org/wiki/ISC_license - Apache-1.1: - name: Apache 1.1 - url: https://www.apache.org/licenses/LICENSE-1.1.txt - MPL-2.0: - name: Mozilla Public License 2.0 - url: https://www.mozilla.org/media/MPL/2.0/index.815ca599c9df.txt - LGPL-3.0-only: - name: LGPL - url: https://www.gnu.org/licenses/lgpl.txt - CC0-1.0: - name: CC0 1.0 - url: https://creativecommons.org/publicdomain/zero/1.0/ - unknown: - name: unknown - url: '' - GPL-2.0: - name: GPL 2.0 - url: https://www.gnu.org/licenses/gpl-2.0.txt - EPL-1.0: - name: EPL 1.0 - url: https://www.eclipse.org/legal/epl-v10.html - Python-2.0: - name: Python Software Foundation License - url: https://hg.python.org/cpython/raw-file/89ce323357db/LICENSE - BSD-3-Clause: - name: New BSD License - url: https://opensource.org/licenses/BSD-3-Clause - MIT: - name: MIT - url: https://opensource.org/licenses/mit-license - LGPL-2.1: - name: LGPL 2.1 - url: https://opensource.org/licenses/LGPL-2.1 - Ruby: - name: Ruby - url: https://www.ruby-lang.org/en/about/license.txt - Apache-2.0: - name: Apache 2.0 - url: https://www.apache.org/licenses/LICENSE-2.0.txt - MPL-1.1: - name: MPL 1.1 - url: https://www.mozilla.org/en-US/MPL/1.1/ - BSD-4-Clause: - name: BSD - url: https://en.wikipedia.org/wiki/BSD_licenses#4-clause_license_.28original_.22BSD_License.22.29 |