Skip to content

Commit

Permalink
Update license header to 2024 (#219)
Browse files Browse the repository at this point in the history
* Update license header to 2024

Signed-off-by: Dennis Meister <[email protected]>

* Update devcontainer setup according to license changes

Signed-off-by: Dennis Meister <[email protected]>

* PR review findings

Signed-off-by: Dennis Meister <[email protected]>

---------

Signed-off-by: Dennis Meister <[email protected]>
  • Loading branch information
dennismeister93 authored Jan 11, 2024
1 parent c74e63a commit b72e716
Show file tree
Hide file tree
Showing 23 changed files with 78 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/configure-proxies.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/container-set.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/onCreateCommand.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/postStartCommand.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions .devcontainer/tests/automated_tests/requirements_test.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions .devcontainer/tests/automated_tests/runtime_test.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 0 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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.
##
Expand Down
2 changes: 1 addition & 1 deletion .licensechecker.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ort.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
53 changes: 25 additions & 28 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
2 changes: 1 addition & 1 deletion .velocitas.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
{
"name": "devenv-devcontainer-setup",
"version": "v1.4.4"
"version": "v1.4.5"
}
],
"variables": {
Expand Down
2 changes: 1 addition & 1 deletion .vscode/scripts/import-example-app.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) <year> 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
Expand Down
2 changes: 1 addition & 1 deletion NOTICE-3RD-PARTY-CONTENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
2 changes: 1 addition & 1 deletion app/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 14 additions & 0 deletions app/requirements.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/tests/integration/integration_test.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 14 additions & 0 deletions app/tests/requirements.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/tests/unit/test_run.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion license_header.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit b72e716

Please sign in to comment.