From 95910698200a58d0433161b0c7f55a1a2d72b349 Mon Sep 17 00:00:00 2001 From: Henrik Rentz-Reichert Date: Fri, 9 Feb 2018 10:07:30 +0100 Subject: version set to 1.1.2.qualifier In MANIFEST.MF and pom.xml. Change-Id: Ie4a30464d11840833c5620c26b01b93f09020929 --- .../META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.generator.c.tests/.gitignore | 6 +++++- tests/org.eclipse.etrice.generator.cpp.tests/.gitignore | 6 +++++- .../META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.generator.java.tests/.gitignore | 7 ++++++- tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF | 2 +- tests/pom.xml | 2 +- 18 files changed, 31 insertions(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF index 9df90ecd8..2cc8902a8 100644 --- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Abstract Execution for Behavior Tests Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.tests.Activator Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF index f9f2bcc31..bce22359d 100644 --- a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for common eTrice grammar fragments and classes Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.common.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.common, diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF index 084f11a02..54dd5967f 100644 --- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Config DSL Tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF index f086a87d4..90347af62 100644 --- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etmap.tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etmap.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF index 4bc3f4084..1ce419aea 100644 --- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.core.etphys.tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etphys.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF index 596021e5b..068c6f68a 100644 --- a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: FSM DSL Tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.fsm.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.core.common, diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF index 15be3c948..c9c89cc65 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF index c6acb3d89..1cf33eda0 100644 --- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Room Core Tests Bundle-SymbolicName: org.eclipse.etrice.core.room.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF index ca57051da..5bd97853d 100644 --- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: etUnit Converter Tests Bundle-SymbolicName: org.eclipse.etrice.etunit.converter.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.etunit.converter.tests.Activator Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.generator.c.tests/.gitignore b/tests/org.eclipse.etrice.generator.c.tests/.gitignore index b45c5f774..ac261cd82 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.c.tests/.gitignore @@ -1 +1,5 @@ -src-gen/ \ No newline at end of file +src-gen/ +bin +models/* +output +results diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore b/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore index b45c5f774..ac261cd82 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore @@ -1 +1,5 @@ -src-gen/ \ No newline at end of file +src-gen/ +bin +models/* +output +results diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF index ca35ad64f..6f74f62be 100644 --- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.etrice.generator.fsmtest.tests Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.generator.java.tests/.gitignore b/tests/org.eclipse.etrice.generator.java.tests/.gitignore index b45c5f774..e13c0a3a4 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.java.tests/.gitignore @@ -1 +1,6 @@ -src-gen/ \ No newline at end of file +src-gen/ +bin +models/* +output +results +*.obj diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF index 745edf6b5..1f075d0ca 100644 --- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Generator Model Tests Bundle-SymbolicName: org.eclipse.etrice.generator.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF index edc780d96..3a2f893b3 100644 --- a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Diagram Test Base Classes Bundle-SymbolicName: org.eclipse.etrice.ui.base.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Require-Bundle: org.junit;bundle-version="4.8.1", org.eclipse.core.runtime, org.eclipse.etrice.core.room;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF index c8f7920c5..bd9b28410 100644 --- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Behavior Diagram Tests Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator Bundle-Vendor: Eclipse eTrice Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF index 6ab01c2a4..bda2df996 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: eTrice Structure Diagram Tests Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.etrice.ui.structure;bundle-version="1.1.1", diff --git a/tests/pom.xml b/tests/pom.xml index 4376835cb..e1284f505 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ org.eclipse.etrice org.eclipse.etrice.parent - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT ../releng/org.eclipse.etrice.parent org.eclipse.etrice -- cgit v1.2.3 From 59289a739edeaa47aed600593c0e7d364f40bff8 Mon Sep 17 00:00:00 2001 From: Henrik Rentz-Reichert Date: Fri, 9 Feb 2018 11:53:59 +0100 Subject: version set to 1.1.2.qualifier also in dependencies and features In MANIFEST.MF, feature.xml, category.xml and pom.xml. Change-Id: Id4d6e8d147e97f57545c88e971bc04331529fcd4 --- .../META-INF/MANIFEST.MF | 10 +++++----- examples/my.etrice.generator/META-INF/MANIFEST.MF | 10 +++++----- .../feature.xml | 2 +- features/org.eclipse.etrice.feature/feature.xml | 2 +- .../org.eclipse.etrice.fsm.feature/feature.xml | 2 +- .../org.eclipse.etrice.tests.feature/feature.xml | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 12 ++++++------ .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 8 ++++---- .../META-INF/MANIFEST.MF | 12 ++++++------ .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 16 ++++++++-------- .../META-INF/MANIFEST.MF | 12 ++++++------ .../META-INF/MANIFEST.MF | 14 +++++++------- .../META-INF/MANIFEST.MF | 12 ++++++------ .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 22 +++++++++++----------- .../META-INF/MANIFEST.MF | 14 +++++++------- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 12 ++++++------ .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 20 ++++++++++---------- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 20 ++++++++++---------- .../META-INF/MANIFEST.MF | 12 ++++++------ .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 10 +++++----- releng/org.eclipse.etrice.site/category.xml | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 10 +++++----- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 16 ++++++++-------- .../META-INF/MANIFEST.MF | 12 ++++++------ 53 files changed, 217 insertions(+), 217 deletions(-) (limited to 'tests') diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF index 1e79dbcb8..2451e2c20 100644 --- a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: my.etrice.generator.launch;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: my.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch.java;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch.java;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", org.eclipse.debug.ui;bundle-version="3.8.1", org.eclipse.swt;bundle-version="3.100.1", org.eclipse.core.runtime;bundle-version="3.8.0", diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF index 78c3def1b..52e695383 100644 --- a/examples/my.etrice.generator/META-INF/MANIFEST.MF +++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: Derived Generator Bundle-SymbolicName: my.etrice.generator Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", com.google.inject;bundle-version="3.0.0" Export-Package: my.etrice.generator diff --git a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml index 97c277b16..5777cf74d 100644 --- a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml +++ b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml @@ -17,7 +17,7 @@ diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml index 80e0a9f0c..492a80e6a 100644 --- a/features/org.eclipse.etrice.tests.feature/feature.xml +++ b/features/org.eclipse.etrice.tests.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF index acc2a6934..2a4c3df91 100644 --- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", org.eclipse.emf.ecore;bundle-version="2.7.0", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.core.runtime diff --git a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF index a123fe28a..267dd8580 100644 --- a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.config.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.config;bundle-version="1.1.1";visibility:=reexport, +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.config;bundle-version="1.1.2";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF index 191956096..b726befc5 100644 --- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.config; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport, org.apache.log4j;bundle-version="1.2.15";visibility:=reexport, diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF index 6aea368e4..9c6d757ff 100644 --- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etmap.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", @@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.antlr.runtime, org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0", org.eclipse.compare, - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1" + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etmap.ui, diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF index 638c386ed..530524c02 100644 --- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etmap; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport, org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF index 1316df5a5..0b3cd9cf9 100644 --- a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etphys.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1";visibility:=reexport, +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.antlr.runtime, org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0", org.eclipse.compare, - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1" + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist, diff --git a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF index 3175d47ea..5f6eb56f9 100644 --- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etphys; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, org.antlr.runtime, @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", org.eclipse.xtext.util;bundle-version="2.6.0", org.eclipse.emf.ecore, org.eclipse.emf.common, - org.eclipse.etrice.core.common;bundle-version="1.1.1", + org.eclipse.etrice.core.common;bundle-version="1.1.2", org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j, org.eclipse.xtext.xbase.lib diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF index ecd76ac4d..c6a2b4d67 100644 --- a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.fsm.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", org.eclipse.etrice.core.fsm;visibility:=reexport, org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", diff --git a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF index 7350d5f71..cd8432c93 100644 --- a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.fsm; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport, org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF index d4358df17..b86a29f62 100644 --- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport, - org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport, + org.eclipse.etrice.core.fsm;bundle-version="1.1.2";visibility:=reexport, org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF index 2acdd37a8..efaf169da 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF @@ -13,10 +13,10 @@ Export-Package: org.eclipse.etrice.core.genmodel, org.eclipse.etrice.core.genmodel.etricegen.impl, org.eclipse.etrice.core.genmodel.etricegen.util, org.eclipse.etrice.core.genmodel.util -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.room;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1";visibility:=reexport, +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.fsm;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.room;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2";visibility:=reexport, org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF index 7366f0f27..301b18d8b 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.room.ui;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1";visibility:=reexport, - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2";visibility:=reexport, + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.doc;bundle-version="1.1.2", org.eclipse.ui;bundle-version="3.6.0", org.eclipse.ui.editors;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", diff --git a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF index 2a6e42781..6d83a704f 100644 --- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.room;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional, org.eclipse.xtext.util;bundle-version="2.6.0", diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF index 7beec0216..cbd523bc7 100644 --- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF @@ -5,17 +5,17 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0", - org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.1" + org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.2" Import-Package: org.apache.log4j Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.c, diff --git a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF index 3fb7353c1..a02d7e180 100644 --- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF @@ -6,12 +6,12 @@ Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.config;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.config;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", com.google.guava;bundle-version="8.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.6.0" diff --git a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF index f0345a8c4..7fa447bb6 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.cpp;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0" diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF index e65d2c519..2361f0f63 100644 --- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.doc;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.ui;bundle-version="3.7.0", diff --git a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF index 4544a7063..f18f70f68 100644 --- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF @@ -7,8 +7,8 @@ Bundle-Vendor: eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.fsm.base, org.eclipse.etrice.generator.fsm.generic -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.2", org.eclipse.emf;bundle-version="2.6.0", org.apache.commons.io;bundle-version="2.0.1", org.eclipse.core.resources, diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF index fcb3b5d21..8c36a7b7f 100644 --- a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF @@ -6,17 +6,17 @@ Bundle-Version: 1.1.2.qualifier Export-Package: org.eclipse.etrice.generator.gnuplot Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtend.lib;bundle-version="2.6.0", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", - org.eclipse.etrice.core.config;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", + org.eclipse.etrice.core.config;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", org.eclipse.core.runtime;bundle-version="3.10.0", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", - org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1" + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", + org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF index 44426641b..9f8b5e72f 100644 --- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.java;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.config;bundle-version="1.1.1", - org.eclipse.etrice.generator.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.config;bundle-version="1.1.2", + org.eclipse.etrice.generator.doc;bundle-version="1.1.2", org.eclipse.xtend.lib;bundle-version="2.6.0", org.eclipse.xtext.generator;bundle-version="2.6.0", org.eclipse.xtext.util;bundle-version="2.6.0" diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF index ef7f79c83..5c9872b0d 100644 --- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: eTrice C Generator Launcher Bundle-SymbolicName: org.eclipse.etrice.generator.launch.c;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.c.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.c;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.c;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.core, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.core.variables;bundle-version="3.2.500", - org.eclipse.etrice.generator.ui;bundle-version="1.1.1" + org.eclipse.etrice.generator.ui;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF index e6aaee1f4..7409640f6 100644 --- a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: eTrice Cpp Generator Launcher Bundle-SymbolicName: org.eclipse.etrice.generator.launch.cpp;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.cpp.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.cpp;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.cpp;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.core, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.core.variables;bundle-version="3.2.500", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1" + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF index aa4a187a4..ebbefa8eb 100644 --- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: eTrice Java Generator Launcher Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.java;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.java;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.core, @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.core.variables;bundle-version="3.2.500", - org.eclipse.etrice.generator.ui;bundle-version="1.1.1" + org.eclipse.etrice.generator.ui;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.jdt.launching, diff --git a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF index e65ee0de8..a2f1650cc 100644 --- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF @@ -4,12 +4,12 @@ Bundle-Name: eTrice Generator Launch Base Classes Bundle-SymbolicName: org.eclipse.etrice.generator.launch;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.generator.launch.Activator -Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", - org.eclipse.etrice.generator.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", + org.eclipse.etrice.generator.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.ui.console, org.eclipse.xtext.ui.shared;bundle-version="2.6.0", diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF index 78dd11d1b..6a5e9a3c7 100644 --- a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.etrice.generator.ui.cdt;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.2", org.eclipse.cdt.core;bundle-version="5.5.0", org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.0", org.eclipse.equinox.common;bundle-version="3.6.200", diff --git a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF index 95fd86129..08bc1caa3 100644 --- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF @@ -5,27 +5,27 @@ Bundle-SymbolicName: org.eclipse.etrice.generator.ui;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.runtime;bundle-version="1.1.1", - org.eclipse.etrice.core.common;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.runtime;bundle-version="1.1.2", + org.eclipse.etrice.core.common;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.ui, org.apache.log4j;bundle-version="1.2.15", org.eclipse.core.resources;bundle-version="3.8.100", org.eclipse.emf.ecore;bundle-version="2.9.0", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", org.eclipse.jdt.core;bundle-version="3.9.0", org.eclipse.jdt.launching;bundle-version="3.7.0", org.eclipse.ui.ide;bundle-version="3.9.0", org.eclipse.xtext.xbase.lib;bundle-version="2.6.0", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtext.ui;bundle-version="2.6.0", - org.eclipse.etrice.generator;bundle-version="1.1.1" + org.eclipse.etrice.generator;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.etrice.generator.ui.Activator Export-Package: org.eclipse.etrice.generator.ui.configurator, diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF index 448aa59c5..e7f81905d 100644 --- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF @@ -8,11 +8,11 @@ Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.etrice.generator.base, org.eclipse.etrice.generator.generic -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etphys;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etphys;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport, org.eclipse.emf.ecore.xmi;bundle-version="2.5.0", diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF index 6449b7d13..37bb22c07 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: ROOM Action Code Editor Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.actioneditor;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.actioneditor.Activator -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.common, @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", org.eclipse.xtext.xbase.lib, org.eclipse.ui.workbench.texteditor, org.eclipse.etrice.core.room.ui, - org.eclipse.etrice.expressions.ui;bundle-version="1.1.1" + org.eclipse.etrice.expressions.ui;bundle-version="1.1.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.behavior.actioneditor, diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF index 5c078e391..e8431bec1 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF @@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.fsm;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.fsm.Activator Bundle-Vendor: eTrice -Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.graphiti.ui;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", org.eclipse.xtext.ui;bundle-version="2.7.0", org.eclipse.xtend.lib;bundle-version="2.7.0", org.eclipse.xtext.ui.shared;bundle-version="2.7.0", - org.eclipse.etrice.expressions.ui;bundle-version="1.1.1" + org.eclipse.etrice.expressions.ui;bundle-version="1.1.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.etrice.ui.behavior.fsm.actioneditor, diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF index 0662063ce..52601142d 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF @@ -4,13 +4,13 @@ Bundle-Name: Actor Behavior Diagram Editor Bundle-SymbolicName: org.eclipse.etrice.ui.behavior;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.Activator -Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.graphiti.ui;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", @@ -19,9 +19,9 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", org.eclipse.emf.transaction;bundle-version="1.4.0", org.eclipse.xtext.ui;bundle-version="2.6.0", org.eclipse.xtext.ui.shared;bundle-version="2.6.0", - org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", - org.eclipse.etrice.expressions.ui;bundle-version="1.1.1" + org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", + org.eclipse.etrice.expressions.ui;bundle-version="1.1.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice diff --git a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF index c3ec5bcdf..e5e41618c 100644 --- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-SymbolicName: org.eclipse.etrice.ui.commands; singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.commands.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", org.eclipse.xtext.ui;bundle-version="2.6.0", diff --git a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF index 3a9eab540..62f339de5 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.etrice.ui.common.base;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.common.base.UIBaseActivator Bundle-Vendor: eTrice -Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1", - org.eclipse.etrice.doc;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.2", + org.eclipse.etrice.doc;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.transaction;bundle-version="1.4.0", diff --git a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF index 2c46e5c19..3e9c5f083 100644 --- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.etrice.ui.common;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", org.eclipse.emf.transaction;bundle-version="1.4.0", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.ui.ide;bundle-version="3.6.0", diff --git a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF index fda508d35..14e8895a8 100644 --- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.etrice.ui.structure;singleton:=true Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.structure.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room.ui;bundle-version="1.1.1", - org.eclipse.etrice.core.common.ui;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room.ui;bundle-version="1.1.2", + org.eclipse.etrice.core.common.ui;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.graphiti.ui;bundle-version="0.8.0", org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100", diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml index 134e911aa..e1c064804 100644 --- a/releng/org.eclipse.etrice.site/category.xml +++ b/releng/org.eclipse.etrice.site/category.xml @@ -1,9 +1,9 @@ - + - + diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF index 2cc8902a8..94311030a 100644 --- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior.tests Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.tests.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.emf.ecore;bundle-version="2.7.0", com.google.inject;bundle-version="3.0.0", diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF index 54dd5967f..104c3c37c 100644 --- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.1", - org.eclipse.etrice.core.config.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.2", + org.eclipse.etrice.core.config.ui;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.xtext.junit4;bundle-version="2.6.0", diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF index 90347af62..7eaadbdaa 100644 --- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etmap.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1", - org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.2", + org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.xtext.junit4;bundle-version="2.6.0", org.eclipse.ui.workbench;resolution:=optional, diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF index 1ce419aea..424d80168 100644 --- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.etphys.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.2", org.eclipse.etrice.core.etphys.ui, org.eclipse.core.runtime, org.eclipse.xtext.junit4;bundle-version="2.6.0", diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF index c9c89cc65..69d1adcc5 100644 --- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Eclipse eTrice Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.genmodel;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.genmodel;bundle-version="1.1.2", org.junit;bundle-version="4.8.1", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.core.runtime;bundle-version="3.7.0" diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF index 1cf33eda0..f7f9e5180 100644 --- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.etrice.core.room.tests Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", org.junit;bundle-version="4.8.1", org.eclipse.xtext.junit4, org.eclipse.xtext.xbase.junit, diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF index 5bd97853d..04a4ece99 100644 --- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.etrice.etunit.converter.tests Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.etunit.converter.tests.Activator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.2", org.eclipse.core.runtime, org.junit;bundle-version="4.8.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF index 6f74f62be..9a005c243 100644 --- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-Vendor: Eclipse eTrice Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.tests; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsmtest.ui;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsmtest.ui;bundle-version="1.1.2", org.eclipse.core.runtime, org.eclipse.xtext.junit4;bundle-version="2.6.0", org.eclipse.ui.workbench;resolution:=optional diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF index 1f075d0ca..e84d5fe72 100644 --- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.etrice.generator.tests Bundle-Version: 1.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1", - org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.generator;bundle-version="1.1.1", - org.eclipse.etrice.generator.fsm;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.2", + org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.generator;bundle-version="1.1.2", + org.eclipse.etrice.generator.fsm;bundle-version="1.1.2", org.junit;bundle-version="4.8.1", org.eclipse.osgi;bundle-version="3.6.0", org.eclipse.xtext;bundle-version="2.6.0", diff --git a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF index 3a2f893b3..725c9a083 100644 --- a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.etrice.ui.base.tests Bundle-Version: 1.1.2.qualifier Require-Bundle: org.junit;bundle-version="4.8.1", org.eclipse.core.runtime, - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.structure;bundle-version="1.1.1", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.structure;bundle-version="1.1.2", org.eclipse.xtext;bundle-version="2.6.0", org.eclipse.graphiti;bundle-version="0.8.0", org.eclipse.etrice.ui.common.base, diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF index bd9b28410..a6fab9103 100644 --- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests Bundle-Version: 1.1.2.qualifier Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator Bundle-Vendor: Eclipse eTrice -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior;bundle-version="1.1.1", - org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.base.tests;bundle-version="1.1.1", - org.eclipse.etrice.generator.launch;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior;bundle-version="1.1.2", + org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.base.tests;bundle-version="1.1.2", + org.eclipse.etrice.generator.launch;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF index bda2df996..ecd975682 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: eTrice Structure Diagram Tests Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests Bundle-Version: 1.1.2.qualifier -Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1", - org.eclipse.etrice.core.room;bundle-version="1.1.1", - org.eclipse.etrice.ui.structure;bundle-version="1.1.1", - org.eclipse.etrice.ui.common;bundle-version="1.1.1", - org.eclipse.etrice.ui.common.base;bundle-version="1.1.1", - org.eclipse.etrice.ui.base.tests;bundle-version="1.1.1", +Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.2", + org.eclipse.etrice.core.room;bundle-version="1.1.2", + org.eclipse.etrice.ui.structure;bundle-version="1.1.2", + org.eclipse.etrice.ui.common;bundle-version="1.1.2", + org.eclipse.etrice.ui.common.base;bundle-version="1.1.2", + org.eclipse.etrice.ui.base.tests;bundle-version="1.1.2", org.eclipse.ui, org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", -- cgit v1.2.3 From 3a0767800bb81a9f3f1f84024cfc3fcd5769df3f Mon Sep 17 00:00:00 2001 From: Jan Belle Date: Mon, 18 Jun 2018 09:11:08 +0200 Subject: [runtime.c] Refactor etStaticDeque api Change-Id: I388cb4747d7ed40ae98a08a054497ac2d32d20ef --- .../src/common/container/etStaticDeque.c | 4 +-- .../src/common/container/etStaticDeque.h | 40 +++++++++++----------- .../src/runtime/container/TestEtStaticDeque.c | 4 +-- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tests') diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c index 763185dee..7c08cc716 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c @@ -14,11 +14,11 @@ #include -void etStaticDeque_construct(etStaticDeque* const self, void* memory, int size, int objectSize) { +void etStaticDeque_construct(etStaticDeque* const self, void* memory, int memorySize, int objectSize) { self->size = 0; self->first = 0; self->memory = memory; - self->maxSize = size; + self->maxSize = memorySize / objectSize; self->objectSize = objectSize; etStaticDeque_clear(self); diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h index 2333bb0dc..4ec186fd9 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h @@ -26,78 +26,78 @@ typedef struct etStaticDeque { int first; /* index of the first object */ int size; /* current size of the queue */ int maxSize; /* the maximum size of the queue */ - int objectSize; /* the maximum size of the objects contained in this queue */ + int objectSize; /* the size of the objects contained in this queue in bytes */ } etStaticDeque; /** * Constructs the Deque on the given memory with specified size and objectSize. * - * \param self the pointer to the StaticDeque - * \param memory a pointer to the memory for the objects of the StaticDeque - * \param size the maximum count of objects that fit into the specified memory - * \param objectSize the size of the objects stored in the StaticDeque + * \param self The pointer to the StaticDeque + * \param memory A pointer to the memory for the objects of the StaticDeque + * \param memorySize The size of the memory in bytes + * \param objectSize The size of the objects stored in the StaticDeque in bytes */ -void etStaticDeque_construct(etStaticDeque* self, void* memory, int size, int objectSize); +void etStaticDeque_construct(etStaticDeque* self, void* memory, int memorySize, int objectSize); /** * Clears the Deque, removes all objects. * - * \param self the pointer to the StaticDeque + * \param self The pointer to the StaticDeque */ void etStaticDeque_clear(etStaticDeque* self); /** * Returns a reference to an arbitrary object at the specified position. * - * \param self the pointer to the StaticDeque - * \param position the position of the object to be returned - * \return the object at the specified position + * \param self The pointer to the StaticDeque + * \param position The position of the object to be returned + * \return The object at the specified position */ void* etStaticDeque_get(const etStaticDeque* self, int position); /** * Copies the object and stores it at the front * - * \param self the pointer to the StaticDeque - * \param object the object to push to the front of the queue + * \param self The pointer to the StaticDeque + * \param object The object to push to the front of the queue */ void etStaticDeque_push_front(etStaticDeque* self, void* object); /** * Copies the object and stores it at the end * - * \param self the pointer to the StaticDeque - * \param object the object to push to the end of the queue + * \param self The pointer to the StaticDeque + * \param object The object to push to the end of the queue */ void etStaticDeque_push_back(etStaticDeque* self, void* object); /** * Removes the first object * - * \param self the pointer to the StaticDeque + * \param self The pointer to the StaticDeque */ void etStaticDeque_pop_front(etStaticDeque* self); /** * Removes the last element * - * \param self the pointer to the StaticDeque + * \param self The pointer to the StaticDeque */ void etStaticDeque_pop_back(etStaticDeque* self); /** * Returns a reference to the first object * - * \param self the pointer to the StaticDeque - * \return the object at the front of the queue + * \param self The pointer to the StaticDeque + * \return The object at the front of the queue */ void* etStaticDeque_front(const etStaticDeque* self); /** * Returns a reference to the last object * - * \param self the pointer to the StaticDeque - * \return the object at the end of the queue + * \param self The pointer to the StaticDeque + * \return The object at the end of the queue */ void* etStaticDeque_back(const etStaticDeque* self); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c index 67d4a5a8f..e795cf5aa 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/container/TestEtStaticDeque.c @@ -34,7 +34,7 @@ void TestEtStaticDeque_testConstruct(etInt16 caseId) { // Test constructor StaticDeque(void) etStaticDeque deque; int memory[10]; - etStaticDeque_construct(&deque, memory, 10, sizeof(int)); + etStaticDeque_construct(&deque, memory, sizeof(memory), sizeof(int)); EXPECT_EQUAL_INT32(caseId, failMsg, 0, deque.size); EXPECT_TRUE(caseId, failMsg, deque.size == 0); } @@ -45,7 +45,7 @@ void TestEtStaticDeque_testPushPop(etInt16 caseId) { // Test push_back and push_front with 6 objects of type DataClass etStaticDeque deque; DataClass memory[6]; - etStaticDeque_construct(&deque, memory, 6, sizeof(DataClass)); + etStaticDeque_construct(&deque, memory, sizeof(memory), sizeof(DataClass)); DataClass d1 = { 1, 1.5, "Data 1" }; DataClass d2 = { 2, 2.5, "Data 2" }; DataClass d3 = { 3, 3.5, "Data 3" }; -- cgit v1.2.3