diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c84bcbd3644b..9c9cf3373650 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -21,3 +21,9 @@ The OTP versions that are affected by this bug. **Additional context** Add any other context about the problem here. If you wish to attach Erlang code you can either write it directly in the post using [code tags](https://guides.github.com/features/mastering-markdown/), create a [gist](https://gist.github.com), or attach it as a zip file to this post. + + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 2ea8fdec440e..1b0c2d6dea81 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -17,3 +17,9 @@ A clear and concise description of any alternative solutions or features you've **Additional context** Add any other context or screenshots about the feature request here. + + diff --git a/.github/actions/build-base-image/action.yaml b/.github/actions/build-base-image/action.yaml index d5e78f72f2a0..d68c2f1eb22b 100644 --- a/.github/actions/build-base-image/action.yaml +++ b/.github/actions/build-base-image/action.yaml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2025 Ericsson AB +# +# SPDX-License-Identifier: Apache-2.0 + name: Build Base Image description: 'Builds the base testing image (using cache if possible)' diff --git a/.github/dockerfiles/odbcinst.ini b/.github/dockerfiles/odbcinst.ini index 37beed56693c..232ddfc6ad95 100644 --- a/.github/dockerfiles/odbcinst.ini +++ b/.github/dockerfiles/odbcinst.ini @@ -30,4 +30,4 @@ Driver = /usr/lib/i386-linux-gnu/odbc/psqlodbca.so Setup = /usr/lib/i386-linux-gnu/odbc/libodbcpsqlS.so Debug = 0 CommLog = 1 -UsageCount = 2 \ No newline at end of file +UsageCount = 2 diff --git a/.github/workflows/license-scanner.yaml b/.github/workflows/license-scanner.yaml index d752bf216c50..b1c82dee2a28 100644 --- a/.github/workflows/license-scanner.yaml +++ b/.github/workflows/license-scanner.yaml @@ -43,6 +43,7 @@ jobs: new: - added: '**' - '!**/*.beam' + - '!LICENSES/**/*.txt' - '!**/*.exe' - '!**/*.config.cache.static' ## OTP-27.0 tag as base diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 620c6075c409..7b5df385d534 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,9 @@ + + # Contributing to Erlang/OTP 1. [License](#license) @@ -101,7 +107,7 @@ a discussion on the mailing list. Contributions to Erlang/OTP must be under the Apache 2.0 license, and should have a SPDX license and copyright identifier. Only in specific cases were no other alternative exists, Erlang/OTP will consider accepting Pull Requests with -Apache-2.0 compatible licenses. +`Apache-2.0` compatible licenses. Under no circumstances the Erlang/OTP project will accept non-compatible Apache 2.0 contributions. @@ -110,6 +116,7 @@ Erlang/OTP has automatic checks to enforce this policy: contribution will be manually checked, and will trigger a non-passing test in Github. + - The [REUSE tool](https://reuse.software/) checks that all files have `SPDX-License-Identifier:` and `SPDX-FileCopyrightText:`. The License identifier should be `Apache-2.0` in all cases, and the copyright should be in the format diff --git a/erts/preloaded/src/erl_tracer.erl b/erts/preloaded/src/erl_tracer.erl index 2796b3016416..8e1aaf7ccee8 100644 --- a/erts/preloaded/src/erl_tracer.erl +++ b/erts/preloaded/src/erl_tracer.erl @@ -1,3 +1,7 @@ +% SPDX-FileCopyrightText: 2016 Ericsson AB +% +% SPDX-License-Identifier: Apache-2.0 + -module(erl_tracer). -moduledoc """ Erlang tracer behavior. diff --git a/lib/stdlib/src/erl_abstract_code.erl b/lib/stdlib/src/erl_abstract_code.erl index 0882d65ea332..73f7e6405479 100644 --- a/lib/stdlib/src/erl_abstract_code.erl +++ b/lib/stdlib/src/erl_abstract_code.erl @@ -1,3 +1,5 @@ +% SPDX-License-Identifier: Apache-2.0 + -module(erl_abstract_code). -moduledoc false. -export([debug_info/4]). diff --git a/lib/stdlib/src/shell_docs_test.erl b/lib/stdlib/src/shell_docs_test.erl index 9bbbcca764e9..a5f30a821b42 100644 --- a/lib/stdlib/src/shell_docs_test.erl +++ b/lib/stdlib/src/shell_docs_test.erl @@ -1,4 +1,8 @@ %% +%% +%% SPDX-License-Identifier: Apache-2.0 +%% SPDX-FileCopyrightText: 2025 Ericsson AB 1996-2024 +%% %% %CopyrightBegin% %% %% Copyright Ericsson AB 1996-2024. All Rights Reserved.