capicxx-dbus-tools 3.2.14 (#14)

* capicxx-dbus-tools 3.2.14 - Generate D-bus Code fails using fidl - Fix reserve identifier error - Update dependencies - Update Generator to change the Parameter name "info" - Modify generation of TypeCollections without name - Accept Methods with Parameters with the same name - accept duplicate argument names for method in and out - Accept an Interface with a method with the same name - Adapt method signature to match CAPI 3.1 - Rework deployment handling - Adapt README and test/README,txt to new core generator name * Fix Copyright field and github link in README file
COVESA · Oct 23, 2023 · 08342d8 · 08342d8
1 parent bca2b5c
commit 08342d8
Show file tree

Hide file tree

Showing 35 changed files with 459 additions and 401 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,31 @@
 Changes
 =======
+v3.2.12
+- Generate D-bus Code fails using fidl
+
+v3.2.9
+- Fix reserve identifier error
+
+v3.2.8
+- Update dependencies
+
+v3.2.7
+- Update Generator to change the Parameter name "info"
+
+v3.2.6
+- Modify generation of TypeCollections without name
+- Accept Methods with Parameters with the same name
+- accept duplicate argument names for method in and out
+
+v3.2.5
+- Accept an Interface with a method with the same name
+
+v3.2.4
+- Adapt method signature to match CAPI 3.1
+
+v3.2.2
+- Rework deployment handling
+- Adapt README and test/README,txt to new core generator name
 
 v3.2.0
 - Adapted to CommonAPI 3.2.0

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 ### CommonAPI C++ D-Bus Tools
 
 ##### Copyright
-Copyright (C) 2015-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
-Copyright (C) 2015-2020 GENIVI Alliance, Inc.
+Copyright (C) 2015-2023, Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
+Copyright (C) 2015-2023, COVESA
 
-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.
+This file is part of COVESA Project IPC Common API C++.
+Contributions are licensed to the COVESA 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/.
@@ -14,7 +14,7 @@ This Source Code Form is subject to the terms of the Mozilla Public License, v.
 The specification document and the user guide can be found in the CommonAPI documentation directory of the CommonAPI-Tools project.
 
 ##### Further information
-https://genivi.github.io/capicxx-core-tools/
+https://covesa.github.io/capicxx-core-tools/
 
 ##### Build Instructions for Linux
 

diff --git a/org.genivi.commonapi.dbus.cli.feature/feature.xml b/org.genivi.commonapi.dbus.cli.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.cli.feature"
       label="GENIVI CommonAPI D-Bus Console Interface Feature"
-      version="3.2.0.qualifier"
+      version="3.2.14.qualifier"
       provider-name="BMW AG">
 
    <description url="http://www.example.com/description">

diff --git a/org.genivi.commonapi.dbus.cli.feature/pom.xml b/org.genivi.commonapi.dbus.cli.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product b/org.genivi.commonapi.dbus.cli.product/commonapi_dbus_cli.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="GENIVI CommonAPI D-Bus C++ Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.2.0" useFeatures="true" includeLaunchers="true">
+<product name="GENIVI CommonAPI D-Bus C++ Code Generator" uid="org.genivi.commonapi.dbus.cli.product" id="org.genivi.commonapi.dbus.cli.product" application="org.genivi.commonapi.console.application" version="3.2.14" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/org.genivi.commonapi.dbus.cli.product/pom.xml b/org.genivi.commonapi.dbus.cli.product/pom.xml
@@ -144,7 +144,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.cli/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI D-Bus Console Interface
 Bundle-SymbolicName: org.genivi.commonapi.dbus.cli;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.14.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.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.13.1,0.14.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.13.1,0.14.0)";visibility:=reexport,
- org.genivi.commonapi.console;bundle-version="3.2.0",
- org.genivi.commonapi.dbus;bundle-version="3.2.0"
+ org.genivi.commonapi.console;bundle-version="3.2.14",
+ org.genivi.commonapi.dbus;bundle-version="3.2.14"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG

diff --git a/org.genivi.commonapi.dbus.cli/pom.xml b/org.genivi.commonapi.dbus.cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.cli/src/org/genivi/commonapi/dbus/cli/DBusCommandlineToolMain.java b/org.genivi.commonapi.dbus.cli/src/org/genivi/commonapi/dbus/cli/DBusCommandlineToolMain.java
@@ -24,6 +24,7 @@
 import org.genivi.commonapi.console.ConsoleLogger;
 import org.genivi.commonapi.core.generator.GeneratorFileSystemAccess;
 import org.genivi.commonapi.core.verification.CommandlineValidator;
+import org.genivi.commonapi.core.verification.ValidateElements;
 import org.genivi.commonapi.core.verification.ValidatorCore;
 import org.genivi.commonapi.dbus.generator.FrancaDBusGenerator;
 import org.genivi.commonapi.dbus.preferences.FPreferencesDBus;
@@ -42,6 +43,7 @@ public class DBusCommandlineToolMain extends CommandlineTool {
 	protected Injector injector;
 	protected IGenerator francaGenerator;
 	protected String SCOPE = "DBus validation: ";
+	private ValidateElements validateElements = new ValidateElements();
 
 	private ValidationMessageAcceptor cliMessageAcceptor = new AbstractValidationMessageAcceptor() {
 
@@ -184,6 +186,8 @@ public void validateDBus(Resource resource) {
 
 		if (model != null) {
 			if (model instanceof FDModel) {
+				validateElements.verifyEqualInOutAndAddSuffix((FDModel) model);
+
 				// check existence of imported fidl/fdepl files
 				cliValidator.validateImports((FDModel) model, resource.getURI());
 
@@ -192,6 +196,8 @@ public void validateDBus(Resource resource) {
 			}
 			// check existence of imported fidl/fdepl files
 			if (model instanceof FModel) {
+				validateElements.verifyEqualInOutAndAddSuffix((FModel) model);
+
 				cliValidator.validateImports((FModel) model, resource.getURI());
 
 				// validate against GENIVI rules

diff --git a/org.genivi.commonapi.dbus.feature/feature.xml b/org.genivi.commonapi.dbus.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.feature"
       label="%featureName"
-      version="3.2.0.qualifier"
+      version="3.2.14.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.feature/pom.xml b/org.genivi.commonapi.dbus.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.releng/pom.xml b/org.genivi.commonapi.dbus.releng/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
     <repositories>

diff --git a/org.genivi.commonapi.dbus.target/org.genivi.commonapi.dbus.target.target b/org.genivi.commonapi.dbus.target/org.genivi.commonapi.dbus.target.target
@@ -11,7 +11,7 @@
 <repository location="http://download.eclipse.org/releases/2018-09"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.11.0.v20170201-0242"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/>
 <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -24,6 +24,18 @@
 <unit id="org.franca.ui.sdk.feature.group" version="0.13.1.201807231814"/>
 <repository location="http://franca.github.io/franca/update_site/releases"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+<unit id="org.apache.commons.cli" version="1.4.0.v20200417-1444"/>
+<unit id="org.eclipse.emf.mwe.core" version="1.7.0.v20220519-1115"/>
+<unit id="org.eclipse.emf.mwe.utils" version="1.7.0.v20220519-1115"/>
+<unit id="org.eclipse.emf.mwe2.runtime" version="2.13.0.v20220519-1115"/>	
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
+</location>
+<!-- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> 
+<unit id="com.google.inject" version="3.0.0.v201605172100"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-03"/>
+</location> -->
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 </target>
diff --git a/org.genivi.commonapi.dbus.target/pom.xml b/org.genivi.commonapi.dbus.target/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI D-Bus UI
 Bundle-SymbolicName: org.genivi.commonapi.dbus.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.14.qualifier
 Bundle-Activator: org.genivi.commonapi.dbus.ui.CommonApiDBusUiPlugin
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.ui,
@@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.ui.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- com.google.inject;bundle-version="3.0.0",
- org.genivi.commonapi.core.ui;bundle-version="3.2.0";visibility:=reexport,
- org.genivi.commonapi.dbus;bundle-version="3.2.0";visibility:=reexport,
+ com.google.inject;bundle-version="[5.0.1,6.0.0)";visibility:=reexport,
+ org.genivi.commonapi.core.ui;bundle-version="3.2.14";visibility:=reexport,
+ org.genivi.commonapi.dbus;bundle-version="3.2.14";visibility:=reexport,
  org.franca.core.dsl.ui;bundle-version="[0.13.1,0.14.0)",
  org.franca.deploymodel.dsl.ui;bundle-version="[0.13.1,0.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/org.genivi.commonapi.dbus.ui/pom.xml b/org.genivi.commonapi.dbus.ui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.updatesite/category.xml b/org.genivi.commonapi.dbus.updatesite/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.genivi.commonapi.core.validator.feature_3.2.0.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.2.0.qualifier">
+   <feature url="features/org.genivi.commonapi.core.validator.feature_3.2.14.qualifier.jar" id="org.genivi.commonapi.dbus.validator.feature" version="3.2.14.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
-   <feature url="features/org.genivi.commonapi.dbus.feature_3.2.0.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.2.0.qualifier">
+   <feature url="features/org.genivi.commonapi.dbus.feature_3.2.14.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="3.2.14.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
    <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">

diff --git a/org.genivi.commonapi.dbus.updatesite/pom.xml b/org.genivi.commonapi.dbus.updatesite/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator.feature/feature.xml b/org.genivi.commonapi.dbus.validator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.dbus.validator.feature"
       label="%featureName"
-      version="3.2.0.qualifier"
+      version="3.2.14.qualifier"
       provider-name="%providerName">
 
    <copyright>

diff --git a/org.genivi.commonapi.dbus.validator.feature/pom.xml b/org.genivi.commonapi.dbus.validator.feature/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus.validator/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI D-Bus Validator
 Bundle-SymbolicName: org.genivi.commonapi.dbus.validator;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.14.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.xtext.builder;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.2.0";visibility:=reexport,
- org.genivi.commonapi.dbus.ui;bundle-version="3.2.0";visibility:=reexport
+ org.genivi.commonapi.core;bundle-version="3.2.14";visibility:=reexport,
+ org.genivi.commonapi.dbus.ui;bundle-version="3.2.14";visibility:=reexport
 Export-Package: org.genivi.commonapi.dbus.validator
 Automatic-Module-Name: org.genivi.commonapi.dbus.validator
diff --git a/org.genivi.commonapi.dbus.validator/pom.xml b/org.genivi.commonapi.dbus.validator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>
diff --git a/...ivi.commonapi.dbus.validator/src/org/genivi/commonapi/dbus/validator/ValidatorDBusUi.java b/...ivi.commonapi.dbus.validator/src/org/genivi/commonapi/dbus/validator/ValidatorDBusUi.java
@@ -8,6 +8,7 @@
 import org.genivi.commonapi.dbus.verification.ValidatorDBus;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
+import org.genivi.commonapi.core.verification.ValidateElements;
 import org.genivi.commonapi.dbus.preferences.PreferenceConstantsDBus;
 import org.genivi.commonapi.dbus.ui.CommonApiDBusUiPlugin;
 import org.genivi.commonapi.dbus.validator.preference.ValidatorDBusPreferencesPage;
@@ -17,12 +18,17 @@
  */
 public class ValidatorDBusUi extends ValidatorDBus {
 
+    private ValidateElements validateElements = new ValidateElements();
+
     @Override
     public void validateModel(FModel model,
             ValidationMessageAcceptor messageAcceptor) {
         if (!isValidatorEnabled()) {
             return;
         }
+
+        validateElements.verifyEqualInOutAndAddSuffix(model);
+
         super.validateModel(model, messageAcceptor);
     }
 

diff --git a/org.genivi.commonapi.dbus.verification/README b/org.genivi.commonapi.dbus.verification/README
@@ -58,7 +58,7 @@ export LD_LIBRARY_PATH=$(readlink -f ../../../ascgit017.CommonAPI-D-Bus/patched-
 export LIBRARY_PATH=$(readlink -f ../../../ascgit017.CommonAPI-D-Bus/patched-dbus/lib)
 
 cmake \
--DCOMMONAPI_TOOL_GENERATOR=$(readlink -f ../../../ascgit017.CommonAPI-Tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86_64/commonapi-generator-linux-x86_64) \
+-DCOMMONAPI_TOOL_GENERATOR=$(readlink -f ../../../ascgit017.CommonAPI-Tools/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86_64/commonapi-core-generator-linux-x86_64) \
 -DCOMMONAPI_DBUS_TOOL_GENERATOR=$(readlink -f ../../../ascgit017.CommonAPI-D-Bus-Tools/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86_64/commonapi-dbus-generator-linux-x86_64) \
 -DCommonAPI_DIR=$(readlink -f ../../../ascgit017.CommonAPI/build) \
 -DCommonAPI-DBus_DIR=$(readlink -f ../../../ascgit017.CommonAPI-D-Bus/build) \

diff --git a/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF b/org.genivi.commonapi.dbus/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI CommonAPI D-Bus C++ Generator
 Bundle-Vendor: BMW AG
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.14.qualifier
 Bundle-SymbolicName: org.genivi.commonapi.dbus;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.xtext.generator;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.util;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.franca.core.dsl;bundle-version="[0.13.1,0.14.0)";visibility:=reexport,
  org.franca.deploymodel.dsl;bundle-version="[0.13.1,0.14.0)";visibility:=reexport,
- org.genivi.commonapi.core;bundle-version="3.2.0";visibility:=reexport,
+ org.genivi.commonapi.core;bundle-version="3.2.14";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.genivi.commonapi.dbus.generator,

diff --git a/org.genivi.commonapi.dbus/deployment/CommonAPI-4-DBus_deployment_spec.fdepl b/org.genivi.commonapi.dbus/deployment/CommonAPI-4-DBus_deployment_spec.fdepl
@@ -55,14 +55,14 @@ specification org.genivi.commonapi.dbus.deployment extends org.genivi.commonapi.
         /*
          * define mapping of specific Franca attribute to D-Bus signal/freedesktop property.
          */
-        DBusAttributeType:             {CommonAPI, freedesktop}      (default: CommonAPI);
+        DBusAttributeType:             {CommonAPI, freedesktop}      (optional);
     }
 
 	for strings {
-		IsObjectPath: Boolean (default: false);
+		IsObjectPath: Boolean (optional);
 	}
 	for unions {
-		DBusVariantType: {DBus, CommonAPI} (default: CommonAPI);
+		DBusVariantType: {DBus, CommonAPI} (default: DBus);
 	}
 
     for integers {

diff --git a/org.genivi.commonapi.dbus/pom.xml b/org.genivi.commonapi.dbus/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>commonapi</groupId>
         <artifactId>org.genivi.commonapi.dbus.releng</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.14-SNAPSHOT</version>
         <relativePath>../org.genivi.commonapi.dbus.releng</relativePath>
     </parent>
 </project>