capicxx-core-runtime 3.2.0

COVESA · Oct 27, 2020 · b2cb22a · b2cb22a
1 parent 3e2193c
commit b2cb22a
Show file tree

Hide file tree

Showing 230 changed files with 4,853 additions and 3,311 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,8 +1,14 @@
 Changes
 =======
 
-v3.1.12.4
-- Fixed dependency to Eclipse Modeling Framework causing compilation error.
+v3.2.0
+- Adapted to CommonAPI 3.2.0
+- Upgrade to Franca 0.13.1
+- Improved evaluation of literal value expressions
+- Allow typedef´ed types within unions
+- Updated xtend to v2.20.0
+- Improve handling of derived enumerations
+- Removed some unnecessary warnings
 
 v3.1.12.3
 - Prevent crash due to concurrent attribute access from stub itself

diff --git a/CommonAPI-Examples/E01HelloWorld/CMakeLists.txt b/CommonAPI-Examples/E01HelloWorld/CMakeLists.txt
@@ -31,7 +31,7 @@ if (MSVC)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /EHsc /wd\\\"4503\\\"")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd\\\"4503\\\"")
 else()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Wall -O0 -std=c++0x -D_GLIBCXX_USE_NANOSLEEP -DLINUX")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Wall -O0 -std=c++11 -D_GLIBCXX_USE_NANOSLEEP -DLINUX")
 endif()
 
 message(STATUS "Compiler options: ${CMAKE_CXX_FLAGS}") 
@@ -46,11 +46,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
 message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
 
 if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
-    FIND_PACKAGE(CommonAPI 3.1.12 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.12 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI-DBus 3.2.0 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
 else()
-    FIND_PACKAGE(CommonAPI 3.1.12 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.12 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI-DBus 3.2.0 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
 endif()
 
 message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -78,8 +78,8 @@ else()
 endif()
 
 # SOME/IP
-find_package (CommonAPI-SomeIP 3.1.12 REQUIRED)
-find_package (vsomeip 2.7.0 REQUIRED)
+find_package (CommonAPI-SomeIP 3.2.0 REQUIRED)
+find_package (vsomeip3 3.1.0 REQUIRED)
 
 # Source Files
 set(PRJ_SRC_PATH src)

diff --git a/...es/E01HelloWorld/fidl/E01HelloWorld.fdepl → ...elloWorld/fidl/E01HelloWorld-SomeIP.fdepl b/...es/E01HelloWorld/fidl/E01HelloWorld.fdepl → ...elloWorld/fidl/E01HelloWorld-SomeIP.fdepl
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-SOMEIP_deployment_spec.fdepl"
+import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-4-SOMEIP_deployment_spec.fdepl"
 import "E01HelloWorld.fidl"
 
 define org.genivi.commonapi.someip.deployment for interface commonapi.examples.E01HelloWorld {
@@ -21,7 +21,7 @@ define org.genivi.commonapi.someip.deployment for interface commonapi.examples.E
     }
 }
 
-define org.genivi.commonapi.someip.deployment for provider Service {
+define org.genivi.commonapi.someip.deployment for provider as Service {
     instance commonapi.examples.E01HelloWorld {
         InstanceId = "commonapi.examples.HelloWorld"
 

diff --git a/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldClient.cpp b/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldClient.cpp
@@ -1,7 +1,7 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <iostream>
 #include <string>

diff --git a/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldService.cpp b/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldService.cpp
@@ -1,7 +1,7 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <iostream>
 #include <thread>

diff --git a/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldStubImpl.cpp b/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldStubImpl.cpp
@@ -1,7 +1,7 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include "E01HelloWorldStubImpl.hpp"
 
@@ -12,8 +12,7 @@ E01HelloWorldStubImpl::~E01HelloWorldStubImpl() {
 }
 
 void E01HelloWorldStubImpl::sayHello(const std::shared_ptr<CommonAPI::ClientId> _client,
-        std::string _name,
-        sayHelloReply_t _reply) {
+        std::string _name, sayHelloReply_t _reply) {
 
     std::stringstream messageStream;
 

diff --git a/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldStubImpl.hpp b/CommonAPI-Examples/E01HelloWorld/src/E01HelloWorldStubImpl.hpp
@@ -1,10 +1,10 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef E01HELLOWORLDSTUBIMPL_H_
-#define E01HELLOWORLDSTUBIMPL_H_
+#ifndef E01HELLOWORLDSTUBIMPL_HPP_
+#define E01HELLOWORLDSTUBIMPL_HPP_
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <v0/commonapi/examples/E01HelloWorldStubDefault.hpp>
@@ -19,4 +19,4 @@ class E01HelloWorldStubImpl: public v0_1::commonapi::examples::E01HelloWorldStub
 
 };
 
-#endif /* E01HELLOWORLDSTUBIMPL_H_ */
+#endif // E01HELLOWORLDSTUBIMPL_HPP_
diff --git a/CommonAPI-Examples/E02Attributes/CMakeLists.txt b/CommonAPI-Examples/E02Attributes/CMakeLists.txt
@@ -31,7 +31,7 @@ if (MSVC)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /EHsc /wd\\\"4503\\\"")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd\\\"4503\\\"")
 else()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O0 -std=c++0x -pthread -D_GLIBCXX_USE_NANOSLEEP")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O0 -std=c++11 -pthread -D_GLIBCXX_USE_NANOSLEEP")
 endif()
 
 message(STATUS "Compiler options: ${CMAKE_CXX_FLAGS}") 
@@ -46,11 +46,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
 message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
 
 if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
-    FIND_PACKAGE(CommonAPI 3.1.12 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.12 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI-DBus 3.2.0 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
 else()
-    FIND_PACKAGE(CommonAPI 3.1.12 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.12 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI-DBus 3.2.0 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
 endif()
 
 message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -78,8 +78,8 @@ else()
 endif()
 
 # SOME/IP
-find_package (CommonAPI-SomeIP 3.1.12 REQUIRED)
-find_package (vsomeip 2.7.0 REQUIRED)
+find_package (CommonAPI-SomeIP 3.2.0 REQUIRED)
+find_package (vsomeip3 3.1.0 REQUIRED)
 
 # Source Files
 set(PRJ_SRC_PATH src)
@@ -160,4 +160,4 @@ target_link_libraries(${PRJ_NAME}-dbus CommonAPI-DBus)
 
 # Build SOME/IP library
 add_library (${PRJ_NAME}-someip SHARED ${PRJ_SOMEIP_LIB_SRCS})
-target_link_libraries(${PRJ_NAME}-someip CommonAPI-SomeIP)
+target_link_libraries(${PRJ_NAME}-someip CommonAPI-SomeIP)
diff --git a/CommonAPI-Examples/E02Attributes/fidl/E02Attributes-DBus.fdepl b/CommonAPI-Examples/E02Attributes/fidl/E02Attributes-DBus.fdepl
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import "platform:/plugin/org.genivi.commonapi.dbus/deployment/CommonAPI-DBus_deployment_spec.fdepl"
+import "platform:/plugin/org.genivi.commonapi.dbus/deployment/CommonAPI-4-DBus_deployment_spec.fdepl"
 import "E02Attributes.fidl"
 
 define org.genivi.commonapi.dbus.deployment for interface commonapi.examples.E02Attributes {

diff --git a/CommonAPI-Examples/E02Attributes/fidl/E02Attributes-SomeIP.fdepl b/CommonAPI-Examples/E02Attributes/fidl/E02Attributes-SomeIP.fdepl
@@ -3,52 +3,48 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-SOMEIP_deployment_spec.fdepl"
+import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-4-SOMEIP_deployment_spec.fdepl"
 import "E02Attributes.fidl"
 
 define org.genivi.commonapi.someip.deployment for interface commonapi.examples.E02Attributes {
     SomeIpServiceID = 4660
-    
+
     attribute x {
         SomeIpGetterID = 3000
         SomeIpSetterID = 3001
-        SomeIpNotifierID = 33010        
-        SomeIpEventGroups = { 33010 }
-
-        SomeIpGetterReliable = true
-        SomeIpSetterReliable = true
-        SomeIpNotifierReliable = true
+        SomeIpNotifierID = 33010
+        SomeIpNotifierEventGroups = { 33010 }
+
+        SomeIpAttributeReliable = true
     }
-    
+
     attribute a1 {
         SomeIpGetterID = 3002
         SomeIpSetterID = 3003
-        SomeIpNotifierID = 33011        
-        SomeIpEventGroups = { 33011 }
+        SomeIpNotifierID = 33011
+        SomeIpNotifierEventGroups = { 33011 }
 
-        SomeIpGetterReliable = true
-        SomeIpSetterReliable = true
-        SomeIpNotifierReliable = true
+        SomeIpAttributeReliable = true
     }
 }
 
 define org.genivi.commonapi.someip.deployment for typeCollection commonapi.examples.CommonTypes {
     struct a1Struct {
     }
-    
+
     struct a2Struct {
     }
-    
+
 }
 
-define org.genivi.commonapi.someip.deployment for provider Service {
+define org.genivi.commonapi.someip.deployment for provider as Service {
     instance commonapi.examples.E02Attributes {
         InstanceId = "commonapi.examples.Attributes"
-        
+
         SomeIpInstanceID = 22136
-    
+
         SomeIpUnicastAddress = "192.168.0.2"
         SomeIpReliableUnicastPort = 30499
         SomeIpUnreliableUnicastPort = 30500
     }
-}
+}
diff --git a/CommonAPI-Examples/E02Attributes/src/E02AttributesClient.cpp b/CommonAPI-Examples/E02Attributes/src/E02AttributesClient.cpp
@@ -1,7 +1,7 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <iostream>
 
@@ -10,7 +10,7 @@
 #endif
 
 #include <CommonAPI/CommonAPI.hpp>
-#include <CommonAPI/Extensions/AttributeCacheExtension.hpp>
+#include <CommonAPI/AttributeCacheExtension.hpp>
 #include <v1/commonapi/examples/E02AttributesProxy.hpp>
 
 using namespace v1::commonapi::examples;

diff --git a/CommonAPI-Examples/E02Attributes/src/E02AttributesService.cpp b/CommonAPI-Examples/E02Attributes/src/E02AttributesService.cpp
@@ -1,7 +1,7 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <thread>
 #include <iostream>

diff --git a/CommonAPI-Examples/E02Attributes/src/E02AttributesStubImpl.cpp b/CommonAPI-Examples/E02Attributes/src/E02AttributesStubImpl.cpp
@@ -1,7 +1,7 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include "E02AttributesStubImpl.hpp"
 

diff --git a/CommonAPI-Examples/E02Attributes/src/E02AttributesStubImpl.hpp b/CommonAPI-Examples/E02Attributes/src/E02AttributesStubImpl.hpp
@@ -1,10 +1,10 @@
-/* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// Copyright (C) 2014-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef E02ATTRIBUTESSTUBIMPL_H_
-#define E02ATTRIBUTESSTUBIMPL_H_
+#ifndef E02ATTRIBUTESSTUBIMPL_HPP_
+#define E02ATTRIBUTESSTUBIMPL_HPP_
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <v1/commonapi/examples/E02AttributesStubDefault.hpp>
@@ -20,4 +20,4 @@ class E02AttributesStubImpl: public v1_0::commonapi::examples::E02AttributesStub
     int cnt;
 };
 
-#endif /* E02ATTRIBUTESSTUBIMPL_H_ */
+#endif // E02ATTRIBUTESSTUBIMPL_HPP_
diff --git a/CommonAPI-Examples/E03Methods/CMakeLists.txt b/CommonAPI-Examples/E03Methods/CMakeLists.txt
@@ -33,7 +33,7 @@ if (MSVC)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /EHsc /wd\\\"4503\\\"")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd\\\"4503\\\"")
 else()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pthread -O0 -std=c++0x -D_GLIBCXX_USE_NANOSLEEP")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pthread -O0 -std=c++11 -D_GLIBCXX_USE_NANOSLEEP")
 endif()
 
 message(STATUS "Compiler options: ${CMAKE_CXX_FLAGS}") 
@@ -48,11 +48,11 @@ OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version
 message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")
 
 if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
-    FIND_PACKAGE(CommonAPI 3.1.12 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.12 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI-DBus 3.2.0 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
 else()
-    FIND_PACKAGE(CommonAPI 3.1.12 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.12 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI-DBus 3.2.0 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
 endif()
 
 message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -80,8 +80,8 @@ else()
 endif()
 
 # SOME/IP
-find_package (CommonAPI-SomeIP 3.1.12 REQUIRED)
-find_package (vsomeip 2.7.0 REQUIRED)
+find_package (CommonAPI-SomeIP 3.2.0 REQUIRED)
+find_package (vsomeip3 3.1.0 REQUIRED)
 
 # Source Files
 set(PRJ_SRC_PATH src)

diff --git a/CommonAPI-Examples/E03Methods/fidl/E03Methods-DBus.fdepl b/CommonAPI-Examples/E03Methods/fidl/E03Methods-DBus.fdepl
@@ -1,8 +1,8 @@
-import "platform:/plugin/org.genivi.commonapi.dbus/deployment/CommonAPI-DBus_deployment_spec.fdepl"
+import "platform:/plugin/org.genivi.commonapi.dbus/deployment/CommonAPI-4-DBus_deployment_spec.fdepl"
 import "E03Methods.fidl"
 
 define org.genivi.commonapi.dbus.deployment for interface commonapi.examples.E03Methods {
     method foo {
-        Timeout = 1234
+        MethodTimeout = 1234
     }
 }
diff --git a/CommonAPI-Examples/E03Methods/fidl/E03Methods-SomeIP.fdepl b/CommonAPI-Examples/E03Methods/fidl/E03Methods-SomeIP.fdepl
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-SOMEIP_deployment_spec.fdepl"
+import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-4-SOMEIP_deployment_spec.fdepl"
 import "E03Methods.fidl"
 
 define org.genivi.commonapi.someip.deployment for interface commonapi.examples.E03Methods {
@@ -41,7 +41,7 @@ define org.genivi.commonapi.someip.deployment for interface commonapi.examples.E
     }
 }
 
-define org.genivi.commonapi.someip.deployment for provider Service {
+define org.genivi.commonapi.someip.deployment for provider as Service {
     instance commonapi.examples.E03Methods {
         InstanceId = "commonapi.examples.Methods"