CommonAPI-Tools 3.1.33.1.3

3 files changed, 7 insertions, 69 deletions

diff --git a/CommonAPI-Examples/E01HelloWorld/CMakeLists.txt b/CommonAPI-Examples/E01HelloWorld/CMakeLists.txt
index 9971079..52e436a 100644
--- a/CommonAPI-Examples/E01HelloWorld/CMakeLists.txt
+++ b/CommonAPI-Examples/E01HelloWorld/CMakeLists.txt
@@ -29,11 +29,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.2 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.2 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI 3.1.3 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI-DBus 3.1.3 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
 else()
-    FIND_PACKAGE(CommonAPI 3.1.2 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
-    FIND_PACKAGE(CommonAPI-DBus 3.1.2 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI 3.1.3 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI-DBus 3.1.3 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
 endif()
 
 message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -61,8 +61,8 @@ else()
 endif()
 
 # SOME/IP
-find_package (CommonAPI-SomeIP 3.1.2 REQUIRED)
-find_package (vsomeip 1.2.0 REQUIRED)
+find_package (CommonAPI-SomeIP 3.1.3 REQUIRED)
+find_package (vsomeip 1.3.0 REQUIRED)
 
 # Source Files
 set(PRJ_SRC_PATH src)
diff --git a/CommonAPI-Examples/E01HelloWorld/fidl/E01HelloWorld.fdepl b/CommonAPI-Examples/E01HelloWorld/fidl/E01HelloWorld.fdepl
index 6d43ef0..0310e23 100644
--- a/CommonAPI-Examples/E01HelloWorld/fidl/E01HelloWorld.fdepl
+++ b/CommonAPI-Examples/E01HelloWorld/fidl/E01HelloWorld.fdepl
@@ -29,6 +29,6 @@ define org.genivi.commonapi.someip.deployment for provider Service {
 	
 		SomeIpUnicastAddress = "192.168.0.2"
 		SomeIpReliableUnicastPort = 30499
-		SomeIpUneliableUnicastPort = 30499
+		SomeIpUnreliableUnicastPort = 30499
 	}
 }
\ No newline at end of file
diff --git a/CommonAPI-Examples/E01HelloWorld/vsomeip.json b/CommonAPI-Examples/E01HelloWorld/vsomeip.json
deleted file mode 100644
index 60c2f12..0000000
--- a/CommonAPI-Examples/E01HelloWorld/vsomeip.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"unicast" : "192.168.56.101",
-	"logging" :
-	{
-		"level" : "debug",
-		"console" : "true",
-		"file" : { "enable" : "false", "path" : "/var/log/vsomeip.log" },
-		"dlt" : "false"
-	},
-	"applications" : 
-	[
-		{
-			"name" : "client-sample",
-			"id" : "0x1343"
-		},
-		{
-			"name" : "other-client-sample",
-			"id" : "0x1344"
-		},
-		{
-			"name" : "service-sample",
-			"id" : "0x1277"
-		}			
-	],
-	"servicegroups" :
-	[
-		{
-			"name" : "default",
-			"delays" :
-			{
-				"initial" : { "minimum" : "10", "maximum" : "100" },
-				"repetition-base" : "200",
-				"repetition-max" : "3",
-				"cyclic-offer" : "2000",
-				"cyclic-request" : "2001"
-			},
-			"services" :
-			[
-				{
-					"service" : "0x1234",
-					"instance" : "0x5678",
-					"reliable" : { "port" : "30509", "enable-magic-cookies" : "false" },
-					"unreliable" : "31000"
-				},
-				{
-					"service" : "0x1235",
-					"instance" : "0x5678",
-					"reliable" : { "port" : "30506", "enable-magic-cookies" : false },
-					"unreliable" : "31000"
-				}
-			]
-		}
-	],
-	"routing" : "client-sample",
-	"service-discovery" :
-	{
-		"enable" : "true",
-		"multicast" : "224.244.224.245",
-		"port" : "30490",
-		"protocol" : "udp"
-	}
-}