Conan 2 migration (eclipse-velocitas#128)

BjoernAtBosch · MP91 · web-flow · commit fe37844d06f0 · 2025-05-16T09:42:21.000+02:00
* Change base-image to v0.4
* Update workflows to v7.0.0
* Update devcontainer-setup to v3.0.0
* Update C++ SDK to v0.7.0
---------

Co-authored-by: Markus Petke &lt;MP91@users.noreply.github.com&gt;
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
-# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2022-2025 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
@@ -13,7 +13,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
+FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4
 
 ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE
 ENV REINSTALL_CMAKE_VERSION_FROM_SOURCE="${REINSTALL_CMAKE_VERSION_FROM_SOURCE:-none}"
diff --git a/.devcontainer/scripts/configure-codespaces.sh b/.devcontainer/scripts/configure-codespaces.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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2023-2025 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
@@ -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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2022-2025 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
@@ -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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2022-2025 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
@@ -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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2022-2025 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
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
-# Copyright (c) 2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2024-2025 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
@@ -14,7 +14,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-.devcontainer/scripts/upgrade-cli.sh
+if [[ -z "${VELOCITAS_OFFLINE}" ]]; then
+    .devcontainer/scripts/upgrade-cli.sh
+fi
 
 # Call user initialization hook if present
 POST_START_USER_HOOK_PATH=.devcontainer/scripts/onPostStartUserHook.sh
diff --git a/.devcontainer/scripts/reinstall-cmake.sh b/.devcontainer/scripts/reinstall-cmake.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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2023-2025 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/setup-dependencies.sh b/.devcontainer/scripts/setup-dependencies.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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2022-2025 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/setup-git.sh b/.devcontainer/scripts/setup-git.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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2022-2025 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/upgrade-cli.sh b/.devcontainer/scripts/upgrade-cli.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-2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2023-2025 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-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -29,7 +29,7 @@ jobs:
   build-image:
     name: "Building image (${{ inputs.app_name }})"
     runs-on: ubuntu-22.04
-    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
+    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4
     outputs:
       archs: ${{ steps.set_args.outputs.archs_matrix }}
     env:
diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: eclipse-velocitas/license-check
-          ref: v1.2
+          ref: v1.3
           path: .github/actions/license-check
 
       - name: Run License Checker
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ on:
 jobs:
   build-and-publish:
     runs-on: ubuntu-22.04
-    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
+    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4
     name: "Build, Test and Lint"
     steps:
       - name: Checkout repository
@@ -62,7 +62,7 @@ jobs:
         run: ./install_dependencies.sh -r
 
       - name: build
-        run: ./build.sh -r
+        run: ./build.sh -r --coverage
 
       - name: Run Unit Tests
         shell: bash
@@ -71,12 +71,14 @@ jobs:
           build/bin/app_utests | tee test-results.md
 
       - name: Generate coverage report
-        run: cd build && gcovr -r ..
+        # If 'build' folder is a symlink, assigning pwd to ROOT_DIR makes this independent
+        # of the number of dirs covered by the symlink
+        run: ROOT_DIR=$(pwd) && cd build && gcovr -r $ROOT_DIR
 
       - name: Code Coverage Summary Report
         uses: irongut/CodeCoverageSummary@v1.3.0
         with:
-          filename: build/coverage.cobertura.xml
+          filename: build-linux-x86_64/Release/coverage.cobertura.xml
           badge: true
           format: markdown
           hide_complexity: true
diff --git a/.github/workflows/ensure-lifecycle.yml b/.github/workflows/ensure-lifecycle.yml
@@ -29,7 +29,7 @@ on:
 jobs:
   check-sync:
     runs-on: ubuntu-22.04
-    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
+    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4
     name: Are files in sync?
 
     steps:
diff --git a/.github/workflows/gen-desired-state.yml b/.github/workflows/gen-desired-state.yml
@@ -26,7 +26,7 @@ jobs:
   gen-desired-state:
     name: "Generate desired state for ${{ inputs.app_name }}"
     runs-on: ubuntu-22.04
-    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
+    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4
 
     steps:
       - name: Checkout repository
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,7 @@
 
 # CMake
 build*
+CMakeUserPresets.json
 
 # Mac files
 .DS_Store
diff --git a/.ort.yml b/.ort.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -42,9 +42,7 @@ repos:
             "--suppress=uninitMemberVar",
             "--suppress=unmatchedSuppression",
             # suppress all warnings for generated code
-            "--suppress=*:build/*",
-            "--suppress=*:app/vehicle_model/*",
-            "--suppress=*:examples/vehicle_model/*",
+            "--suppress=*:build*/*",
             "--suppress=*:/*/.conan/*",
           ]
 
diff --git a/.velocitas-lock.json b/.velocitas-lock.json
@@ -1,8 +1,8 @@
 {
     "packages": {
-        "devenv-runtimes": "v4.0.6",
-        "devenv-github-workflows": "v6.1.4",
+        "devenv-runtimes": "v4.1.0",
+        "devenv-github-workflows": "v7.0.0",
         "devenv-github-templates": "v1.0.5",
-        "devenv-devcontainer-setup": "v2.5.3"
+        "devenv-devcontainer-setup": "v3.0.0"
     }
 }
diff --git a/.velocitas.json b/.velocitas.json
@@ -1,9 +1,9 @@
 {
     "packages": {
-        "devenv-runtimes": "v4.0.6",
-        "devenv-github-workflows": "v6.1.4",
+        "devenv-runtimes": "v4.1.0",
+        "devenv-github-workflows": "v7.0.0",
         "devenv-github-templates": "v1.0.5",
-        "devenv-devcontainer-setup": "v2.5.3"
+        "devenv-devcontainer-setup": "v3.0.0"
     },
     "components": [
         "runtime-local",
@@ -24,5 +24,5 @@
         "appManifestPath": "app/AppManifest.json",
         "githubRepoId": "eclipse-velocitas/vehicle-app-cpp-template"
     },
-    "cliVersion": "v0.13.0"
+    "cliVersion": "v0.13.2"
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,28 +24,25 @@ set(APP_BUILD_TESTS     ON CACHE BOOL "Build the App's tests.")
 set(CMAKE_CXX_STANDARD 17)
 set(STATIC_BUILD        OFF CACHE BOOL "Build all targets with external dependencies linked in statically.")
 
+find_package(vehicle-app-sdk REQUIRED)
+find_package(vehicle-model REQUIRED)
+find_package(fmt REQUIRED)
+find_package(nlohmann_json REQUIRED)
+
+# Induce to put executables into the bin folder of the current build folder
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+
 if(STATIC_BUILD)
     set(BUILD_SHARED_LIBS OFF)
     set(CMAKE_EXE_LINKER_FLAGS "-static")
 endif()
-find_program(CCACHE_FOUND ccache)
 
+find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
     message("Found ccache installation")
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 endif()
 
-# use conan for dependency management
-set(CONAN_BUILD_INFO_FILE ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-
-if(NOT EXISTS ${CONAN_BUILD_INFO_FILE})
-    message(FATAL_ERROR "Conan build info file missing. Did you run install_dependencies.sh first?")
-    return()
-else()
-    include(${CONAN_BUILD_INFO_FILE})
-    conan_basic_setup(TARGETS)
-endif()
-
 add_subdirectory(app)
 
 if(APP_BUILD_TESTS)
diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md
@@ -3,47 +3,42 @@
 ## Python
 | Dependency | Version | License |
 |:-----------|:-------:|--------:|
-|bottle|0.12.25|MIT|
 |build|1.2.2.post1|MIT|
-|certifi|2024.8.30|Mozilla Public License 2.0|
+|certifi|2025.1.31|Mozilla Public License 2.0|
 |cfgv|3.4.0|MIT|
-|charset-normalizer|3.4.0|MIT|
-|click|8.1.7|New BSD|
+|charset-normalizer|3.4.1|MIT|
+|click|8.1.8|BSD|
 |colorama|0.4.6|BSD|
-|conan|1.66.0|MIT|
+|conan|2.15.1|MIT|
 |cpplint|1.6.1|New BSD|
 |distlib|0.3.9|Python Software Foundation License|
 |distro|1.8.0|Apache 2.0|
 |fasteners|0.19|Apache 2.0|
-|filelock|3.16.1|The Unlicense (Unlicense)|
+|filelock|3.18.0|The Unlicense (Unlicense)|
 |gcovr|5.2|BSD|
-|identify|2.6.1|MIT|
+|identify|2.6.9|MIT|
 |idna|3.10|BSD|
 |jinja2|3.1.6|BSD|
-|lxml|5.3.0|New BSD|
-|MarkupSafe|3.0.1|BSD|
-|node-semver|0.6.1|MIT|
+|lxml|5.3.2|New BSD|
+|MarkupSafe|3.0.2|BSD|
 |nodeenv|1.9.1|BSD|
-|packaging|24.1|Apache 2.0<br/>BSD|
-|patch-ng|1.17.4|MIT|
+|packaging|24.2|Apache 2.0<br/>BSD|
+|patch-ng|1.18.1|MIT|
 |pip|23.0.1|MIT|
 |pip-tools|7.4.1|BSD|
-|platformdirs|4.3.6|MIT|
-|pluginbase|1.0.1|BSD|
+|platformdirs|4.3.7|MIT|
 |pre-commit|3.5.0|MIT|
-|pygments|2.18.0|Simplified BSD|
-|PyJWT|2.9.0|MIT|
+|pygments|2.19.1|Simplified BSD|
 |pyproject-hooks|1.2.0|MIT|
 |python-dateutil|2.9.0.post0|Apache 2.0<br/>BSD|
 |PyYAML|6.0.2|MIT|
 |requests|2.32.3|Apache 2.0|
 |setuptools|65.5.1|MIT|
-|six|1.16.0|MIT|
-|tomli|2.0.2|MIT|
-|tqdm|4.66.5|MIT<br/>Mozilla Public License 2.0 (MPL 2.0)|
-|urllib3|1.26.20|MIT|
-|virtualenv|20.26.6|MIT|
-|wheel|0.44.0|MIT|
+|six|1.17.0|MIT|
+|tomli|2.2.1|MIT|
+|urllib3|2.0.7|MIT|
+|virtualenv|20.30.0|MIT|
+|wheel|0.45.1|MIT|
 ## Workflows
 | Dependency | Version | License |
 |:-----------|:-------:|--------:|
diff --git a/NOTICE.md b/NOTICE.md
@@ -51,18 +51,15 @@ they are given here (manually added) for time being:
 
 | Dependency | Version | License |
 |:-----------|:-------:|--------:|
-|abseil|20220623.0|Apache 2.0|
-|c-ares|1.19.1|c-ares (MIT-style)|
-|cpr|1.10.1|MIT|
-|fmt|9.1.0|MIT|
-|googleapis|cci.20221108|Apache 2.0|
+|abseil|20230802.1|Apache 2.0|
+|c-ares|1.34.3|c-ares (MIT-style)|
+|fmt|11.1.1|MIT|
 |grpc|1.50.1|Apache 2.0|
-|grpc-proto|cci.20220627|Apache 2.0|
-|libcurl|8.1.2|CURL|
-|nlohmann_json|3.11.2|MIT|
-|openssl|1.1.1u|OpenSSL License AND SSLeay License|
-|paho-mqtt-c|1.3.9|EPL 2.0 AND EDL 1.0|
-|paho-mqtt-cpp|1.2.0|EPL 1.0 AND EDL 1.0|
-|protobuf|3.21.9|Google License|
-|re2|20220601|BSD-3-Clause|
-|zlib|1.2.13|zlib/libpng license|
+|nlohmann_json|3.11.3|MIT|
+|openssl|3.4.1|Apache 2.0|
+|paho-mqtt-c|1.3.13|EPL 2.0 AND EDL 1.0|
+|paho-mqtt-cpp|1.4.0|EPL 2.0 AND EDL 1.0|
+|protobuf|3.21.12|Google License|
+|re2|20230301|BSD-3-Clause|
+|vehicle-app-sdk|0.7.0|Apache 2.0|
+|zlib|1.3.1|zlib license|
diff --git a/README.md b/README.md
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
diff --git a/app/Dockerfile b/app/Dockerfile
diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
diff --git a/app/tests/utests/CMakeLists.txt b/app/tests/utests/CMakeLists.txt
diff --git a/build.sh b/build.sh
diff --git a/conanfile.txt b/conanfile.txt
diff --git a/install_dependencies.sh b/install_dependencies.sh
diff --git a/requirements.in b/requirements.in
diff --git a/requirements.txt b/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json`
`2`		`-# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation`
	`2`	`+# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation`
`3`	`3`	`#`
`4`	`4`	`# This program and the accompanying materials are made available under the`
`5`	`5`	`# terms of the Apache License, Version 2.0 which is available at`
`@@ -13,7 +13,7 @@`
`13`	`13`	`#`
`14`	`14`	`# SPDX-License-Identifier: Apache-2.0`
`15`	`15`
`16`		`-FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3`
	`16`	`+FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4`
`17`	`17`
`18`	`18`	`ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE`
`19`	`19`	`ENV REINSTALL_CMAKE_VERSION_FROM_SOURCE="${REINSTALL_CMAKE_VERSION_FROM_SOURCE:-none}"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json`
`3`		`-# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation`
	`3`	`+# Copyright (c) 2023-2025 Contributors to the Eclipse Foundation`
`4`	`4`	`#`
`5`	`5`	`# This program and the accompanying materials are made available under the`
`6`	`6`	`# terms of the Apache License, Version 2.0 which is available at`