diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3b90734..e478cd1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -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/.devcontainer/scripts/configure-proxies.sh b/.devcontainer/scripts/configure-proxies.sh index 6f68584..a74bb7a 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 4265d1f..2bdbf63 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 8a91168..432ebbc 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-2023 Robert Bosch GmbH +# 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 9bdc50a..c090c91 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/scripts/reinstall-cmake.sh b/.devcontainer/scripts/reinstall-cmake.sh index 75bb451..99d5d9a 100755 --- a/.devcontainer/scripts/reinstall-cmake.sh +++ b/.devcontainer/scripts/reinstall-cmake.sh @@ -1,5 +1,19 @@ #!/bin/bash # This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json +# 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 + #------------------------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. diff --git a/.devcontainer/tests/automated_tests/runtime_test.py b/.devcontainer/tests/automated_tests/runtime_test.py index b8b5bae..a37b6e2 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/.licensechecker.yml b/.licensechecker.yml index b43a21f..b97ef1d 100644 --- a/.licensechecker.yml +++ b/.licensechecker.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH +# 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 4cf265a..c54bc64 100644 --- a/.ort.yml +++ b/.ort.yml @@ -1,4 +1,4 @@ -# Copyright (c) 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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a8a3fa..779ed2c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,17 @@ +# 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 +# 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 + fail_fast: false repos: - repo: https://github.com/pocc/pre-commit-hooks @@ -31,5 +45,41 @@ repos: "--suppress=*:build/*", "--suppress=*:app/vehicle_model/*", "--suppress=*:examples/vehicle_model/*", - "--suppress=*:/*/.conan/*" + "--suppress=*:/*/.conan/*", ] + + - repo: https://github.com/Lucas-C/pre-commit-hooks + rev: v1.5.4 + hooks: + - id: insert-license + files: '.*\.(py|pyi|yaml|yml|sh)$' + exclude: "reinstall-cmake.sh" + 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: '.*\.(cpp|c|cc|h)$' + exclude: '.*\.(pb.cpp|pb.c|pb.cc|pb.h)$' + 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.*|CMakeLists.txt" + 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 92ffc85..cab002f 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/CMakeLists.txt b/CMakeLists.txt index c342b41..4a37f40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH +# 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 fafb553..dba1f11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,7 +57,7 @@ In this project, [conan](https://conan.io) is used to manage the C++ dependencie Please make sure any file you newly create contains a proper license header like this: ```python -# Copyright (c) 2022 Robert Bosch GmbH +# 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 54ca3af..659e3c2 100644 --- a/NOTICE-3RD-PARTY-CONTENT.md +++ b/NOTICE-3RD-PARTY-CONTENT.md @@ -4,39 +4,38 @@ | Dependency | Version | License | |:-----------|:-------:|--------:| |bottle|0.12.25|MIT| -|certifi|2023.7.22|Mozilla Public License 2.0| +|certifi|2023.11.17|Mozilla Public License 2.0| |cfgv|3.4.0|MIT| |charset-normalizer|3.3.2|MIT| |colorama|0.4.6|BSD| |conan|1.60.2|MIT| |cpplint|1.6.1|New BSD| -|distlib|0.3.7|Python Software Foundation License| +|distlib|0.3.8|Python Software Foundation License| |distro|1.8.0|Apache 2.0| |fasteners|0.19|Apache 2.0| |filelock|3.13.1|The Unlicense (Unlicense)| |gcovr|5.2|BSD| -|identify|2.5.31|MIT| -|idna|3.4|BSD| -|Jinja2|3.1.2|New BSD| -|lxml|4.9.3|New BSD| +|identify|2.5.33|MIT| +|idna|3.6|BSD| +|Jinja2|3.1.3|New BSD| +|lxml|5.1.0|New BSD| |MarkupSafe|2.1.3|New BSD| |node-semver|0.6.1|MIT| |nodeenv|1.8.0|BSD| |patch-ng|1.17.4|MIT| -|platformdirs|3.11.0|MIT| +|platformdirs|4.1.0|MIT| |pluginbase|1.0.1|BSD| -|pre-commit|2.20.0|MIT| -|Pygments|2.16.1|Simplified BSD| +|pre-commit|3.5.0|MIT| +|pygments|2.17.2|Simplified BSD| |PyJWT|2.8.0|MIT| |python-dateutil|2.8.2|Apache 2.0
BSD| |PyYAML|6.0.1|MIT| |requests|2.31.0|Apache 2.0| |setuptools|58.1.0|MIT| |six|1.16.0|MIT| -|toml|0.10.2|MIT| |tqdm|4.66.1|MIT
Mozilla Public License 2.0 (MPL 2.0)| |urllib3|1.26.18|MIT| -|virtualenv|20.24.6|MIT| +|virtualenv|20.25.0|MIT| ## Workflows | Dependency | Version | License | |:-----------|:-------:|--------:| diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index adc27e0..7722ea8 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Robert Bosch GmbH +# 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/Dockerfile b/app/Dockerfile index 43aa5b1..c28acfa 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Robert Bosch GmbH +# 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/src/CMakeLists.txt b/app/src/CMakeLists.txt index e34f433..b66c498 100644 --- a/app/src/CMakeLists.txt +++ b/app/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Robert Bosch GmbH +# 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/src/Launcher.cpp b/app/src/Launcher.cpp index 49d06bf..07d546a 100644 --- a/app/src/Launcher.cpp +++ b/app/src/Launcher.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022-2023 Robert Bosch GmbH + * 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/src/SampleApp.cpp b/app/src/SampleApp.cpp index 1e2b783..723af53 100644 --- a/app/src/SampleApp.cpp +++ b/app/src/SampleApp.cpp @@ -1,5 +1,5 @@ /** - * 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/app/src/SampleApp.h b/app/src/SampleApp.h index 2390b30..c733e7c 100644 --- a/app/src/SampleApp.h +++ b/app/src/SampleApp.h @@ -1,5 +1,5 @@ /** - * 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/app/tests/CMakeLists.txt b/app/tests/CMakeLists.txt index e751155..7b60969 100644 --- a/app/tests/CMakeLists.txt +++ b/app/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Robert Bosch GmbH +# 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/utests/CMakeLists.txt b/app/tests/utests/CMakeLists.txt index 0655398..18acefa 100644 --- a/app/tests/utests/CMakeLists.txt +++ b/app/tests/utests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Robert Bosch GmbH +# 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/utests/SampleApp_test.cpp b/app/tests/utests/SampleApp_test.cpp index 605de21..00f0817 100644 --- a/app/tests/utests/SampleApp_test.cpp +++ b/app/tests/utests/SampleApp_test.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022 Robert Bosch GmbH + * 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/build.sh b/build.sh index 4539c3b..94cc8e2 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022 Robert Bosch GmbH +# 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/install_dependencies.sh b/install_dependencies.sh index be5e2f5..c11b0bf 100755 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2022-2023 Robert Bosch GmbH +# 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 new file mode 100644 index 0000000..ffd6fc7 --- /dev/null +++ b/license_header.txt @@ -0,0 +1,13 @@ +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 diff --git a/requirements.txt b/requirements.txt index 90fc351..35376fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ gcovr==5.2 conan==1.60.2 -pre-commit==2.20.0 +pre-commit==3.5.0 cpplint==1.6.1