Update conan references

utils/ci/conan/conanfile.txt

@@ -8,10 +8,10 @@ FMILibrary/2.0.3@openpass/testing
 protobuf/3.20.0@
 units/2.3.3@openpass/testing
 open-simulation-interface/3.5.0@openpass/testing
-MantleAPI/b7065ac1d5232f670cc14ab6b6285984e13e36b0@openpass/testing
+MantleAPI/9a038989604e8da62ecddbe2094b16ce1b778be1@openpass/testing
 Yase/d0c0e58d17358044cc9018c74308b45f6097ecfb@openpass/testing
 openscenario_api/v1.3.1@openpass/testing
-openscenario_engine/6845c6ff7ae7a2752575deb37008cdb1b8bf4904@openpass/testing
+openscenario_engine/82e2c1c349ee69d28cd301abfb520e8b210aee7b@openpass/testing
 
 [options]
 qt:with_pq=False
@@ -22,7 +22,7 @@ qt:qtxmlpatterns=True
 b2:use_cxx_env=True
 b2:toolset=gcc
 protobuf:shared=True
-openscenario_engine:MantleAPI_version=b7065ac1d5232f670cc14ab6b6285984e13e36b0
+openscenario_engine:MantleAPI_version=9a038989604e8da62ecddbe2094b16ce1b778be1
 openscenario_engine:Yase_version=d0c0e58d17358044cc9018c74308b45f6097ecfb
 boost:shared=True
 boost:without_atomic=True
@@ -36,7 +36,7 @@ boost:without_exception=True
 boost:without_fiber=True
 boost:without_graph=True
 boost:without_graph_parallel=True
-boost:without_iostreams=True 
+boost:without_iostreams=True
 boost:without_locale=True
 boost:without_log=True
 boost:without_math=True

utils/ci/conan/recipe/MantleAPI/all/conandata.yml

@@ -13,9 +13,5 @@
 ################################################################################
 
 sources:
-  "0.1":
-    url: https://gitlab.eclipse.org/eclipse/openpass/mantle-api.git
-    sha256: "a751f351f65324b743971c1ece1d2c26e6463e16"
-    
   "default":
-    url: https://gitlab.eclipse.org/nmraghu/mantle-api.git
+    url: https://gitlab.eclipse.org/eclipse/openpass/mantle-api.git
\ No newline at end of file

utils/ci/conan/recipe/openscenario_api/all/conanfile.py

@@ -83,15 +83,7 @@ class OpenScenarioApiConan(ConanFile):
 
         self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/src"), dst="include/openScenarioLib/src")      
 
-        self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated/v1_0/api"), dst="include/openScenarioLib/generated/v1_0/api")    
-
-        self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated/v1_1/api"), dst="include/openScenarioLib/generated/v1_1/api")        
-        self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated/v1_1/catalog"), dst="include/openScenarioLib/generated/v1_1/catalog")        
-        self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated/v1_1/common"), dst="include/openScenarioLib/generated/v1_1/common")  
-        self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated/v1_1/impl"), dst="include/openScenarioLib/generated/v1_1/impl")       
-
-        self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated/v1_1/checker/impl"), dst="include/openScenarioLib/generated/v1_1/checker/impl")       
-        self.copy("IScenarioCheckerV1_1.h", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated/v1_1/checker"), dst="include/openScenarioLib/generated/v1_1/checker")     
+        self.copy("*", src=os.path.join(self._repo_source, "cpp/openScenarioLib/generated"), dst="include/openScenarioLib/generated")    
 
         self.copy("*", src=os.path.join(self._repo_source, "cpp/build/cgReleaseMakeShared/antlr4_runtime/src/antlr4_runtime/runtime/Cpp/dist"), dst="lib")     
         self.copy("lib*", src=os.path.join(self._repo_source, "cpp/build/cgReleaseMakeShared/openScenarioLib"), dst="lib") 
@@ -99,3 +91,4 @@ class OpenScenarioApiConan(ConanFile):
 
         os.chdir(self.package_folder)
         os.system('find . -name "*.cpp" -exec rm {} \;')
+

utils/ci/conan/recipe/openscenario_engine/all/conandata.yml

@@ -13,9 +13,5 @@
 ################################################################################
 
 sources:
-  "0.1":
-    url: https://gitlab.eclipse.org/nmraghu/openscenario1_engine.git
-    sha256: "3ff092d9f379a6a729e1fedf1b71b298a05f458c"
-
   "default":
-    url: https://gitlab.eclipse.org/nmraghu/openscenario1_engine.git
+    url: https://gitlab.eclipse.org/eclipse/openpass/openscenario1_engine.git