Update conanfiles and documentation to OSI 3.5.0

doc/source/installation_guide/20_install_prerequisites.rst

@@ -337,13 +337,13 @@ Finally, the sources are then compiled into a library.
             cd ~
             mkdir -p OpenPASS/thirdParty/sources
 
-#. Download release 3.3.1 from https://github.com/OpenSimulationInterface/open-simulation-interface 
+#. Download release 3.5.0 from https://github.com/OpenSimulationInterface/open-simulation-interface
 
 #. Extract
 
-   - for Windows to ``C:\OpenPASS\thirdParty\sources\open-simulation-interface-3.3.1``
+   - for Windows to ``C:\OpenPASS\thirdParty\sources\open-simulation-interface-3.5.0``
 
-   - for Linux to ``~/OpenPASS/thirdParty/sources/open-simulation-interface-3.3.1``
+   - for Linux to ``~/OpenPASS/thirdParty/sources/open-simulation-interface-3.5.0``
 
 #. Navigate to the extracted folder
 
@@ -353,13 +353,13 @@ Finally, the sources are then compiled into a library.
 
          .. code-block:: 
 
-            cd /C/OpenPASS/thirdParty/sources/open-simulation-interface-3.3.1
+            cd /C/OpenPASS/thirdParty/sources/open-simulation-interface-3.5.0
 
       .. tab:: Linux
 
          .. code-block:: 
       
-               cd ~/OpenPASS/thirdParty/sources/open-simulation-interface-3.3.1
+               cd ~/OpenPASS/thirdParty/sources/open-simulation-interface-3.5.0
 
 #. Optional: Enable Arenas
    

doc/source/installation_guide/60_conan.rst

@@ -177,7 +177,7 @@ The ThirdParty libraries can be build and installed the same way.
 .. code-block:: 
 
    [requires]
-      OSI/3.3.1
+      OSI/3.5.0
       FMILibrary/2.0.3
 
    [generators]

doc/source/other_information/10_external_dependencies.rst

@@ -131,7 +131,7 @@ Details on source packages:
 Open Simulation Interface (OSI)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Version (officially supported): 3.3.1
+Version (officially supported): 3.5.0
 
 The internal world representation uses the `Open Simulation Interface <https://github.com/OpenSimulationInterface>`_ (:term:`OSI`) as part of its ground truth (backend storage) and exchange format.
 
@@ -152,7 +152,7 @@ If not already installed, the library and headers have to be built prior to OSI.
 .. admonition:: Note on Versions
 
    |Op| supports **integration of custom made or experimental versions** of OSI (see :ref:`building_osi`).
-   For example, `Algorithm_FmuWrapper` and the wrapped `OSMP` FMUs use the proposed OSI messages `MotionCommand` and `VehicleCommunicationData`, not yet defined in OSI 3.3.1.
+   For example, `Algorithm_FmuWrapper` and the wrapped `OSMP` FMUs use the proposed OSI messages `MotionCommand` and `VehicleCommunicationData`, not yet defined in OSI 3.5.0.
 
 .. _prerequisites_protobuf:
 

utils/ci/conan/recipe/openpass/conanfile.py

@@ -39,7 +39,7 @@ class OpenpassConan(ConanFile):
         #if self.options.Gui_only == False:
             #self.requires("boost/1.76.0@openpass/testing")
             #self.requires("protobuf/3.15.5")
-            self.requires("OSI/3.3.1")
+            self.requires("OSI/3.5.0")
             self.requires("FMILibrary/2.0.3")
             #self.requires("gtest/1.10.0")
 

utils/ci/conan/recipe/osi/conanfile.py

@@ -18,7 +18,7 @@ from conans import ConanFile, CMake, tools, errors
 
 class OsiConan(ConanFile):
     name = "OSI"
-    version = "3.3.1"
+    version = "3.5.0"
     license = "Mozilla Public License 2.0"
     author = "Michael Scharfenberg michael.scharfenberg@itk-engineering.de"
     url = "https://github.com/OpenSimulationInterface"
@@ -37,7 +37,7 @@ class OsiConan(ConanFile):
 
     def source(self):
         git = tools.Git(folder="osi3")
-        git.clone("https://github.com/OpenSimulationInterface/open-simulation-interface.git", "v3.3.1", "--recursive")
+        git.clone("https://github.com/OpenSimulationInterface/open-simulation-interface.git", "v3.5.0", "--recursive")
         self.run("find . -maxdepth 1 -name '*.proto' -exec sed -i '2i option cc_enable_arenas = true;' {} \;", win_bash=True, cwd="osi3")
 
     def build(self):

utils/ci/scripts/15_prepare_thirdParty.sh

@@ -44,5 +44,5 @@ fi
 "$PYTHON_COMMAND" -m conans.conan install protobuf/3.20.0@ --build --install-folder="$REPO_ROOT/../deps" -g deploy -g cmake_paths -o protobuf:shared=True
 mv $REPO_ROOT/../deps/protobuf $REPO_ROOT/../deps/protobuf-shared   # rename the deployed protobuf folder as protobuf-shared (to distinguish between protobuf static and shared)
 "$PYTHON_COMMAND" -m conans.conan install protobuf/3.20.0@ --build --install-folder="$REPO_ROOT/../deps" -g deploy -o protobuf:shared=False
-"$PYTHON_COMMAND" -m conans.conan install OSI/3.3.1@openpass/testing --build --install-folder="$REPO_ROOT/../deps" -g deploy
+"$PYTHON_COMMAND" -m conans.conan install OSI/3.5.0@openpass/testing --build --install-folder="$REPO_ROOT/../deps" -g deploy