diff options
author | Juergen Gehring <juergen.gehring@bmw.de> | 2014-04-15 17:19:18 +0200 |
---|---|---|
committer | Juergen Gehring <juergen.gehring@bmw.de> | 2014-04-15 17:19:18 +0200 |
commit | 7614027f7257507bb82f70b5f327e543720e7c73 (patch) | |
tree | bbdfc6567147a436f463de2179ef731750a9de50 | |
parent | 4a3faa0ed820f166b2deaa8e607b8e6a1e4a74bb (diff) | |
parent | ef79803750a5d94b1fd8017c3465e617a3832660 (diff) | |
download | genivi-common-api-runtime-7614027f7257507bb82f70b5f327e543720e7c73.tar.gz |
Merge branch 'master' of https://asc-repo.bmwgroup.net/gerrit/ascgit017.CommonAPI-Tools
21 files changed, 24 insertions, 24 deletions
diff --git a/org.genivi.commonapi.cli.product/pom.xml b/org.genivi.commonapi.cli.product/pom.xml index 3408fcb..017efe1 100644 --- a/org.genivi.commonapi.cli.product/pom.xml +++ b/org.genivi.commonapi.cli.product/pom.xml @@ -72,7 +72,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core.cli.feature/feature.xml b/org.genivi.commonapi.core.cli.feature/feature.xml index 90ed162..b58fe35 100644 --- a/org.genivi.commonapi.core.cli.feature/feature.xml +++ b/org.genivi.commonapi.core.cli.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.genivi.commonapi.core.cli.feature" label="CommonAPI Generator Feature" - version="2.1.5.qualifier" + version="2.1.6.qualifier" provider-name="BMW AG"> <requires> diff --git a/org.genivi.commonapi.core.cli.feature/pom.xml b/org.genivi.commonapi.core.cli.feature/pom.xml index 41d24e7..f2c66d3 100644 --- a/org.genivi.commonapi.core.cli.feature/pom.xml +++ b/org.genivi.commonapi.core.cli.feature/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core.cli/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.cli/META-INF/MANIFEST.MF index c094080..bbfa462 100644 --- a/org.genivi.commonapi.core.cli/META-INF/MANIFEST.MF +++ b/org.genivi.commonapi.core.cli/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: commonapi generator Console Interface Bundle-SymbolicName: org.genivi.commonapi.core.cli;singleton:=true -Bundle-Version: 2.1.5.qualifier +Bundle-Version: 2.1.6.qualifier Bundle-Activator: org.genivi.commonapi.core.cli.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.common, diff --git a/org.genivi.commonapi.core.cli/pom.xml b/org.genivi.commonapi.core.cli/pom.xml index dca08f0..6de7307 100644 --- a/org.genivi.commonapi.core.cli/pom.xml +++ b/org.genivi.commonapi.core.cli/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core.feature/feature.xml b/org.genivi.commonapi.core.feature/feature.xml index 156b841..a59d249 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.5.qualifier" + version="2.1.6.qualifier" provider-name="%providerName"> <copyright> diff --git a/org.genivi.commonapi.core.feature/pom.xml b/org.genivi.commonapi.core.feature/pom.xml index 40a3b86..282fcd3 100644 --- a/org.genivi.commonapi.core.feature/pom.xml +++ b/org.genivi.commonapi.core.feature/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF index 64dff65..b89ed62 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.5.qualifier +Bundle-Version: 2.1.6.qualifier Bundle-Activator: org.genivi.commonapi.core.ui.CommonApiUiPlugin Bundle-Vendor: BMW AG Require-Bundle: org.eclipse.ui, diff --git a/org.genivi.commonapi.core.ui/pom.xml b/org.genivi.commonapi.core.ui/pom.xml index 0ecbe93..186dd2f 100644 --- a/org.genivi.commonapi.core.ui/pom.xml +++ b/org.genivi.commonapi.core.ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core.validator.feature/feature.xml b/org.genivi.commonapi.core.validator.feature/feature.xml index d710a61..586ce8c 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.5.qualifier" + version="2.1.6.qualifier" provider-name="%providerName"> <copyright> diff --git a/org.genivi.commonapi.core.validator.feature/pom.xml b/org.genivi.commonapi.core.validator.feature/pom.xml index 8e8de99..c47055d 100644 --- a/org.genivi.commonapi.core.validator.feature/pom.xml +++ b/org.genivi.commonapi.core.validator.feature/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.validator/META-INF/MANIFEST.MF index 6091eae..bef7e61 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: General Bundle-Vendor: BMW AG Bundle-SymbolicName: org.genivi.commonapi.core.validator;singleton:=true -Bundle-Version: 2.1.5.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-Version: 2.1.6.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.ui, org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.resources, diff --git a/org.genivi.commonapi.core.validator/pom.xml b/org.genivi.commonapi.core.validator/pom.xml index bc8c197..d3ccbcd 100644 --- a/org.genivi.commonapi.core.validator/pom.xml +++ b/org.genivi.commonapi.core.validator/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core/META-INF/MANIFEST.MF b/org.genivi.commonapi.core/META-INF/MANIFEST.MF index da5e59f..8d111fe 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.5.qualifier +Bundle-Version: 2.1.6.qualifier Bundle-SymbolicName: org.genivi.commonapi.core;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.core.resources;bundle-version="3.8.0", diff --git a/org.genivi.commonapi.core/pom.xml b/org.genivi.commonapi.core/pom.xml index 40f8714..380401a 100644 --- a/org.genivi.commonapi.core/pom.xml +++ b/org.genivi.commonapi.core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.core/src-gen/org/genivi/commonapi/core/deployment/DeploymentInterfacePropertyAccessor.java b/org.genivi.commonapi.core/src-gen/org/genivi/commonapi/core/deployment/DeploymentInterfacePropertyAccessor.java index c0b418c..b2f0e5c 100644 --- a/org.genivi.commonapi.core/src-gen/org/genivi/commonapi/core/deployment/DeploymentInterfacePropertyAccessor.java +++ b/org.genivi.commonapi.core/src-gen/org/genivi/commonapi/core/deployment/DeploymentInterfacePropertyAccessor.java @@ -4,8 +4,8 @@ *******************************************************************************/ package org.genivi.commonapi.core.deployment; -import org.franca.core.franca.FInterface; import org.franca.core.franca.FEnumerationType; +import org.franca.core.franca.FInterface; import org.franca.deploymodel.core.FDeployedInterface; /** diff --git a/org.genivi.commonapi.parent.releng/pom.xml b/org.genivi.commonapi.parent.releng/pom.xml index 7a4c6c4..dae78c2 100644 --- a/org.genivi.commonapi.parent.releng/pom.xml +++ b/org.genivi.commonapi.parent.releng/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.parent.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <packaging>pom</packaging> <properties> <tycho-version>0.19.0</tycho-version> diff --git a/org.genivi.commonapi.releng/pom.xml b/org.genivi.commonapi.releng/pom.xml index db98ef0..b30458e 100644 --- a/org.genivi.commonapi.releng/pom.xml +++ b/org.genivi.commonapi.releng/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.parent.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.parent.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.target/pom.xml b/org.genivi.commonapi.target/pom.xml index 27dc8b0..34eb4fb 100644 --- a/org.genivi.commonapi.target/pom.xml +++ b/org.genivi.commonapi.target/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file diff --git a/org.genivi.commonapi.updatesite/category.xml b/org.genivi.commonapi.updatesite/category.xml index 1649ea4..c56c83f 100644 --- a/org.genivi.commonapi.updatesite/category.xml +++ b/org.genivi.commonapi.updatesite/category.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/org.genivi.commonapi.core.feature_2.1.5.qualifier.jar" id="org.genivi.commonapi.core.feature" version="2.1.5.qualifier"> + <feature url="features/org.genivi.commonapi.core.validator.feature_2.1.6.qualifier.jar" id="org.genivi.commonapi.core.validator.feature" version="2.1.6.qualifier"> <category name="GENIVI CommonAPI"/> </feature> - <feature url="features/org.genivi.commonapi.core.validator.feature_2.1.5.qualifier.jar" id="org.genivi.commonapi.core.validator.feature" version="2.1.5.qualifier"> + <feature url="features/org.genivi.commonapi.dbus.feature_2.1.6.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="2.1.6.qualifier"> <category name="GENIVI CommonAPI"/> </feature> - <feature url="features/org.genivi.commonapi.dbus.feature_2.1.5.qualifier.jar" id="org.genivi.commonapi.dbus.feature" version="2.1.5.qualifier"> + <feature url="features/org.genivi.commonapi.core.feature_2.1.6.qualifier.jar" id="org.genivi.commonapi.core.feature" version="2.1.6.qualifier"> <category name="GENIVI CommonAPI"/> </feature> <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators"> diff --git a/org.genivi.commonapi.updatesite/pom.xml b/org.genivi.commonapi.updatesite/pom.xml index 29c91ad..ab862ef 100644 --- a/org.genivi.commonapi.updatesite/pom.xml +++ b/org.genivi.commonapi.updatesite/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>commonapi</groupId> <artifactId>org.genivi.commonapi.releng</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <relativePath>../org.genivi.commonapi.releng</relativePath> </parent> </project>
\ No newline at end of file |