Set consistent 1.6 execution and build environment, version 2.1.22.1.2

11 files changed, 137 insertions, 129 deletions

diff --git a/org.genivi.commonapi.core.cli/.classpath b/org.genivi.commonapi.core.cli/.classpath
index 95df9ef..996ae2e 100644
--- a/org.genivi.commonapi.core.cli/.classpath
+++ b/org.genivi.commonapi.core.cli/.classpath
@@ -1,112 +1,112 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.genivi.commonapi.core"/>
-    <classpathentry kind="src" path="/org.genivi.commonapi.dbus"/>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/com.google.inject_3.0.0.v201203062045.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/com.google.inject.source_3.0.0.v201203062045.jar">
-        <accessrules>
-            <accessrule kind="accessible" pattern="com/google/inject/*"/>
-            <accessrule kind="accessible" pattern="com/google/inject/binder/*"/>
-            <accessrule kind="discouraged" pattern="com/google/inject/internal/*"/>
-            <accessrule kind="accessible" pattern="com/google/inject/matcher/*"/>
-            <accessrule kind="accessible" pattern="com/google/inject/name/*"/>
-            <accessrule kind="accessible" pattern="com/google/inject/spi/*"/>
-            <accessrule kind="accessible" pattern="com/google/inject/util/*"/>
-            <accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
-        </accessrules>
-    </classpathentry>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.common_2.9.1.v20130827-0309.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.common.source_2.9.1.v20130827-0309.jar">
-        <accessrules>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/common/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/common/archive/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/common/command/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/common/notify/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/common/notify/impl/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/common/util/*"/>
-            <accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
-        </accessrules>
-    </classpathentry>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.ecore_2.9.1.v20130827-0309.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.ecore.source_2.9.1.v20130827-0309.jar">
-        <accessrules>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/impl/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/plugin/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/resource/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/resource/impl/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/util/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/namespace/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/namespace/impl/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/namespace/util/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/impl/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/internal/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/util/*"/>
-            <accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
-        </accessrules>
-    </classpathentry>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.xtext_2.4.3.v201309030823.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.xtext.source_2.4.3.v201309030823.jar">
-        <accessrules>
-            <accessrule kind="accessible" pattern="org/eclipse/xtext/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/xtext/generator/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/xtext/resource/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/xtext/impl/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/xtext/linking/lazy/*"/>
-            <accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
-        </accessrules>
-    </classpathentry>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.codegen.ecore_2.9.1.v20130902-0605.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.codegen.ecore.source_2.9.1.v20130902-0605.jar">
-        <accessrules>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/generator/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/generator/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/impl/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/util/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/edit/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/editor/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/model/*"/>
-            <accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/model/tests/*"/>
-            <accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
-        </accessrules>
-    </classpathentry>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.franca.deploymodel.dsl_0.8.9.201308271211.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.franca.deploymodel.dsl_0.8.9.201308271211.jar">
-        <accessrules>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/core/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/fDeploy/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/fDeploy/impl/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/fDeploy/util/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/formatting/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/generator/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/parseTreeConstruction/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/parser/antlr/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/parser/antlr/internal/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/scoping/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/services/*"/>
-            <accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/validation/*"/>
-            <accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
-        </accessrules>
-    </classpathentry>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.franca.core.dsl_0.8.9.201308271211.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.franca.core.dsl_0.8.9.201308271211.jar">
-        <accessrules>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/formatting/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/parseTreeConstruction/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/parser/antlr/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/parser/antlr/internal/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/resource/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/scoping/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/services/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/validation/*"/>
-            <accessrule kind="accessible" pattern="org/franca/core/dsl/validation/util/*"/>
-            <accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
-        </accessrules>
-    </classpathentry>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/javax.inject_1.0.0.v20091030.jar"/>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.ecore.xmi_2.9.1.v20130827-0309.jar"/>
-    <classpathentry kind="lib" path="/home/lipci/log4j-1.2.17.jar"/>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.antlr.runtime_3.2.0.v201101311130.jar"/>
-    <classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.mwe2.language_2.4.1.v201309030840.jar"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="src" path="/org.genivi.commonapi.core"/>
+	<classpathentry kind="src" path="/org.genivi.commonapi.dbus"/>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/com.google.inject_3.0.0.v201203062045.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/com.google.inject.source_3.0.0.v201203062045.jar">
+		<accessrules>
+			<accessrule kind="accessible" pattern="com/google/inject/*"/>
+			<accessrule kind="accessible" pattern="com/google/inject/binder/*"/>
+			<accessrule kind="discouraged" pattern="com/google/inject/internal/*"/>
+			<accessrule kind="accessible" pattern="com/google/inject/matcher/*"/>
+			<accessrule kind="accessible" pattern="com/google/inject/name/*"/>
+			<accessrule kind="accessible" pattern="com/google/inject/spi/*"/>
+			<accessrule kind="accessible" pattern="com/google/inject/util/*"/>
+			<accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.common_2.9.1.v20130827-0309.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.common.source_2.9.1.v20130827-0309.jar">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/common/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/common/archive/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/common/command/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/common/notify/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/common/notify/impl/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/common/util/*"/>
+			<accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.ecore_2.9.1.v20130827-0309.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.ecore.source_2.9.1.v20130827-0309.jar">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/impl/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/plugin/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/resource/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/resource/impl/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/util/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/namespace/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/namespace/impl/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/namespace/util/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/impl/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/internal/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/ecore/xml/type/util/*"/>
+			<accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="/opt/eclipse-kepler/plugins/org.eclipse.xtext_2.4.2.v201306120542.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.xtext.source_2.4.3.v201309030823.jar">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/xtext/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/xtext/generator/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/xtext/resource/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/xtext/impl/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/xtext/linking/lazy/*"/>
+			<accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.codegen.ecore_2.9.1.v20130902-0605.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.codegen.ecore.source_2.9.1.v20130902-0605.jar">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/generator/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/generator/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/impl/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/genmodel/util/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/edit/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/editor/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/model/*"/>
+			<accessrule kind="accessible" pattern="org/eclipse/emf/codegen/ecore/templates/model/tests/*"/>
+			<accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.franca.deploymodel.dsl_0.8.9.201308271211.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.franca.deploymodel.dsl_0.8.9.201308271211.jar">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/core/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/fDeploy/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/fDeploy/impl/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/fDeploy/util/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/formatting/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/generator/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/parseTreeConstruction/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/parser/antlr/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/parser/antlr/internal/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/scoping/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/services/*"/>
+			<accessrule kind="accessible" pattern="org/franca/deploymodel/dsl/validation/*"/>
+			<accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.franca.core.dsl_0.8.9.201308271211.jar" sourcepath="/home/lipci/eclipse-kepler/plugins/org.franca.core.dsl_0.8.9.201308271211.jar">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/formatting/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/parseTreeConstruction/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/parser/antlr/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/parser/antlr/internal/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/resource/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/scoping/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/services/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/validation/*"/>
+			<accessrule kind="accessible" pattern="org/franca/core/dsl/validation/util/*"/>
+			<accessrule ignoreifbetter="true" kind="nonaccessible" pattern="**/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/javax.inject_1.0.0.v20091030.jar"/>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.ecore.xmi_2.9.1.v20130827-0309.jar"/>
+	<classpathentry kind="lib" path="/home/lipci/log4j-1.2.17.jar"/>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.antlr.runtime_3.2.0.v201101311130.jar"/>
+	<classpathentry kind="lib" path="/home/lipci/eclipse-kepler/plugins/org.eclipse.emf.mwe2.language_2.4.1.v201309030840.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.genivi.commonapi.core.feature/category.xml b/org.genivi.commonapi.core.feature/category.xml
index 4ca41a4..6840ead 100644
--- a/org.genivi.commonapi.core.feature/category.xml
+++ b/org.genivi.commonapi.core.feature/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.genivi.commonapi.core.feature_2.1.1.qualifier.jar" id="org.genivi.commonapi.core.feature" version="2.1.1.qualifier">
+   <feature url="features/org.genivi.commonapi.core.feature_2.1.2.qualifier.jar" id="org.genivi.commonapi.core.feature" version="2.1.2.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
-   <feature url="features/org.genivi.commonapi.core.validator.feature_2.1.1.qualifier.jar" id="org.genivi.commonapi.core.validator.feature" version="2.1.1.qualifier">
+   <feature url="features/org.genivi.commonapi.core.validator.feature_2.1.2.qualifier.jar" id="org.genivi.commonapi.core.validator.feature" version="2.1.2.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
    <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">
diff --git a/org.genivi.commonapi.core.feature/feature.xml b/org.genivi.commonapi.core.feature/feature.xml
index 06348b2..151be32 100644
--- a/org.genivi.commonapi.core.feature/feature.xml
+++ b/org.genivi.commonapi.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.core.feature"
       label="%featureName"
-      version="2.1.1.qualifier"
+      version="2.1.2.qualifier"
       provider-name="%providerName">
 
    <copyright>
@@ -27,7 +27,7 @@
       <import plugin="org.eclipse.xtext.ui" version="2.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui.ecore" version="2.4.0" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.genivi.commonapi.core" version="2.1.1" match="greaterOrEqual"/>
+      <import plugin="org.genivi.commonapi.core" version="2.1.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.genivi.commonapi.core.ui/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.core.ui/.settings/org.eclipse.jdt.core.prefs
index c537b63..8000cd6 100644
--- a/org.genivi.commonapi.core.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.genivi.commonapi.core.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF
index 193a264..bbd7ff4 100644
--- a/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API UI
 Bundle-SymbolicName: org.genivi.commonapi.core.ui;singleton:=true
-Bundle-Version: 2.1.1.qualifier
+Bundle-Version: 2.1.2.qualifier
 Bundle-Activator: org.genivi.commonapi.core.ui.CommonApiUiPlugin
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.ui,
@@ -14,9 +14,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.ui;bundle-version="2.4.0",
  org.eclipse.xtext.ui.ecore;bundle-version="2.4.0",
  com.google.inject;bundle-version="3.0.0",
- org.genivi.commonapi.core;bundle-version="2.1.1",
+ org.genivi.commonapi.core;bundle-version="2.1.2",
  org.eclipse.cdt.ui;bundle-version="5.5.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject,
  org.franca.core.dsl.validation,
diff --git a/org.genivi.commonapi.core.validator.feature/feature.xml b/org.genivi.commonapi.core.validator.feature/feature.xml
index b6b2b38..43fd68e 100644
--- a/org.genivi.commonapi.core.validator.feature/feature.xml
+++ b/org.genivi.commonapi.core.validator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.core.validator.feature"
       label="%featureName"
-      version="2.1.1.qualifier"
+      version="2.1.2.qualifier"
       provider-name="%providerName">
 
    <copyright>
@@ -14,7 +14,7 @@
    </license>
 
    <requires>
-      <import plugin="org.genivi.commonapi.core.ui" version="2.1.1" match="greaterOrEqual"/>
+      <import plugin="org.genivi.commonapi.core.ui" version="2.1.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.genivi.commonapi.core.validator/.classpath b/org.genivi.commonapi.core.validator/.classpath
index 098194c..ad32c83 100644
--- a/org.genivi.commonapi.core.validator/.classpath
+++ b/org.genivi.commonapi.core.validator/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.genivi.commonapi.core.validator/.settings/org.eclipse.jdt.core.prefs b/org.genivi.commonapi.core.validator/.settings/org.eclipse.jdt.core.prefs
index f42de36..8000cd6 100644
--- a/org.genivi.commonapi.core.validator/.settings/org.eclipse.jdt.core.prefs
+++ b/org.genivi.commonapi.core.validator/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF
index 4937d0f..cfa9e00 100644
--- a/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API validator
 Bundle-Vendor: BMW AG
 Bundle-SymbolicName: org.genivi.commonapi.core.validator;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Version: 2.1.2.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.resources,
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.xtext.ui;bundle-version="2.4.0",
  org.eclipse.xtext.ui.ecore;bundle-version="2.4.0",
  com.google.inject;bundle-version="3.0.0",
- org.genivi.commonapi.core;bundle-version="2.1.1",
- org.genivi.commonapi.core.ui;bundle-version="2.1.1"
+ org.genivi.commonapi.core;bundle-version="2.1.2",
+ org.genivi.commonapi.core.ui;bundle-version="2.1.2"
 Import-Package: org.eclipse.core.resources,
  org.franca.core.dsl.validation,
  org.franca.core.franca,
diff --git a/org.genivi.commonapi.core/.classpath b/org.genivi.commonapi.core/.classpath
index 8912ab2..f0ff324 100644
--- a/org.genivi.commonapi.core/.classpath
+++ b/org.genivi.commonapi.core/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="deployment"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/guava-14.0.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.genivi.commonapi.core/META-INF/MANIFEST.MF b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
index 4d26a50..f5dff0a 100644
--- a/org.genivi.commonapi.core/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API Generator
 Bundle-Vendor: BMW AG
-Bundle-Version: 2.1.1.qualifier
+Bundle-Version: 2.1.2.qualifier
 Bundle-SymbolicName: org.genivi.commonapi.core;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.resources;bundle-version="3.8.0",
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.8.0",
  org.franca.deploymodel.dsl;bundle-version="0.8.9",
  org.eclipse.jface
 Import-Package: javax.inject;version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.genivi.commonapi.core.deployment,
  org.genivi.commonapi.core.generator, org.genivi.commonapi.core.preferences
 Bundle-ClassPath: .,lib/guava-14.0.1.jar