From 23d3455ac39d2e7425daba1a13c7b03e6db9b547 Mon Sep 17 00:00:00 2001
From: Dominic Sudy <99014187+doosuu@users.noreply.github.com>
Date: Wed, 8 May 2024 09:47:06 +0200
Subject: [PATCH] Upgrade project config (#98)

---
 .velocitas-lock.json        |  8 ++++++++
 .velocitas.json             | 36 ++++++++++++++++++------------------
 NOTICE-3RD-PARTY-CONTENT.md | 10 +++++-----
 app/Dockerfile              |  5 -----
 4 files changed, 31 insertions(+), 28 deletions(-)
 create mode 100644 .velocitas-lock.json

diff --git a/.velocitas-lock.json b/.velocitas-lock.json
new file mode 100644
index 0000000..b36088a
--- /dev/null
+++ b/.velocitas-lock.json
@@ -0,0 +1,8 @@
+{
+    "packages": {
+        "devenv-runtimes": "v3.1.0",
+        "devenv-github-workflows": "v6.0.0",
+        "devenv-github-templates": "v1.0.4",
+        "devenv-devcontainer-setup": "v2.1.0"
+    }
+}
diff --git a/.velocitas.json b/.velocitas.json
index a123259..e5c6d4e 100644
--- a/.velocitas.json
+++ b/.velocitas.json
@@ -1,21 +1,21 @@
 {
-    "packages": [
-        {
-            "name": "devenv-runtimes",
-            "version": "v3.0.0"
-        },
-        {
-            "name": "devenv-github-workflows",
-            "version": "v6.0.0"
-        },
-        {
-            "name": "devenv-github-templates",
-            "version": "v1.0.4"
-        },
-        {
-            "name": "devenv-devcontainer-setup",
-            "version": "v2.0.0"
-        }
+    "packages": {
+        "devenv-runtimes": "v3.1.0",
+        "devenv-github-workflows": "v6.0.0",
+        "devenv-github-templates": "v1.0.4",
+        "devenv-devcontainer-setup": "v2.1.0"
+    },
+    "components": [
+        "runtime-local",
+        "runtime-kanto",
+        "deployment-kanto",
+        "pantaris-integration",
+        "github-workflows",
+        "github-templates",
+        "devcontainer-setup",
+        "vehicle-signal-interface",
+        "grpc-interface-support",
+        "sdk-installer"
     ],
     "variables": {
         "language": "cpp",
@@ -24,5 +24,5 @@
         "githubRepoId": "eclipse-velocitas/vehicle-app-cpp-template",
         "vehicleAppPort": -1
     },
-    "cliVersion": "v0.7.0"
+    "cliVersion": "v0.9.0"
 }
diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md
index 3653bf1..8b6c11b 100644
--- a/NOTICE-3RD-PARTY-CONTENT.md
+++ b/NOTICE-3RD-PARTY-CONTENT.md
@@ -13,11 +13,11 @@
 |distlib|0.3.8|Python Software Foundation License|
 |distro|1.8.0|Apache 2.0|
 |fasteners|0.19|Apache 2.0|
-|filelock|3.13.4|The Unlicense (Unlicense)|
+|filelock|3.14.0|The Unlicense (Unlicense)|
 |gcovr|5.2|BSD|
 |identify|2.5.36|MIT|
 |idna|3.7|BSD|
-|Jinja2|3.1.3|New BSD|
+|jinja2|3.1.4|BSD|
 |lxml|5.2.1|New BSD|
 |MarkupSafe|2.1.5|New BSD|
 |node-semver|0.6.1|MIT|
@@ -26,16 +26,16 @@
 |platformdirs|4.2.1|MIT|
 |pluginbase|1.0.1|BSD|
 |pre-commit|3.5.0|MIT|
-|pygments|2.17.2|Simplified BSD|
+|pygments|2.18.0|Simplified BSD|
 |PyJWT|2.8.0|MIT|
 |python-dateutil|2.9.0.post0|Apache 2.0<br/>BSD|
 |PyYAML|6.0.1|MIT|
 |requests|2.31.0|Apache 2.0|
 |setuptools|58.1.0|MIT|
 |six|1.16.0|MIT|
-|tqdm|4.66.2|MIT<br/>Mozilla Public License 2.0 (MPL 2.0)|
+|tqdm|4.66.4|MIT<br/>Mozilla Public License 2.0 (MPL 2.0)|
 |urllib3|1.26.18|MIT|
-|virtualenv|20.26.0|MIT|
+|virtualenv|20.26.1|MIT|
 ## Workflows
 | Dependency | Version | License |
 |:-----------|:-------:|--------:|
diff --git a/app/Dockerfile b/app/Dockerfile
index bd320c3..72c5abf 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -20,11 +20,6 @@ COPY . /workspace
 
 ENV CONAN_USER_HOME /home/vscode/
 
-# FIXME: For build tooling we only need "devenv-devcontainer-setup", we should be able to
-# filter this without manual jq intervention...
-RUN mv /workspace/.velocitas.json /workspace/.velocitas_org.json && \
-    cat /workspace/.velocitas_org.json | jq 'del(.packages[] | select(.name != "devenv-devcontainer-setup"))' > /workspace/.velocitas.json
-
 WORKDIR /workspace
 
 RUN velocitas init -f -v && \