From 5e35b9c46fe4bf12237b652d540c07e94671d6b6 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 10:39:09 +0000 Subject: [PATCH 1/8] Perform SPDX license and copyright checks with reuse reuse is specialized to check for SPDX license and copyright information in source files. It is capable of checking way more file types than we currently check with opengrep and faster. However it only checks for SPDX information and not the full mandatory copyright header. Therefore opengrep will still be used to check that, but SPDX information will be checked with reuse. --- .devcontainer/devcontainer.json | 13 ++++++++++++ .devcontainer/post_create_command.sh | 1 + .github/CODEOWNERS | 14 +++++++++++++ .github/workflows/ci.yaml | 1 + .github/workflows/release.yaml | 1 + .gitignore | 14 +++++++++++++ .pre-commit-config.yaml | 21 +++++++++++++++++++ .shellcheckrc | 14 +++++++++++++ LICENSE => LICENSES/Apache-2.0.txt | 0 NOTICE | 16 ++++++++++++++ README.md | 16 ++++++++++++++ docs/README.md | 16 ++++++++++++++ opengrep/mandatory/copyright.yaml | 5 +++-- opengrep/run_opengrep.sh | 1 + scripts/build.sh | 1 + scripts/create_builder.sh | 1 + scripts/install_opengrep.sh | 1 + scripts/merge.sh | 1 + scripts/publish.sh | 1 + scripts/test.sh | 1 + .../.devcontainer/Dockerfile | 14 +++++++++++++ .../bazel-feature/devcontainer-feature.json | 13 ++++++++++++ .../.devcontainer/bazel-feature/install.sh | 1 + .../install_matching_bazel_version.sh | 1 + .../bazel-feature/on_create_command.sh | 1 + .../bazel-feature/tests/test_default.sh | 1 + .../.devcontainer/bazel-feature/versions.yaml | 1 + .../.devcontainer/devcontainer.json | 13 ++++++++++++ .../s-core-local/devcontainer-feature.json | 13 ++++++++++++ .../s-core-local/enable_pre_commit_hooks.sh | 1 + .../.devcontainer/s-core-local/install.sh | 1 + .../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/s-core-local/versions.yaml | 1 + .../.devcontainer/unset-proxy.sh | 1 + src/s-core-devcontainer/manifest.json | 13 ++++++++++++ .../test-project/test-utils.sh | 1 + src/s-core-devcontainer/test-project/test.sh | 1 + 40 files changed, 218 insertions(+), 2 deletions(-) rename LICENSE => LICENSES/Apache-2.0.txt (100%) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a9e09bd..b5d4da0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,3 +1,16 @@ +// ******************************************************************************* +// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +// SPDX-License-Identifier: Apache-2.0 +// ******************************************************************************* { "image": "mcr.microsoft.com/devcontainers/javascript-node:4-24", "features": { diff --git a/.devcontainer/post_create_command.sh b/.devcontainer/post_create_command.sh index 8aff88e..ab8a194 100755 --- a/.devcontainer/post_create_command.sh +++ b/.devcontainer/post_create_command.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b8126a3..20e692d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,15 @@ +// ******************************************************************************* +// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +// SPDX-License-Identifier: Apache-2.0 +// ******************************************************************************* + * @opajonk @lurtz diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 88d5861..7484d54 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6d99e7c..df4e5d2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.gitignore b/.gitignore index fe3334a..4a7632d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,17 @@ +# ******************************************************************************* +# 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + # Exported image files shall never be committed. /export.img build/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3b03496..95e04cc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,19 @@ --- + +# ******************************************************************************* +# 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # v6.0.0 @@ -21,6 +36,12 @@ repos: hooks: - id: shellcheck + - repo: https://codeberg.org/fsfe/reuse-tool + rev: a1bb792acda6fd0724936b4ebbdbc8eceb9c0459 # v6.2.0 + hooks: + - id: reuse-lint-file + exclude: devcontainer-lock.json|.*\.png + - repo: local hooks: - id: opengrep diff --git a/.shellcheckrc b/.shellcheckrc index a0212bf..1455bb4 100644 --- a/.shellcheckrc +++ b/.shellcheckrc @@ -1,3 +1,17 @@ +# ******************************************************************************* +# 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + external-sources=true # Enable all checks as long as it works diff --git a/LICENSE b/LICENSES/Apache-2.0.txt similarity index 100% rename from LICENSE rename to LICENSES/Apache-2.0.txt diff --git a/NOTICE b/NOTICE index 5d111d4..f9bda21 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,19 @@ + + # Notices for Eclipse Safe Open Vehicle Core This content is produced and maintained by the Eclipse Safe Open Vehicle Core project. diff --git a/README.md b/README.md index ff9bf62..1922aa7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,19 @@ + + # Common DevContainer for Eclipse S-CORE This repository contains the common [development container](https://containers.dev) for [Eclipse S-CORE](https://github.com/eclipse-score). It contains all tools required to develop (modify, build, ...) Eclipse S-CORE. diff --git a/docs/README.md b/docs/README.md index d1c3c33..4e1945f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,3 +1,19 @@ + + # S-CORE DevContainer Architecture This document explains how the S-CORE DevContainer is designed, built and what its requirements are. diff --git a/opengrep/mandatory/copyright.yaml b/opengrep/mandatory/copyright.yaml index 9e984ce..9a0ab8a 100644 --- a/opengrep/mandatory/copyright.yaml +++ b/opengrep/mandatory/copyright.yaml @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* @@ -20,8 +21,7 @@ rules: (?s)(.*) - pattern-not-regex: (?m)^# \*{79}\n# Copyright \(c\) [0-9]{4} Contributors to the Eclipse Foundation\n#\n# See the NOTICE file\(s\) distributed with this work for additional\n# information regarding copyright ownership.\n#\n# This program and the accompanying materials are made available under - the\n# terms of the Apache License Version 2.0 which is available at\n# https://www.apache.org/licenses/LICENSE-2.0\n#\n# SPDX-License-Identifier. - Apache-2.0\n# \*{79}$ + the\n# terms of the Apache License Version 2.0 which is available at\n# https://www.apache.org/licenses/LICENSE-2.0\n#$ message: All files must contain the mandatory copyright header. languages: - generic @@ -30,4 +30,5 @@ rules: include: - '*.sh' - '*.yaml' + - .*.yaml - '*.yml' diff --git a/opengrep/run_opengrep.sh b/opengrep/run_opengrep.sh index 1b3ede4..62c907d 100755 --- a/opengrep/run_opengrep.sh +++ b/opengrep/run_opengrep.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/build.sh b/scripts/build.sh index ae6e6f3..3f43372 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 12724b3..033952e 100755 --- a/scripts/create_builder.sh +++ b/scripts/create_builder.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/install_opengrep.sh b/scripts/install_opengrep.sh index 706fce1..a1be28f 100755 --- a/scripts/install_opengrep.sh +++ b/scripts/install_opengrep.sh @@ -12,6 +12,7 @@ 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: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/merge.sh b/scripts/merge.sh index 73a2ce5..db4be6a 100755 --- a/scripts/merge.sh +++ b/scripts/merge.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/publish.sh b/scripts/publish.sh index 25c8886..2b0fdc3 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/test.sh b/scripts/test.sh index c16563b..9f218b3 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 6589b2f..c23d376 100644 --- a/src/s-core-devcontainer/.devcontainer/Dockerfile +++ b/src/s-core-devcontainer/.devcontainer/Dockerfile @@ -1,3 +1,17 @@ +# ******************************************************************************* +# 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + FROM buildpack-deps:noble-curl # Proxy arguments for build-time network access diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json b/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json index d60e94f..90b8432 100644 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json @@ -1,3 +1,16 @@ +// ******************************************************************************* +// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +// SPDX-License-Identifier: Apache-2.0 +// ******************************************************************************* { "name": "Bazel and tools", "id": "bazel", diff --git a/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh b/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh index 3bcdc72..9589714 100755 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 49f5fb0..be62cd2 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,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 bdea886..b58056c 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,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 b47c48e..ac60a00 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,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 bd746ca..cdc88d7 100644 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/.devcontainer/devcontainer.json b/src/s-core-devcontainer/.devcontainer/devcontainer.json index 183be4d..901d98c 100644 --- a/src/s-core-devcontainer/.devcontainer/devcontainer.json +++ b/src/s-core-devcontainer/.devcontainer/devcontainer.json @@ -1,3 +1,16 @@ +// ******************************************************************************* +// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +// SPDX-License-Identifier: Apache-2.0 +// ******************************************************************************* { "build": { // Installs latest version from the Distribution diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json b/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json index c6e0d0f..c3d3889 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json @@ -1,3 +1,16 @@ +// ******************************************************************************* +// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +// SPDX-License-Identifier: Apache-2.0 +// ******************************************************************************* { "name": "Eclipse S-CORE-specific Local Tools", "id": "s-core-local", 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 bbb280e..6485eaa 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,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 498d827..4010132 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 d8ba1b4..cb66fe0 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,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 b89d091..ae1b0fa 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,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 6d714ae..d0d92e3 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,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 f2a845c..c64b24d 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 c017278..4acd26b 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 2a9a0ea..e3466aa 100755 --- a/src/s-core-devcontainer/.devcontainer/unset-proxy.sh +++ b/src/s-core-devcontainer/.devcontainer/unset-proxy.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/manifest.json b/src/s-core-devcontainer/manifest.json index 59a1e1e..1b93f59 100644 --- a/src/s-core-devcontainer/manifest.json +++ b/src/s-core-devcontainer/manifest.json @@ -1,3 +1,16 @@ +// ******************************************************************************* +// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +// SPDX-License-Identifier: Apache-2.0 +// ******************************************************************************* { "version": "1.0.0", "image_name": "ghcr.io/eclipse-score/devcontainer", diff --git a/src/s-core-devcontainer/test-project/test-utils.sh b/src/s-core-devcontainer/test-project/test-utils.sh index 428cd82..97c4073 100755 --- a/src/s-core-devcontainer/test-project/test-utils.sh +++ b/src/s-core-devcontainer/test-project/test-utils.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 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 dadb958..59a6ddc 100755 --- a/src/s-core-devcontainer/test-project/test.sh +++ b/src/s-core-devcontainer/test-project/test.sh @@ -10,6 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # +# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* From 57a391b21a35aea84a3a6c6eb9d25af7be27b1cb Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 12:44:21 +0000 Subject: [PATCH 2/8] use reuse template to write license / copyright header --- .devcontainer/devcontainer-lock.json.license | 13 ++++++++++ .devcontainer/devcontainer.json | 13 ---------- .devcontainer/devcontainer.json.license | 13 ++++++++++ .devcontainer/post_create_command.sh | 2 +- .pre-commit-config.yaml | 3 +-- .reuse/templates/apache-2.0.jinja2 | 17 ++++++++++++ README.md | 26 +++++++++---------- docs/README.md | 26 +++++++++---------- opengrep/mandatory/copyright.yaml | 3 +-- opengrep/run_opengrep.sh | 2 +- resources/devcontainer_success.png.license | 13 ++++++++++ resources/reopen_in_container.png.license | 13 ++++++++++ scripts/build.sh | 2 +- scripts/create_builder.sh | 2 +- scripts/install_opengrep.sh | 2 +- scripts/merge.sh | 2 +- scripts/publish.sh | 2 +- scripts/test.sh | 2 +- .../.devcontainer/Dockerfile | 2 +- .../bazel-feature/devcontainer-feature.json | 13 ---------- .../devcontainer-feature.json.license | 13 ++++++++++ .../.devcontainer/bazel-feature/install.sh | 2 +- .../install_matching_bazel_version.sh | 2 +- .../bazel-feature/on_create_command.sh | 2 +- .../bazel-feature/tests/test_default.sh | 2 +- .../.devcontainer/bazel-feature/versions.yaml | 3 +-- .../devcontainer-lock.json.license | 13 ++++++++++ .../.devcontainer/devcontainer.json | 13 ---------- .../.devcontainer/devcontainer.json.license | 13 ++++++++++ .../s-core-local/devcontainer-feature.json | 13 ---------- .../devcontainer-feature.json.license | 13 ++++++++++ .../s-core-local/enable_pre_commit_hooks.sh | 2 +- .../.devcontainer/s-core-local/install.sh | 2 +- .../s-core-local/on_create_command.sh | 2 +- .../s-core-local/setup_command_history.sh | 2 +- .../s-core-local/tests/test_default.sh | 2 +- .../.devcontainer/s-core-local/versions.sh | 2 +- .../.devcontainer/s-core-local/versions.yaml | 3 +-- .../.devcontainer/unset-proxy.sh | 2 +- src/s-core-devcontainer/manifest.json | 13 ---------- src/s-core-devcontainer/manifest.json.license | 13 ++++++++++ .../test-project/test-utils.sh | 2 +- src/s-core-devcontainer/test-project/test.sh | 2 +- 43 files changed, 186 insertions(+), 121 deletions(-) create mode 100644 .devcontainer/devcontainer-lock.json.license create mode 100644 .devcontainer/devcontainer.json.license create mode 100644 .reuse/templates/apache-2.0.jinja2 create mode 100644 resources/devcontainer_success.png.license create mode 100644 resources/reopen_in_container.png.license create mode 100644 src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json.license create mode 100644 src/s-core-devcontainer/.devcontainer/devcontainer-lock.json.license create mode 100644 src/s-core-devcontainer/.devcontainer/devcontainer.json.license create mode 100644 src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json.license create mode 100644 src/s-core-devcontainer/manifest.json.license diff --git a/.devcontainer/devcontainer-lock.json.license b/.devcontainer/devcontainer-lock.json.license new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/.devcontainer/devcontainer-lock.json.license @@ -0,0 +1,13 @@ +******************************************************************************* +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 b/.devcontainer/devcontainer.json index b5d4da0..a9e09bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,16 +1,3 @@ -// ******************************************************************************* -// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation -// SPDX-License-Identifier: Apache-2.0 -// ******************************************************************************* { "image": "mcr.microsoft.com/devcontainers/javascript-node:4-24", "features": { diff --git a/.devcontainer/devcontainer.json.license b/.devcontainer/devcontainer.json.license new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/.devcontainer/devcontainer.json.license @@ -0,0 +1,13 @@ +******************************************************************************* +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/post_create_command.sh b/.devcontainer/post_create_command.sh index ab8a194..711bd2e 100755 --- a/.devcontainer/post_create_command.sh +++ b/.devcontainer/post_create_command.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 95e04cc..3d13f69 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,4 @@ --- - # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -10,7 +9,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 new file mode 100644 index 0000000..e4de4d1 --- /dev/null +++ b/.reuse/templates/apache-2.0.jinja2 @@ -0,0 +1,17 @@ +******************************************************************************* +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 + +{% for copyright_line in copyright_lines %} +{{ copyright_line }} +{% endfor %} +{% for expression in spdx_expressions %} +SPDX-License-Identifier: {{ expression }} +{% endfor %} +******************************************************************************* diff --git a/README.md b/README.md index 1922aa7..5fb654a 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ # Common DevContainer for Eclipse S-CORE diff --git a/docs/README.md b/docs/README.md index 4e1945f..20f8a09 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,17 +1,17 @@ # S-CORE DevContainer Architecture diff --git a/opengrep/mandatory/copyright.yaml b/opengrep/mandatory/copyright.yaml index 9a0ab8a..c0fa67d 100644 --- a/opengrep/mandatory/copyright.yaml +++ b/opengrep/mandatory/copyright.yaml @@ -1,5 +1,4 @@ --- - # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -10,7 +9,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/opengrep/run_opengrep.sh b/opengrep/run_opengrep.sh index 62c907d..7042551 100755 --- a/opengrep/run_opengrep.sh +++ b/opengrep/run_opengrep.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 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 new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/resources/devcontainer_success.png.license @@ -0,0 +1,13 @@ +******************************************************************************* +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 new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/resources/reopen_in_container.png.license @@ -0,0 +1,13 @@ +******************************************************************************* +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/scripts/build.sh b/scripts/build.sh index 3f43372..d60bf62 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 033952e..7be413f 100755 --- a/scripts/create_builder.sh +++ b/scripts/create_builder.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/scripts/install_opengrep.sh b/scripts/install_opengrep.sh index a1be28f..2b405e9 100755 --- a/scripts/install_opengrep.sh +++ b/scripts/install_opengrep.sh @@ -12,7 +12,7 @@ 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: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 db4be6a..6f0aff2 100755 --- a/scripts/merge.sh +++ b/scripts/merge.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 2b0fdc3..210368a 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 9f218b3..4ab7f21 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 c23d376..ea99df0 100644 --- a/src/s-core-devcontainer/.devcontainer/Dockerfile +++ b/src/s-core-devcontainer/.devcontainer/Dockerfile @@ -8,7 +8,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 b/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json index 90b8432..d60e94f 100644 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json @@ -1,16 +1,3 @@ -// ******************************************************************************* -// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation -// SPDX-License-Identifier: Apache-2.0 -// ******************************************************************************* { "name": "Bazel and tools", "id": "bazel", 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 new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/devcontainer-feature.json.license @@ -0,0 +1,13 @@ +******************************************************************************* +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/install.sh b/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh index 9589714..eb6c0f0 100755 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/install.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 be62cd2..7896c6c 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 b58056c..08c9844 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 ac60a00..b1e1bc2 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 cdc88d7..515f4a3 100644 --- a/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/bazel-feature/versions.yaml @@ -1,5 +1,4 @@ --- - # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -10,7 +9,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/src/s-core-devcontainer/.devcontainer/devcontainer-lock.json.license @@ -0,0 +1,13 @@ +******************************************************************************* +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 b/src/s-core-devcontainer/.devcontainer/devcontainer.json index 901d98c..183be4d 100644 --- a/src/s-core-devcontainer/.devcontainer/devcontainer.json +++ b/src/s-core-devcontainer/.devcontainer/devcontainer.json @@ -1,16 +1,3 @@ -// ******************************************************************************* -// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation -// SPDX-License-Identifier: Apache-2.0 -// ******************************************************************************* { "build": { // Installs latest version from the Distribution diff --git a/src/s-core-devcontainer/.devcontainer/devcontainer.json.license b/src/s-core-devcontainer/.devcontainer/devcontainer.json.license new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/src/s-core-devcontainer/.devcontainer/devcontainer.json.license @@ -0,0 +1,13 @@ +******************************************************************************* +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 b/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json index c3d3889..c6e0d0f 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json @@ -1,16 +1,3 @@ -// ******************************************************************************* -// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation -// SPDX-License-Identifier: Apache-2.0 -// ******************************************************************************* { "name": "Eclipse S-CORE-specific Local Tools", "id": "s-core-local", 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 new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/devcontainer-feature.json.license @@ -0,0 +1,13 @@ +******************************************************************************* +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/enable_pre_commit_hooks.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/enable_pre_commit_hooks.sh index 6485eaa..33300c5 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 4010132..217bf09 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 cb66fe0..3e47b36 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 ae1b0fa..a201b48 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 d0d92e3..cd6ca28 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 c64b24d..44f74b5 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,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 4acd26b..474d1a1 100644 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/versions.yaml @@ -1,5 +1,4 @@ --- - # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -10,7 +9,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 e3466aa..3ce7d49 100755 --- a/src/s-core-devcontainer/.devcontainer/unset-proxy.sh +++ b/src/s-core-devcontainer/.devcontainer/unset-proxy.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/src/s-core-devcontainer/manifest.json b/src/s-core-devcontainer/manifest.json index 1b93f59..59a1e1e 100644 --- a/src/s-core-devcontainer/manifest.json +++ b/src/s-core-devcontainer/manifest.json @@ -1,16 +1,3 @@ -// ******************************************************************************* -// 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: Copyright (c) 2026 Contributors to the Eclipse Foundation -// SPDX-License-Identifier: Apache-2.0 -// ******************************************************************************* { "version": "1.0.0", "image_name": "ghcr.io/eclipse-score/devcontainer", diff --git a/src/s-core-devcontainer/manifest.json.license b/src/s-core-devcontainer/manifest.json.license new file mode 100644 index 0000000..1db4fe4 --- /dev/null +++ b/src/s-core-devcontainer/manifest.json.license @@ -0,0 +1,13 @@ +******************************************************************************* +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/test-project/test-utils.sh b/src/s-core-devcontainer/test-project/test-utils.sh index 97c4073..8d312b3 100755 --- a/src/s-core-devcontainer/test-project/test-utils.sh +++ b/src/s-core-devcontainer/test-project/test-utils.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 59a6ddc..c590310 100755 --- a/src/s-core-devcontainer/test-project/test.sh +++ b/src/s-core-devcontainer/test-project/test.sh @@ -10,7 +10,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* From 097dc9a7252cc0dfa57ded46e7dd1e322e10b8b3 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 12:46:37 +0000 Subject: [PATCH 3/8] remove opengrep --- .devcontainer/post_create_command.sh | 2 -- .pre-commit-config.yaml | 9 ------ opengrep/mandatory/copyright.yaml | 33 ---------------------- opengrep/run_opengrep.sh | 42 ---------------------------- scripts/install_opengrep.sh | 40 -------------------------- 5 files changed, 126 deletions(-) delete mode 100644 opengrep/mandatory/copyright.yaml delete mode 100755 opengrep/run_opengrep.sh delete mode 100755 scripts/install_opengrep.sh diff --git a/.devcontainer/post_create_command.sh b/.devcontainer/post_create_command.sh index 711bd2e..493879d 100755 --- a/.devcontainer/post_create_command.sh +++ b/.devcontainer/post_create_command.sh @@ -20,5 +20,3 @@ pre-commit install scripts/create_builder.sh sudo apt-get update && sudo apt-get install -y shellcheck - -scripts/install_opengrep.sh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3d13f69..faefb62 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,12 +39,3 @@ repos: rev: a1bb792acda6fd0724936b4ebbdbc8eceb9c0459 # v6.2.0 hooks: - id: reuse-lint-file - exclude: devcontainer-lock.json|.*\.png - - - repo: local - hooks: - - id: opengrep - name: Check Mandatory OpenGrep Rules - entry: ./opengrep/run_opengrep.sh - language: system - pass_filenames: false diff --git a/opengrep/mandatory/copyright.yaml b/opengrep/mandatory/copyright.yaml deleted file mode 100644 index c0fa67d..0000000 --- a/opengrep/mandatory/copyright.yaml +++ /dev/null @@ -1,33 +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 -# ******************************************************************************* - -rules: - - id: copyright_shell_yaml - patterns: - - pattern-regex: | - (?s)(.*) - - pattern-not-regex: (?m)^# \*{79}\n# Copyright \(c\) [0-9]{4} Contributors to the Eclipse Foundation\n#\n# See the NOTICE file\(s\) distributed with - this work for additional\n# information regarding copyright ownership.\n#\n# This program and the accompanying materials are made available under - the\n# terms of the Apache License Version 2.0 which is available at\n# https://www.apache.org/licenses/LICENSE-2.0\n#$ - message: All files must contain the mandatory copyright header. - languages: - - generic - severity: ERROR - paths: - include: - - '*.sh' - - '*.yaml' - - .*.yaml - - '*.yml' diff --git a/opengrep/run_opengrep.sh b/opengrep/run_opengrep.sh deleted file mode 100755 index 7042551..0000000 --- a/opengrep/run_opengrep.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/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-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -# SPDX-License-Identifier: Apache-2.0 -# ******************************************************************************* - -set -exuo pipefail - -# This script runs opengrep in such a way that it only works on the changeset that is to be checked -# when running opengrep in the scope of a precommit hook. -# The CI system runs the same script, but in that context no changeset exists, so all files are to -# be checked. This also solves the problem that it is technically possible to work around the -# precommit checks. - -changeset="$(git diff --staged --diff-filter=ACM --name-only)" -length="${#changeset}" -if [[ ${length} -gt 2048 ]]; then - # The changeset is too long, it would result in errors from opengrep/underlying OS about filenames - # being too long. Workaround: ignore the changeset and run opengrep on all files. - changeset="" -fi -if [[ -z "${changeset}" ]]; then - # Limit concurrency to 2 threads to reduce memory consumption - OPENGREP_MAX_CONCURRENCY="--jobs=1" - # No changeset, run opengrep on all files - changeset="." - opengrep scan "${OPENGREP_MAX_CONCURRENCY}" --error --disable-version-check --skip-unknown-extensions --emacs --sarif-output=build/opengrep.sarif -f ./opengrep/mandatory/ "${changeset}" -else - # When changing ${changeset} to "${changeset}" it will break the script, ${changeset} actually contains *multiple* filenames - # shellcheck disable=SC2086 - opengrep scan --error --disable-version-check --skip-unknown-extensions --emacs -f ./opengrep/mandatory/ ${changeset} -fi diff --git a/scripts/install_opengrep.sh b/scripts/install_opengrep.sh deleted file mode 100755 index 2b405e9..0000000 --- a/scripts/install_opengrep.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# ******************************************************************************* -# 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 -# ******************************************************************************* - -echo "installing opengrep..." - -OPENGREP_NAME="/tmp/opengrep" - -VERSION="1.15.1" - -ARCHITECTURE="$(uname -m)" -if [ "${ARCHITECTURE}" = "x86_64" ]; then - ARCH="x86" - SHA256SUM="c4f6aab1edc8130c7a46e8f5e5215763420740fb94198fc9301215135a372900" -else - ARCH="aarch64" - SHA256SUM="08932db32f4cbfd6e3af6bda82adac41754275d18a91c0fe065181e6a5291be7" -fi - -curl -L "https://github.com/opengrep/opengrep/releases/download/v${VERSION}/opengrep_manylinux_${ARCH}" -o /tmp/opengrep -echo "${SHA256SUM} /tmp/opengrep" | sha256sum -c - || exit 1 -chmod +x "${OPENGREP_NAME}" -sudo mv /tmp/opengrep /usr/local/bin/opengrep - -# Verify installation -opengrep --version From 4f32d08861616f490160e7f63d10fce7af94fc17 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 12:47:29 +0000 Subject: [PATCH 4/8] fix header of NOTICE file --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index f9bda21..f878f72 100644 --- a/NOTICE +++ b/NOTICE @@ -9,7 +9,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* --> From 2c61ead626db55d52ad7dcbdad8f3cb2fdb2af27 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 13:00:22 +0000 Subject: [PATCH 5/8] fix more forgotten files --- .github/CODEOWNERS | 14 ++++++++++++++ .github/workflows/ci.yaml | 3 +-- .github/workflows/release.yaml | 3 +-- .gitignore | 2 +- .pre-commit-config.yaml | 1 + .shellcheckrc | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 20e692d..9539b1c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,17 @@ +# ******************************************************************************* +# 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 +# ******************************************************************************* + // ******************************************************************************* // Copyright (c) 2026 Contributors to the Eclipse Foundation // diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7484d54..0a17ef4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,4 @@ --- - # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -10,7 +9,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index df4e5d2..e088882 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,5 +1,4 @@ --- - # ******************************************************************************* # Copyright (c) 2026 Contributors to the Eclipse Foundation # @@ -10,7 +9,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* diff --git a/.gitignore b/.gitignore index 4a7632d..0c08d08 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# 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 faefb62..8481591 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,3 +39,4 @@ repos: rev: a1bb792acda6fd0724936b4ebbdbc8eceb9c0459 # v6.2.0 hooks: - id: reuse-lint-file + name: reuse-lint-file (fix with `./scripts/run_reuse_annotate.sh`) diff --git a/.shellcheckrc b/.shellcheckrc index 1455bb4..2d48e04 100644 --- a/.shellcheckrc +++ b/.shellcheckrc @@ -8,7 +8,7 @@ # terms of the Apache License Version 2.0 which is available at # https://www.apache.org/licenses/LICENSE-2.0 # -# SPDX-FileCopyrightText: Copyright (c) 2026 Contributors to the Eclipse Foundation +# SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* From 3a7c0bc13ff66f135662ba419129d2c73e39813c Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 13:00:38 +0000 Subject: [PATCH 6/8] add script for running reuse --- scripts/run_reuse_annotate.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 scripts/run_reuse_annotate.sh diff --git a/scripts/run_reuse_annotate.sh b/scripts/run_reuse_annotate.sh new file mode 100755 index 0000000..c3f1463 --- /dev/null +++ b/scripts/run_reuse_annotate.sh @@ -0,0 +1,27 @@ +#!/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-FileCopyrightText: 2026 Contributors to the Eclipse Foundation +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + +set -euxo pipefail + +SCRIPT_PATH=$(readlink -f "$0") +SCRIPT_DIR=$(dirname -- "${SCRIPT_PATH}") + +pushd "${SCRIPT_DIR}/.." > /dev/null + +pipx run reuse annotate --template apache-2.0 --merge-copyrights --recursive --skip-unrecognised \ + --copyright="Contributors to the Eclipse Foundation" --license=Apache-2.0 ./* ./.* + +popd > /dev/null From ebfc31d191c3e1d57b51f117907203247834b3be Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 13:15:23 +0000 Subject: [PATCH 7/8] add instructions how to use reuse --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 5fb654a..30c1538 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,14 @@ There should rarely be a need to modify this. * `.github/` contains the regular GitHub setup, with code owners and CI. * `resources/` contains a few screenshots. +### License and copyright checks + +This repo uses [`reuse`](https://codeberg.org/fsfe/reuse-tool) to check for and validate licenses and copyrights. +Checks are performend via pre-commit hooks. + +If you want to run it standalone run `pipx run reuse lint` in a terminal. +To fix found issues run `scripts/run_reuse_annotate.sh`. + ### Modify, Build, Test, Use It is very simple to develop the development container. From 90d00f48718d96ef8a515c33d1b9a0e03b50e3af Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Mon, 9 Feb 2026 13:59:43 +0000 Subject: [PATCH 8/8] fix codeowners --- .github/CODEOWNERS | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9539b1c..17b02b1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,18 +12,4 @@ # SPDX-License-Identifier: Apache-2.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: Copyright (c) 2026 Contributors to the Eclipse Foundation -// SPDX-License-Identifier: Apache-2.0 -// ******************************************************************************* - * @opajonk @lurtz