fix SBOM generation and license headers (#58)

Co-authored-by: doosuu <[email protected]>
eclipse-velocitas · Jan 9, 2024 · 84d4bf4 · 84d4bf4
1 parent f65fb6c
commit 84d4bf4
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 25 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
+# 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/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
+# 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/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
+# 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/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
+# 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/.github/workflows/build-base-images.yml b/.github/workflows/build-base-images.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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
@@ -113,7 +113,7 @@ jobs:
             do
               syft --platform $arch \
               -o template=SBOM/Markdown/$lang\_$arch.md -t templates/SBOM_md.tmpl \
-              -o spdx-json=SBOM/SPDX/$lang\_$arch.spdx.json \
+              -o spdx-json@2.2=SBOM/SPDX/$lang\_$arch.spdx.json \
               -o cyclonedx-json=SBOM/CycloneDX/$lang\_$arch.cyclonedx.json \
               ghcr.io/${{ github.repository }}/$lang:${{ needs.build-image.outputs.tag }}
             done

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
+# 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/.licensechecker.yml b/.licensechecker.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
+# 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/Dockerfiles/base/.devcontainer/Dockerfile b/Dockerfiles/base/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
+# 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/Dockerfiles/cpp/.devcontainer/Dockerfile b/Dockerfiles/cpp/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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/Dockerfiles/cpp/.devcontainer/devcontainer.json b/Dockerfiles/cpp/.devcontainer/devcontainer.json
@@ -9,14 +9,14 @@
             "ppa": true,
             "version": "2.41.0"
         },
-        "ghcr.io/devcontainers/features/common-utils:2.1.2": { },
-        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": { },
+        "ghcr.io/devcontainers/features/common-utils:2.1.2": {},
+        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": {},
         "ghcr.io/devcontainers/features/kubectl-helm-minikube:1.1.4": {
             "version": "1.28.0",
             "helm": "3.12.3",
             "minikube": "none"
         },
-        "ghcr.io/rio/features/k3d:1.1.0": { },
-        "ghcr.io/rio/features/k9s:1.1.4": { }
+        "ghcr.io/rio/features/k3d:1.1.0": {},
+        "ghcr.io/rio/features/k9s:1.1.5": {}
     }
 }
diff --git a/Dockerfiles/python/.devcontainer/Dockerfile b/Dockerfiles/python/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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/Dockerfiles/python/.devcontainer/devcontainer.json b/Dockerfiles/python/.devcontainer/devcontainer.json
@@ -9,14 +9,14 @@
             "ppa": true,
             "version": "2.41.0"
         },
-        "ghcr.io/devcontainers/features/common-utils:2.1.2": { },
-        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": { },
+        "ghcr.io/devcontainers/features/common-utils:2.1.2": {},
+        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": {},
         "ghcr.io/devcontainers/features/kubectl-helm-minikube:1.1.4": {
             "version": "1.28.0",
             "helm": "3.12.3",
             "minikube": "none"
         },
-        "ghcr.io/rio/features/k3d:1.1.0": { },
-        "ghcr.io/rio/features/k9s:1.1.4": { }
+        "ghcr.io/rio/features/k3d:1.1.0": {},
+        "ghcr.io/rio/features/k9s:1.1.5": {}
     }
 }
diff --git a/common/install-dapr-cli.sh b/common/install-dapr-cli.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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/common/install-kanto.sh b/common/install-kanto.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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/common/install-python.sh b/common/install-python.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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/common/install-velocitas-cli.sh b/common/install-velocitas-cli.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023 Contributors to the Eclipse Foundation
+# 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