CommonAPI-SomeIP-Tools 3.1.10

COVESA · Nov 4, 2016 · 8d9344e · 8d9344e
1 parent 871f600
commit 8d9344e
Show file tree

Hide file tree

Showing 49 changed files with 1,311 additions and 188 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /build/*
 /doc
 /org.genivi.commonapi.someip.verification/fidl/ti_advanced_bselective.fdepl
+/org.genivi.commonapi.someip.verification/fidl/ti_advanced_extended.fdepl
 /org.genivi.commonapi.someip.verification/fidl/ti_advanced_managed.fdepl
 /org.genivi.commonapi.someip.verification/fidl/ti_advanced_polymorph.fdepl
 /org.genivi.commonapi.someip.verification/fidl/ti_communication.fdepl

diff --git a/CHANGES b/CHANGES
@@ -0,0 +1,10 @@
+Changes
+=======
+
+v3.1.10
+- Upgrade to JDK-1.8.
+- Explicitely set visibility for the deployments to enable linkage after compilation with -fvisibility=hidden.
+- Added new deployment parameter CRCWidth for attributes, broadcasts and methods.
+- Added config file to run tests with security. All clients are allowed to do everything and "credentials" (uid/gid) may need to be adjusted in order to run tests on different platforms depending on which user/group the tests started from.
+- Added filter in validator to avoid validation of interfaces deployed for the core or dbus.
+
diff --git a/CommonAPI-Examples/CMakeLists.txt b/CommonAPI-Examples/CMakeLists.txt
@@ -55,8 +55,8 @@ endif()
 message("CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
 message("COMMONAPI_INCLUDE_DIRS: ${COMMONAPI_INCLUDE_DIRS}")
 
-find_package (CommonAPI-SomeIP 3.1.9 REQUIRED)
-find_package (vsomeip 2.4.0 REQUIRED)
+find_package (CommonAPI-SomeIP 3.1.10 REQUIRED)
+find_package (vsomeip 2.5.0 REQUIRED)
 
 include_directories (
     ${COMMONAPI_INCLUDE_DIRS}

diff --git a/CommonAPI-Examples/commonapi.ini b/CommonAPI-Examples/commonapi.ini
@@ -2,21 +2,21 @@
 binding=someip
 
 [proxy]
-local:commonapi.someip.heartbeat:BMW.ATM=libsomeip-example-someip.so
-local:commonapi.someip.math:BMW.ATM=libsomeip-example-someip.so
-local:commonapi.someip.attr:BMW.ATM=libsomeip-attribute-example-someip.so
-local:commonapi.someip.attranonymtc:BMW.ATM=libsomeip-attributeanonymtc-example-someip.so
-local:commonapi.someip.attrnamedtc:BMW.ATM=libsomeip-attributenamedtc-example-someip.so
-local:commonapi.someip.Map:BMW.ATM=libsomeip-map-example-someip.so
-local:commonapi.someip.methodSample:BMW.ATM=libsomeip-methodSample-example-someip.so
-local:commonapi.serialization.Sample:BMW.ATM=libsomeip-serialization-example-someip.so
+local:commonapi.someip.heartbeat:v1_42:BMW.ATM=libsomeip-example-someip.so
+local:commonapi.someip.math:v1_42:BMW.ATM=libsomeip-example-someip.so
+local:commonapi.someip.attr:v1_42:BMW.ATM=libsomeip-attribute-example-someip.so
+local:commonapi.someip.attranonymtc:v1_42:BMW.ATM=libsomeip-attributeanonymtc-example-someip.so
+local:commonapi.someip.attrnamedtc:v1_42:BMW.ATM=libsomeip-attributenamedtc-example-someip.so
+local:commonapi.someip.Map:v1_0:BMW.ATM=libsomeip-map-example-someip.so
+local:commonapi.someip.methodSample:v1_0:BMW.ATM=libsomeip-methodSample-example-someip.so
+local:commonapi.serialization.Sample:v1_42:BMW.ATM=libsomeip-serialization-example-someip.so
 
 [stub]
-local:commonapi.someip.heartbeat:BMW.ATM=libsomeip-example-someip.so
-local:commonapi.someip.math:BMW.ATM=libsomeip-example-someip.so
-local:commonapi.someip.attr:BMW.ATM=libsomeip-attribute-example-someip.so
-local:commonapi.someip.attranonymtc:BMW.ATM=libsomeip-attributeanonymtc-example-someip.so
-local:commonapi.someip.attrnamedtc:BMW.ATM=libsomeip-attributenamedtc-example-someip.so
-local:commonapi.someip.Map:BMW.ATM=libsomeip-map-example-someip.so
-local:commonapi.someip.methodSample:BMW.ATM=libsomeip-methodSample-example-someip.so
-local:commonapi.serialization.Sample:BMW.ATM=libsomeip-serialization-example-someip.so
+local:commonapi.someip.heartbeat:v1_42:BMW.ATM=libsomeip-example-someip.so
+local:commonapi.someip.math:v1_42:BMW.ATM=libsomeip-example-someip.so
+local:commonapi.someip.attr:v1_42:BMW.ATM=libsomeip-attribute-example-someip.so
+local:commonapi.someip.attranonymtc:v1_42:BMW.ATM=libsomeip-attributeanonymtc-example-someip.so
+local:commonapi.someip.attrnamedtc:v1_42:BMW.ATM=libsomeip-attributenamedtc-example-someip.so
+local:commonapi.someip.Map:v1_0:BMW.ATM=libsomeip-map-example-someip.so
+local:commonapi.someip.methodSample:v1_0:BMW.ATM=libsomeip-methodSample-example-someip.so
+local:commonapi.serialization.Sample:v1_42:BMW.ATM=libsomeip-serialization-example-someip.so
diff --git a/INSTALL b/INSTALL
@@ -1,35 +1 @@
-= IPC CommonAPI SomeIP Tools C++
-
-:doctitle: IPC CommonAPI SomeIP Tools C++
-:version:
-
-== Copyright
-Copyright (C) 2015,2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
-Copyright (C) 2015,2016 GENIVI Alliance, Inc.
-
-This file is part of GENIVI Project IPC Common API C++.
-
-Contributions are licensed to the GENIVI Alliance under one or more Contribution License Agreements or MPL 2.0.
-
-== License
-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/.
-
-== Version
-{version}
-
-== CommonAPI C++ Specification and User Guide
-The specification document and the user guide can be found in the CommonAPI documentation directory of the CommonAPI-Tools project.
-
-== Further information
-Source code and latest news can be found at http://projects.genivi.org/commonapi/.
-
-== Build Instructions for Linux
-
-You can build all code generators by calling maven from the command-line. Open a console and change in the directory org.genivi.commonapi.someip.releng of your CommonAPI-Tools directory. Then call:
-----
-mvn -DCOREPATH=<path to your CommonAPI-Tools dir> -Dtarget.id=org.genivi.commonapi.someip.target clean verify
-----
-COREPATH is the directory, that contains the target definition folder: org.genivi.commonapi.core.target.
-
-
-After the successful build you will find the commond-line generators archived in org.genivi.commonapi.someip.cli.product/target/products/commonapi-generator.zip and the update-sites in org.genivi.commonapi.someip.updatesite/target.
+Please refer to README.md for the installation instructions.
diff --git a/docx/CommonAPISomeIPCppUserGuide b/docx/CommonAPISomeIPCppUserGuide
@@ -169,13 +169,17 @@ This kind of section determines how CommonAPI addresses are translated into SOME
 
 - +service+
 - +instance+
+- +major+
+- +minor+
 
 Example:
 
 ----
-[local:de.ABC:de.app1]
+[local:de.ABC:v1_1:de.app1]
 service=0x1234
 instance=0x5678
+major=1
+minor=2
 ----
 
 ==== Deployment

diff --git a/org.genivi.commonapi.releng/pom.xml b/org.genivi.commonapi.releng/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>commonapi</groupId>
     <artifactId>org.genivi.commonapi.releng</artifactId>
-    <version>3.1.9-SNAPSHOT</version>
+    <version>3.1.10-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
         <tycho-version>0.22.0</tycho-version>
@@ -13,7 +13,7 @@
         <xtend-version>2.7.3</xtend-version>
     </properties>
 
-    <pluginRepositories>    
+    <pluginRepositories>
         <pluginRepository>
             <id>sonatype</id>
             <url>http://repository.sonatype.org/content/groups/sonatype-public-grid/</url>
@@ -46,7 +46,7 @@
                         <artifact>
                             <groupId>commonapi</groupId>
                             <artifactId>${target.id}</artifactId>
-                            <version>3.1.9-SNAPSHOT</version>
+                            <version>3.1.10-SNAPSHOT</version>
                         </artifact>
                     </target>
                     <filters>
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
-                <version>${xtend-version}</version> 
+                <version>${xtend-version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/org.genivi.commonapi.someip.cli.feature/feature.xml b/org.genivi.commonapi.someip.cli.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.someip.cli.feature"
       label="CommonAPI Some/IP CLI Generator Feature"
-      version="3.1.9.qualifier"
+      version="3.1.10.qualifier"
       provider-name="BMW AG">
 
    <description url="http://www.example.com/description">

diff --git a/org.genivi.commonapi.someip.cli.feature/pom.xml b/org.genivi.commonapi.someip.cli.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.1.9-SNAPSHOT</version>
+        <version>3.1.10-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.someip.cli.product/commonapi_someip_cli.product b/org.genivi.commonapi.someip.cli.product/commonapi_someip_cli.product
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="CommonAPI Some/IP Code Generator" uid="org.genivi.commonapi.someip.cli.product" id="org.genivi.commonapi.someip.cli.product" application="org.genivi.commonapi.console.application" version="3.1.9" useFeatures="true" includeLaunchers="true">
+<product name="CommonAPI Some/IP Code Generator" uid="org.genivi.commonapi.someip.cli.product" id="org.genivi.commonapi.someip.cli.product" application="org.genivi.commonapi.console.application" version="3.1.10" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
 
    <launcherArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=1.7 -Xms512m -Xmx512m -XX:PermSize=128m
+      <vmArgs>-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx512m -XX:PermSize=128m
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -23,7 +23,10 @@
    </launcher>
 
    <vm>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
+      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
    </vm>
 
    <plugins>

diff --git a/org.genivi.commonapi.someip.cli.product/pom.xml b/org.genivi.commonapi.someip.cli.product/pom.xml
@@ -131,7 +131,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.1.9-SNAPSHOT</version>
+        <version>3.1.10-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.someip.cli/.classpath b/org.genivi.commonapi.someip.cli/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
-    <classpathentry kind="src" path="src" />
-    <classpathentry kind="output" path="bin" />
-</classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.genivi.commonapi.someip.cli/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.someip.cli/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.genivi.commonapi.someip.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.someip.cli/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: commonapi Some/IP generator Console Interface
 Bundle-SymbolicName: org.genivi.commonapi.someip.cli;singleton:=true
-Bundle-Version: 3.1.9.qualifier
+Bundle-Version: 3.1.10.qualifier
 Bundle-Activator: org.genivi.commonapi.someip.cli.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.9.0,0.10.0)";visibility:=reexport,
  org.genivi.commonapi.console,
- org.genivi.commonapi.someip;bundle-version="3.1.9",
- org.genivi.commonapi.someip.deployment.validator;bundle-version="3.1.9"
+ org.genivi.commonapi.someip;bundle-version="3.1.10",
+ org.genivi.commonapi.someip.deployment.validator;bundle-version="3.1.10"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
diff --git a/org.genivi.commonapi.someip.cli/pom.xml b/org.genivi.commonapi.someip.cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.1.9-SNAPSHOT</version>
+        <version>3.1.10-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.someip.deployment.validator/.classpath b/org.genivi.commonapi.someip.deployment.validator/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="xtend-gen"/>

diff --git a/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.someip.deployment.validator/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.genivi.commonapi.someip.deployment.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.someip.deployment.validator/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API Some/IP Deployment Validator
 Bundle-SymbolicName: org.genivi.commonapi.someip.deployment.validator;singleton:=true
-Bundle-Version: 3.1.9.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 3.1.10.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
 Export-Package: org.genivi.commonapi.someip.deployment.validator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0";visibility:=reexport,

diff --git a/org.genivi.commonapi.someip.deployment.validator/pom.xml b/org.genivi.commonapi.someip.deployment.validator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.someip.releng</artifactId>
-        <version>3.1.9-SNAPSHOT</version>
+        <version>3.1.10-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.someip.releng</relativePath>
     </parent>
 </project>