From e7c1a4c58f924589af907c307a6fbaadd18710ec Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Thu, 5 Mar 2026 12:34:29 +0000 Subject: [PATCH 01/11] use copyright checker from tooling --- .pre-commit-config.yaml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 89c3eae..e61e4e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,10 +31,18 @@ repos: rev: 38980559e3a605691d6579f96222c30778e5a69e # 3.0.0 hooks: - id: shellcheck - - repo: local + - repo: https://github.com/elektrobit-contrib/eclipse-score_tooling + rev: 538509967b41588afbbf2b3e6335e821c0183d55 hooks: - - id: reuse annotate - name: Check and fix copyright headers with reuse annotate - entry: ./scripts/run_reuse_annotate.sh - language: system - pass_filenames: false + - id: copyright + - repo: https://codeberg.org/fsfe/reuse-tool + rev: a1bb792acda6fd0724936b4ebbdbc8eceb9c0459 # v6.2.0 + hooks: + - id: reuse-lint-file +# - 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 From 9012ffd0a74d96bf10848f3dc1b2a5a24988182b Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Thu, 5 Mar 2026 13:06:34 +0000 Subject: [PATCH 02/11] fix copyright headers with suggestiions from tooling --- .github/dependabot.yml | 1 - .github/workflows/ci.yaml | 1 - .github/workflows/release.yaml | 1 - .pre-commit-config.yaml | 3 +-- .../.devcontainer/bazel-feature/versions.yaml | 1 - .../.devcontainer/s-core-local/versions.yaml | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) 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/.pre-commit-config.yaml b/.pre-commit-config.yaml index e61e4e5..e26c8ec 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: @@ -32,7 +31,7 @@ repos: hooks: - id: shellcheck - repo: https://github.com/elektrobit-contrib/eclipse-score_tooling - rev: 538509967b41588afbbf2b3e6335e821c0183d55 + rev: 14320679a5534c677d1525ad404e0e1a8226c983 hooks: - id: copyright - repo: https://codeberg.org/fsfe/reuse-tool 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/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: From 3cc8d8907c9c4809972ad675b16f419c654f4afb Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Thu, 5 Mar 2026 13:25:30 +0000 Subject: [PATCH 03/11] also include shellscripts in checks --- .devcontainer/post_create_command.sh | 1 - .pre-commit-config.yaml | 2 +- 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 - .../.devcontainer/bazel-feature/install.sh | 1 - .../bazel-feature/install_matching_bazel_version.sh | 1 - .../bazel-feature/on_create_command.sh | 1 - .../bazel-feature/tests/test_default.sh | 1 - .../s-core-local/enable_pre_commit_hooks.sh | 1 - .../.devcontainer/s-core-local/install.sh | 13 ++++++++++++- .../.devcontainer/s-core-local/on_create_command.sh | 1 - .../s-core-local/setup_command_history.sh | 1 - .../s-core-local/tests/test_default.sh | 1 - .../.devcontainer/s-core-local/versions.sh | 1 - .../.devcontainer/unset-proxy.sh | 1 - src/s-core-devcontainer/test-project/test-utils.sh | 1 - src/s-core-devcontainer/test-project/test.sh | 1 - 23 files changed, 13 insertions(+), 23 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/.pre-commit-config.yaml b/.pre-commit-config.yaml index e26c8ec..6d20a43 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: hooks: - id: shellcheck - repo: https://github.com/elektrobit-contrib/eclipse-score_tooling - rev: 14320679a5534c677d1525ad404e0e1a8226c983 + rev: 018507ee6249388b7d3e00686701ab20211deddd hooks: - id: copyright - repo: https://codeberg.org/fsfe/reuse-tool 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/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/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..3cbc696 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -1,4 +1,16 @@ #!/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 +# ******************************************************************************* # shellcheck disable=SC2016 # Variables in strings with single quotes are expected to be evaluated later by `eval` @@ -12,7 +24,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/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/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 16237f6df91c1fef72d2bd991b736ed2c6a9addc Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Thu, 5 Mar 2026 13:35:50 +0000 Subject: [PATCH 04/11] use squashed commit history --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6d20a43..9cc95af 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: hooks: - id: shellcheck - repo: https://github.com/elektrobit-contrib/eclipse-score_tooling - rev: 018507ee6249388b7d3e00686701ab20211deddd + rev: e38ab68ffd1027cc48265aaf23829adc8fb022af hooks: - id: copyright - repo: https://codeberg.org/fsfe/reuse-tool From 95aa032204f368dda72b0e4467093152a498a42f Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Thu, 5 Mar 2026 13:42:55 +0000 Subject: [PATCH 05/11] remove duplicated copright header --- .../.devcontainer/s-core-local/install.sh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) 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 3cbc696..94b39ac 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -11,22 +11,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* + # shellcheck disable=SC2016 # Variables in strings with single quotes are expected to be evaluated later by `eval` -# ******************************************************************************* -# 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 # Copy feature sources and tests to expected location From 03475148fc06ab70aa0023db67d7e9ab6a908b57 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Fri, 6 Mar 2026 10:33:30 +0000 Subject: [PATCH 06/11] use pre-commit hook version which actually returns non zero exit code on error --- .pre-commit-config.yaml | 2 +- scripts/install_dive.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9cc95af..3c9f4d2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: hooks: - id: shellcheck - repo: https://github.com/elektrobit-contrib/eclipse-score_tooling - rev: e38ab68ffd1027cc48265aaf23829adc8fb022af + rev: b969a24829bd20cfb95a8953eb892e3320e8d0f5 hooks: - id: copyright - repo: https://codeberg.org/fsfe/reuse-tool diff --git a/scripts/install_dive.sh b/scripts/install_dive.sh index 5ebd886..fd4a9ac 100755 --- a/scripts/install_dive.sh +++ b/scripts/install_dive.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -set -euo pipefail - # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -15,6 +13,8 @@ set -euo pipefail # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* +set -euo pipefail + echo "Installing dive..." DIVE_NAME="/tmp/dive.deb" From ec5da8dc796f76a5395e484854a7cd4b73eb45a8 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Sun, 8 Mar 2026 17:56:50 +0000 Subject: [PATCH 07/11] use score repo after PR merge --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3c9f4d2..61f5cef 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,8 +30,8 @@ repos: rev: 38980559e3a605691d6579f96222c30778e5a69e # 3.0.0 hooks: - id: shellcheck - - repo: https://github.com/elektrobit-contrib/eclipse-score_tooling - rev: b969a24829bd20cfb95a8953eb892e3320e8d0f5 + - repo: https://github.com/eclipse-score/tooling + rev: 31ff8eee214e4e97ef8f5cb46e443273515b63ec hooks: - id: copyright - repo: https://codeberg.org/fsfe/reuse-tool From e9cc65abe066b9b35651d7c1e0de582d799c0cd5 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Sun, 8 Mar 2026 18:00:43 +0000 Subject: [PATCH 08/11] align reuse template with S-CORE copyright header --- .reuse/templates/apache-2.0.jinja2 | 3 --- 1 file changed, 3 deletions(-) diff --git a/.reuse/templates/apache-2.0.jinja2 b/.reuse/templates/apache-2.0.jinja2 index 5d20012..a074bef 100644 --- a/.reuse/templates/apache-2.0.jinja2 +++ b/.reuse/templates/apache-2.0.jinja2 @@ -24,9 +24,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 %} From aada9ef9134f6ee98717c74e581f4d8868664198 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Sun, 8 Mar 2026 18:06:47 +0000 Subject: [PATCH 09/11] remove local reuse annotate hook --- .pre-commit-config.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 61f5cef..3fecbb9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,10 +38,3 @@ repos: rev: a1bb792acda6fd0724936b4ebbdbc8eceb9c0459 # v6.2.0 hooks: - id: reuse-lint-file -# - 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 From 565778dd90a7412315e0302a83706371db7065aa Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Sun, 8 Mar 2026 18:09:50 +0000 Subject: [PATCH 10/11] switch to REUSE.toml --- 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 -------- 8 files changed, 31 insertions(+), 91 deletions(-) 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/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 a494f9ce5b0caef447a957fdf78b8f201f741bf4 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Mar 2026 14:28:51 +0000 Subject: [PATCH 11/11] Readd LICENSE file this belongs to standard repo layout and defines the default license --- LICENSE | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f433b1a --- /dev/null +++ b/LICENSE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS