From b72e7161da836ac1934b882c6e60b557f3073524 Mon Sep 17 00:00:00 2001 From: dennismeister93 Date: Thu, 11 Jan 2024 09:34:54 +0100 Subject: [PATCH] Update license header to 2024 (#219) * Update license header to 2024 Signed-off-by: Dennis Meister * Update devcontainer setup according to license changes Signed-off-by: Dennis Meister * PR review findings Signed-off-by: Dennis Meister --------- Signed-off-by: Dennis Meister --- .devcontainer/Dockerfile | 2 +- .devcontainer/scripts/configure-proxies.sh | 2 +- .devcontainer/scripts/container-set.sh | 2 +- .devcontainer/scripts/onCreateCommand.sh | 2 +- .devcontainer/scripts/postStartCommand.sh | 2 +- .../automated_tests/requirements_test.py | 8 +-- .../tests/automated_tests/runtime_test.py | 8 +-- .gitignore | 14 ----- .licensechecker.yml | 2 +- .ort.yml | 2 +- .pre-commit-config.yaml | 53 +++++++++---------- .velocitas.json | 2 +- .vscode/scripts/import-example-app.sh | 2 +- CONTRIBUTING.md | 2 +- NOTICE-3RD-PARTY-CONTENT.md | 2 +- app/Dockerfile | 2 +- app/requirements.in | 14 +++++ app/src/main.py | 2 +- app/tests/integration/integration_test.py | 2 +- app/tests/requirements.in | 14 +++++ app/tests/unit/test_run.py | 2 +- license_header.txt | 2 +- requirements.in | 2 +- 23 files changed, 78 insertions(+), 67 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2fe16767..3d695e7f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/.devcontainer/scripts/configure-proxies.sh b/.devcontainer/scripts/configure-proxies.sh index 6f685848..a74bb7a6 100755 --- a/.devcontainer/scripts/configure-proxies.sh +++ b/.devcontainer/scripts/configure-proxies.sh @@ -1,6 +1,6 @@ #!/bin/bash # This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/.devcontainer/scripts/container-set.sh b/.devcontainer/scripts/container-set.sh index 4265d1f1..2bdbf633 100755 --- a/.devcontainer/scripts/container-set.sh +++ b/.devcontainer/scripts/container-set.sh @@ -1,6 +1,6 @@ #!/bin/bash # This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/.devcontainer/scripts/onCreateCommand.sh b/.devcontainer/scripts/onCreateCommand.sh index 18d9cbbc..0746754d 100755 --- a/.devcontainer/scripts/onCreateCommand.sh +++ b/.devcontainer/scripts/onCreateCommand.sh @@ -1,6 +1,6 @@ #!/bin/bash # This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/.devcontainer/scripts/postStartCommand.sh b/.devcontainer/scripts/postStartCommand.sh index 9bdc50ae..c090c911 100755 --- a/.devcontainer/scripts/postStartCommand.sh +++ b/.devcontainer/scripts/postStartCommand.sh @@ -1,6 +1,6 @@ #!/bin/bash # This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json -# Copyright (c) 2023 Robert Bosch GmbH +# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/.devcontainer/tests/automated_tests/requirements_test.py b/.devcontainer/tests/automated_tests/requirements_test.py index 4fea847e..ff5b3558 100644 --- a/.devcontainer/tests/automated_tests/requirements_test.py +++ b/.devcontainer/tests/automated_tests/requirements_test.py @@ -1,15 +1,15 @@ -# Copyright (c) 2023 Robert Bosch GmbH - +# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation +# # 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. - +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +# # SPDX-License-Identifier: Apache-2.0 import unittest diff --git a/.devcontainer/tests/automated_tests/runtime_test.py b/.devcontainer/tests/automated_tests/runtime_test.py index e688f8ea..aa7e065b 100644 --- a/.devcontainer/tests/automated_tests/runtime_test.py +++ b/.devcontainer/tests/automated_tests/runtime_test.py @@ -1,15 +1,15 @@ -# Copyright (c) 2023 Robert Bosch GmbH - +# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation +# # 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. - +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +# # SPDX-License-Identifier: Apache-2.0 import os diff --git a/.gitignore b/.gitignore index d61945c5..14df7d2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,3 @@ -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation -# -# 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. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 - ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## diff --git a/.licensechecker.yml b/.licensechecker.yml index 01a7a5d4..a654e285 100644 --- a/.licensechecker.yml +++ b/.licensechecker.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/.ort.yml b/.ort.yml index d144004d..1cd69455 100644 --- a/.ort.yml +++ b/.ort.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2a527af1..c26e01c3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at @@ -80,30 +80,27 @@ repos: hooks: - id: helmlint -# Commented out due to insufficient handling of year range in coyright statements -# - repo: https://github.com/Lucas-C/pre-commit-hooks -# rev: v1.5.4 -# hooks: -# - id: insert-license -# files: '.*\.(py|pyi|yaml|yml|sh|helmignore|dockerignore|gitignore)$' -# exclude: .devcontainer/tests -# args: -# - --license-filepath -# - license_header.txt -# - --comment-style -# - "#" -# - --skip-license-insertion-comment=This file is maintained by velocitas CLI, do not modify manually. -# - id: insert-license -# files: '.*\.(proto)$' -# args: -# - --license-filepath -# - license_header.txt -# - --comment-style -# - // -# - id: insert-license -# files: "Dockerfile.*" -# args: -# - --license-filepath -# - license_header.txt -# - --comment-style -# - "#" + - repo: https://github.com/Lucas-C/pre-commit-hooks + rev: v1.5.4 + hooks: + - id: insert-license + files: '.*\.(py|pyi|yaml|yml|sh|in)$' + exclude: .devcontainer/tests + args: + - --license-filepath + - license_header.txt + - --comment-style + - "#" + - --use-current-year + - --allow-past-years + - --skip-license-insertion-comment=This file is maintained by velocitas CLI, do not modify manually. + - id: insert-license + files: "Dockerfile.*" + args: + - --license-filepath + - license_header.txt + - --comment-style + - "#" + - --use-current-year + - --allow-past-years + - --skip-license-insertion-comment=This file is maintained by velocitas CLI, do not modify manually. diff --git a/.velocitas.json b/.velocitas.json index 706f9c26..7860e4c9 100644 --- a/.velocitas.json +++ b/.velocitas.json @@ -14,7 +14,7 @@ }, { "name": "devenv-devcontainer-setup", - "version": "v1.4.4" + "version": "v1.4.5" } ], "variables": { diff --git a/.vscode/scripts/import-example-app.sh b/.vscode/scripts/import-example-app.sh index cc4ce66b..0eaf9e36 100755 --- a/.vscode/scripts/import-example-app.sh +++ b/.vscode/scripts/import-example-app.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e887c10..07246964 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,7 +92,7 @@ If there are any other `non public python dependencies` (E.g. GitHub links), the Please make sure any file you newly create contains a proper license header like this: ```python -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md index 52a828d4..de2a204a 100644 --- a/NOTICE-3RD-PARTY-CONTENT.md +++ b/NOTICE-3RD-PARTY-CONTENT.md @@ -40,7 +40,7 @@ |parameterized|0.9.0|Simplified BSD| |pathspec|0.11.2|Mozilla Public License 2.0 (MPL 2.0)| |pbr|5.11.1|Apache 2.0| -|pip|23.3.1|MIT| +|pip|23.3.2|MIT| |pip-tools|7.3.0|BSD| |platformdirs|3.11.0|MIT| |pluggy|1.3.0|MIT| diff --git a/app/Dockerfile b/app/Dockerfile index f9a9ef3a..74e81d96 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/app/requirements.in b/app/requirements.in index 419da81d..d0b07a19 100644 --- a/app/requirements.in +++ b/app/requirements.in @@ -1,3 +1,17 @@ +# Copyright (c) 2024 Contributors to the Eclipse Foundation +# +# 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. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 + grpcio==1.59.0 protobuf==4.24.4 dapr==1.11.0 diff --git a/app/src/main.py b/app/src/main.py index b9e3ae94..1754a8e6 100644 --- a/app/src/main.py +++ b/app/src/main.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/app/tests/integration/integration_test.py b/app/tests/integration/integration_test.py index 9f2e12b7..5e0fbdd2 100644 --- a/app/tests/integration/integration_test.py +++ b/app/tests/integration/integration_test.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/app/tests/requirements.in b/app/tests/requirements.in index ce969732..fe986183 100644 --- a/app/tests/requirements.in +++ b/app/tests/requirements.in @@ -1,3 +1,17 @@ +# Copyright (c) 2024 Contributors to the Eclipse Foundation +# +# 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. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 + pytest pytest-ordering pytest-asyncio diff --git a/app/tests/unit/test_run.py b/app/tests/unit/test_run.py index cc457b5f..a1bb0a86 100644 --- a/app/tests/unit/test_run.py +++ b/app/tests/unit/test_run.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at diff --git a/license_header.txt b/license_header.txt index e3295bc8..ffd6fc73 100644 --- a/license_header.txt +++ b/license_header.txt @@ -1,4 +1,4 @@ -Copyright (c) 2022 Robert Bosch GmbH and Microsoft Corporation +Copyright (c) 2024 Contributors to the Eclipse Foundation This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0 which is available at diff --git a/requirements.in b/requirements.in index e5b3996a..a2d72dd1 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Robert Bosch GmbH and Microsoft Corporation +# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Apache License, Version 2.0 which is available at