Skip to content

Commit 0aa3a5f

Browse files
committed
license: curate incorrect license
1 parent 93c4082 commit 0aa3a5f

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

.github/workflows/license-scanner.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
- name: License Compliance Check
5656
run: |
5757
pip install scancode-toolkit==32.3.0
58+
scancode-reindex-licenses --additional-directory scripts/licensedetection/
5859
scripts/scan-code.escript --file-or-dir "${{ steps.new-files.outputs.new_files }}" \
5960
--sarif results.sarif
6061
@@ -86,4 +87,4 @@ jobs:
8687
if: ${{ !cancelled() }}
8788
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # ratchet:github/codeql-action/upload-sarif@v3
8889
with:
89-
sarif_file: "SARIF file/results.sarif"
90+
sarif_file: "SARIF file/results.sarif"
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
key: apache-2.0-or-lgpl-2.1-or-later
3+
short_name: Apache 2.0 OR LGPL-2.1-or-later
4+
name: Apache 2.0 OR LGPL 2.1 or later
5+
category: Permissive
6+
owner: Unspecified
7+
spdx_license_key: Apache-2.0 OR LGPL-2.1-or-later
8+
---
9+
10+
%% Licensed under the Apache License, Version 2.0 (the "License"); you may
11+
%% not use this file except in compliance with the License. You may obtain
12+
%% a copy of the License at <http://www.apache.org/licenses/LICENSE-2.0>
13+
%%
14+
%% Unless required by applicable law or agreed to in writing, software
15+
%% distributed under the License is distributed on an "AS IS" BASIS,
16+
%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
%% See the License for the specific language governing permissions and
18+
%% limitations under the License.
19+
%%
20+
%% Alternatively, you may use this file under the terms of the GNU Lesser
21+
%% General Public License (the "LGPL") as published by the Free Software
22+
%% Foundation; either version 2.1, or (at your option) any later version.
23+
%% If you wish to allow use of your version of this file only under the
24+
%% terms of the LGPL, you should delete the provisions above and replace
25+
%% them with the notice and other provisions required by the LGPL; see
26+
%% <http://www.gnu.org/licenses/>. If you do not delete the provisions
27+
%% above, a recipient may use your version of this file under the terms of
28+
%% either the Apache License or the LGPL.

scripts/scan-code.escript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ reviewed() ->
4747
<<"autoconf-simple-exception">>, <<"unicode">>, <<"tcl">>, <<"gpl-2.0 WITH classpath-exception-2.0">>,
4848
<<"zlib">>, <<"lgpl-2.0-plus WITH wxwindows-exception-3.1">>,
4949
<<"openssl-ssleay">>, <<"cc-by-sa-3.0">>, <<"cc-by-4.0">>, <<"dco-1.1">>, <<"fsf-ap">>,
50-
<<"classpath-exception-2.0">>, <<"ietf-trust">> ].
50+
<<"classpath-exception-2.0">>, <<"ietf-trust">>, <<"apache-2.0-or-lgpl-2.1-or-later">> ].
5151

5252
not_approved() ->
5353
[<<"gpl">>, <<"gpl-3.0-plus">>, <<"gpl-2.0">>, <<"gpl-1.0-plus">>, <<"unlicense">>,

0 commit comments

Comments
 (0)