From c048c2582b0a179327030b16666b9a87480eedad Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Wed, 25 Feb 2026 21:45:27 +0000 Subject: [PATCH 1/3] REUSE.toml file helps avoiding many .license files --- .devcontainer/devcontainer-lock.json.license | 13 -------- .devcontainer/devcontainer.json.license | 13 -------- .pre-commit-config.yaml | 15 +++++---- REUSE.toml | 31 +++++++++++++++++++ resources/devcontainer_success.png.license | 13 -------- resources/reopen_in_container.png.license | 13 -------- .../devcontainer-feature.json.license | 13 -------- .../devcontainer-lock.json.license | 13 -------- .../.devcontainer/devcontainer.json.license | 13 -------- .../devcontainer-feature.json.license | 13 -------- src/s-core-devcontainer/manifest.json.license | 13 -------- 11 files changed, 38 insertions(+), 125 deletions(-) delete mode 100644 .devcontainer/devcontainer-lock.json.license delete mode 100644 .devcontainer/devcontainer.json.license create mode 100644 REUSE.toml delete mode 100644 resources/devcontainer_success.png.license delete mode 100644 resources/reopen_in_container.png.license delete mode 100644 src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json.license delete mode 100644 src/s-core-devcontainer/.devcontainer/devcontainer-lock.json.license delete mode 100644 src/s-core-devcontainer/.devcontainer/devcontainer.json.license delete mode 100644 src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json.license delete mode 100644 src/s-core-devcontainer/manifest.json.license diff --git a/.devcontainer/devcontainer-lock.json.license b/.devcontainer/devcontainer-lock.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/.devcontainer/devcontainer-lock.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/.devcontainer/devcontainer.json.license b/.devcontainer/devcontainer.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/.devcontainer/devcontainer.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 89c3eae..bf72518 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* repos: @@ -31,10 +30,10 @@ repos: rev: 38980559e3a605691d6579f96222c30778e5a69e # 3.0.0 hooks: - id: shellcheck - - repo: local - hooks: - - id: reuse annotate - name: Check and fix copyright headers with reuse annotate - entry: ./scripts/run_reuse_annotate.sh - language: system - pass_filenames: false +# - repo: local +# hooks: +# - id: reuse annotate +# name: Check and fix copyright headers with reuse annotate +# entry: ./scripts/run_reuse_annotate.sh +# language: system +# pass_filenames: false diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..fb1753d --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,31 @@ +# ******************************************************************************* +# Copyright (c) 2026 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + +version = 1 + +[[annotations]] +path = [".devcontainer/*.json", + "src/s-core-devcontainer/.devcontainer/*.json", + "src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json", + "src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json", + "src/s-core-devcontainer/manifest.json" + ] +SPDX-FileCopyrightText = "Copyright (c) 2026 Contributors to the Eclipse Foundation" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = ["resources/reopen_in_container.png", + "resources/devcontainer_success.png" + ] +SPDX-FileCopyrightText = "Copyright (c) 2026 Contributors to the Eclipse Foundation" +SPDX-License-Identifier = "Apache-2.0" diff --git a/resources/devcontainer_success.png.license b/resources/devcontainer_success.png.license deleted file mode 100644 index 1db4fe4..0000000 --- a/resources/devcontainer_success.png.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/resources/reopen_in_container.png.license b/resources/reopen_in_container.png.license deleted file mode 100644 index 1db4fe4..0000000 --- a/resources/reopen_in_container.png.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json.license b/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/devcontainer-lock.json.license b/src/s-core-devcontainer/.devcontainer/devcontainer-lock.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/src/s-core-devcontainer/.devcontainer/devcontainer-lock.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/devcontainer.json.license b/src/s-core-devcontainer/.devcontainer/devcontainer.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/src/s-core-devcontainer/.devcontainer/devcontainer.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json.license b/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/src/s-core-devcontainer/manifest.json.license b/src/s-core-devcontainer/manifest.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/src/s-core-devcontainer/manifest.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* From 6a01662ef236dd131ef41cab20863058952cc55b Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Wed, 25 Feb 2026 21:47:41 +0000 Subject: [PATCH 2/3] remove SPDX copyright line not required by reuse if standard copyright line is present --- .devcontainer/post_create_command.sh | 1 - .github/CODEOWNERS | 1 - .github/dependabot.yml | 1 - .github/workflows/ci.yaml | 1 - .github/workflows/release.yaml | 1 - .gitignore | 1 - .reuse/templates/apache-2.0.jinja2 | 4 ---- .shellcheckrc | 1 - NOTICE | 1 - README.md | 1 - docs/README.md | 1 - scripts/build.sh | 1 - scripts/create_builder.sh | 1 - scripts/functions.sh | 1 - scripts/install_dive.sh | 1 - scripts/merge.sh | 1 - scripts/publish.sh | 1 - scripts/run_reuse_annotate.sh | 1 - scripts/test.sh | 1 - src/s-core-devcontainer/.devcontainer/Dockerfile | 1 - .../.devcontainer/bazel-feature/install.sh | 1 - .../bazel-feature/install_matching_bazel_version.sh | 1 - .../.devcontainer/bazel-feature/on_create_command.sh | 1 - .../.devcontainer/bazel-feature/tests/test_default.sh | 1 - .../.devcontainer/bazel-feature/versions.yaml | 1 - .../.devcontainer/s-core-local/enable_pre_commit_hooks.sh | 1 - src/s-core-devcontainer/.devcontainer/s-core-local/install.sh | 1 - .../.devcontainer/s-core-local/on_create_command.sh | 1 - .../.devcontainer/s-core-local/setup_command_history.sh | 1 - .../.devcontainer/s-core-local/tests/test_default.sh | 1 - .../.devcontainer/s-core-local/versions.sh | 1 - .../.devcontainer/s-core-local/versions.yaml | 1 - src/s-core-devcontainer/.devcontainer/unset-proxy.sh | 1 - .../.devcontainer/with-proxy-vars.Dockerfile | 1 - src/s-core-devcontainer/test-project/test-utils.sh | 1 - src/s-core-devcontainer/test-project/test.sh | 1 - 36 files changed, 39 deletions(-) diff --git a/.devcontainer/post_create_command.sh b/.devcontainer/post_create_command.sh index 493879d..3fa2982 100755 --- a/.devcontainer/post_create_command.sh +++ b/.devcontainer/post_create_command.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 17b02b1..37d2f79 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8edb7fa..685b5d3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* version: 2 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7bbb54..0d368e9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* name: Validate DevContainer diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d2b0551..4bf8edd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* name: Validate & Publish DevContainer diff --git a/.gitignore b/.gitignore index 0c08d08..0ffa3bc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.reuse/templates/apache-2.0.jinja2 b/.reuse/templates/apache-2.0.jinja2 index 5d20012..e5602a4 100644 --- a/.reuse/templates/apache-2.0.jinja2 +++ b/.reuse/templates/apache-2.0.jinja2 @@ -9,7 +9,6 @@ This program and the accompanying materials are made available under the terms of the Apache License Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0 -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation SPDX-License-Identifier: Apache-2.0 ******************************************************************************* #} @@ -24,9 +23,6 @@ This program and the accompanying materials are made available under the terms of the Apache License Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0 -{% for copyright_line in copyright_lines %} -{{ copyright_line }} -{% endfor %} {% for expression in spdx_expressions %} SPDX-License-Identifier: {{ expression }} {% endfor %} diff --git a/.shellcheckrc b/.shellcheckrc index 2d48e04..2e4d222 100644 --- a/.shellcheckrc +++ b/.shellcheckrc @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/NOTICE b/NOTICE index f878f72..4871837 100644 --- a/NOTICE +++ b/NOTICE @@ -9,7 +9,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* --> diff --git a/README.md b/README.md index e51c37f..c11a2f7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ This program and the accompanying materials are made available under the terms of the Apache License Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0 -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation SPDX-License-Identifier: Apache-2.0 ******************************************************************************* --> diff --git a/docs/README.md b/docs/README.md index 20f8a09..fcc6216 100644 --- a/docs/README.md +++ b/docs/README.md @@ -9,7 +9,6 @@ This program and the accompanying materials are made available under the terms of the Apache License Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0 -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation SPDX-License-Identifier: Apache-2.0 ******************************************************************************* --> diff --git a/scripts/build.sh b/scripts/build.sh index 310b1a2..304102b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/create_builder.sh b/scripts/create_builder.sh index 7be413f..12724b3 100755 --- a/scripts/create_builder.sh +++ b/scripts/create_builder.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/functions.sh b/scripts/functions.sh index 74a0ffb..af3362b 100755 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/install_dive.sh b/scripts/install_dive.sh index 68c230a..5ebd886 100755 --- a/scripts/install_dive.sh +++ b/scripts/install_dive.sh @@ -12,7 +12,6 @@ set -euo pipefail # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/merge.sh b/scripts/merge.sh index 6f0aff2..73a2ce5 100755 --- a/scripts/merge.sh +++ b/scripts/merge.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/publish.sh b/scripts/publish.sh index 210368a..25c8886 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/run_reuse_annotate.sh b/scripts/run_reuse_annotate.sh index d0a1827..67321e3 100755 --- a/scripts/run_reuse_annotate.sh +++ b/scripts/run_reuse_annotate.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/test.sh b/scripts/test.sh index a9f09c3..969d7f0 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/Dockerfile b/src/s-core-devcontainer/.devcontainer/Dockerfile index 502dbcd..95dc183 100644 --- a/src/s-core-devcontainer/.devcontainer/Dockerfile +++ b/src/s-core-devcontainer/.devcontainer/Dockerfile @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh b/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh index eb6c0f0..3bcdc72 100755 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/install_matching_bazel_version.sh b/src/s-core-devcontainer/.devcontainer/bazel-feature/install_matching_bazel_version.sh index 7896c6c..49f5fb0 100755 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/install_matching_bazel_version.sh +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/install_matching_bazel_version.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/on_create_command.sh b/src/s-core-devcontainer/.devcontainer/bazel-feature/on_create_command.sh index 89309e5..96f14db 100755 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/on_create_command.sh +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/on_create_command.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/tests/test_default.sh b/src/s-core-devcontainer/.devcontainer/bazel-feature/tests/test_default.sh index b1e1bc2..b47c48e 100755 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/tests/test_default.sh +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/tests/test_default.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml b/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml index 19324c9..b207ead 100644 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* bazel: diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/enable_pre_commit_hooks.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/enable_pre_commit_hooks.sh index ee2f6d3..3c1aea7 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/enable_pre_commit_hooks.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/enable_pre_commit_hooks.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh index 9941134..0d1e3c7 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -12,7 +12,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/on_create_command.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/on_create_command.sh index 3e47b36..d8ba1b4 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/on_create_command.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/on_create_command.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/setup_command_history.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/setup_command_history.sh index a201b48..b89d091 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/setup_command_history.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/setup_command_history.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh index 842efd4..b2e6731 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/tests/test_default.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.sh index 44f74b5..f2a845c 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml index f53ff93..fcb8a81 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* actionlint: diff --git a/src/s-core-devcontainer/.devcontainer/unset-proxy.sh b/src/s-core-devcontainer/.devcontainer/unset-proxy.sh index 5168c34..fd7900a 100755 --- a/src/s-core-devcontainer/.devcontainer/unset-proxy.sh +++ b/src/s-core-devcontainer/.devcontainer/unset-proxy.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/with-proxy-vars.Dockerfile b/src/s-core-devcontainer/.devcontainer/with-proxy-vars.Dockerfile index 372c4a2..312cd35 100644 --- a/src/s-core-devcontainer/.devcontainer/with-proxy-vars.Dockerfile +++ b/src/s-core-devcontainer/.devcontainer/with-proxy-vars.Dockerfile @@ -8,7 +8,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/test-project/test-utils.sh b/src/s-core-devcontainer/test-project/test-utils.sh index 8d312b3..428cd82 100755 --- a/src/s-core-devcontainer/test-project/test-utils.sh +++ b/src/s-core-devcontainer/test-project/test-utils.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/test-project/test.sh b/src/s-core-devcontainer/test-project/test.sh index 5b84494..cc13e4b 100755 --- a/src/s-core-devcontainer/test-project/test.sh +++ b/src/s-core-devcontainer/test-project/test.sh @@ -10,7 +10,6 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* From fdf05ccc8be1435a5295cbe13a1f177afa0119f3 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Wed, 25 Feb 2026 22:28:45 +0000 Subject: [PATCH 3/3] use reuse lint instead of annotate annotate was never meant to be run without human intervention and reuse lint thus works more reliable --- .pre-commit-config.yaml | 14 +++++++------- scripts/run_reuse_lint.sh | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) create mode 100755 scripts/run_reuse_lint.sh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bf72518..a857df3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,10 +30,10 @@ repos: rev: 38980559e3a605691d6579f96222c30778e5a69e # 3.0.0 hooks: - id: shellcheck -# - repo: local -# hooks: -# - id: reuse annotate -# name: Check and fix copyright headers with reuse annotate -# entry: ./scripts/run_reuse_annotate.sh -# language: system -# pass_filenames: false + - repo: local + hooks: + - id: reuse lint + name: Check copyright headers with reuse lint + entry: ./scripts/run_reuse_lint.sh + language: unsupported_script + pass_filenames: false diff --git a/scripts/run_reuse_lint.sh b/scripts/run_reuse_lint.sh new file mode 100755 index 0000000..d8463a8 --- /dev/null +++ b/scripts/run_reuse_lint.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# ******************************************************************************* +# Copyright (c) 2026 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + +set -euo pipefail + +pipx run reuse lint + +# Check that all files have Eclipse foundation copyright +# The copyright string is split in this way to avoid this file triggering a +# false positive, with the check below. Otherwise the string with backslashes +# around the C would be detected as violation. +c="Copyright" +holders="Contributors to the Eclipse Foundation" +files_without_eclipse_copyright="$(pipx run reuse lint --json | jq -r --arg c "${c}" --arg holders "${holders}" '.files[] | select(any(.copyrights[]; .value | test($c + " \\(C\\) 2026 " + $holders) | not)) | .path')" + +if [[ -n "${files_without_eclipse_copyright}" ]]; then + echo -e "\nThe following files do not have the correct copyright holder:" + echo "${files_without_eclipse_copyright}" + exit 1 +else + echo "All files have the correct copyright header." +fi