Merge branch 'v0.14.x_bugfix' into v0.14.x

integrity-tf · Apr 8, 2015 · 98e3d98 · 98e3d98
2 parents f1a7f31 + 507ad47
commit 98e3d98
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/de.gebit.integrity.dsl.ui/META-INF/MANIFEST.MF b/de.gebit.integrity.dsl.ui/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Bundle-Name: Integrity Test Framework - UI
 Bundle-Version: 0.14.1.qualifier
 Bundle-SymbolicName: de.gebit.integrity.dsl.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext.ui.shared,
- org.eclipse.xtext.builder,
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.xtext.ui;bundle-version="2.4.0",
+Require-Bundle: org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
+ org.eclipse.xtext.builder;bundle-version="2.6.0",
+ org.eclipse.xtext.common.types.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
+ org.eclipse.xtext.ui;bundle-version="2.6.0",
  de.gebit.integrity.dsl;bundle-version="0.1.0",
  org.eclipse.ui.editors,
  org.eclipse.ui,

diff --git a/de.gebit.integrity.dsl/META-INF/MANIFEST.MF b/de.gebit.integrity.dsl/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Bundle-Name: Integrity Test Framework - Core
 Bundle-Version: 0.14.1.qualifier
 Bundle-SymbolicName: de.gebit.integrity.dsl;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="2.4.0";visibility:=reexport,
- org.eclipse.xtext.common.types;bundle-version="2.4.0",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.eclipse.xtext.generator;bundle-version="2.4.0";resolution:=optional,
- org.eclipse.emf.mwe2.launch;bundle-version="2.4.0";resolution:=optional,
+Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
+ org.eclipse.xtext.common.types;bundle-version="2.6.0",
+ org.eclipse.xtext.util;bundle-version="2.6.0",
+ org.eclipse.emf.ecore;bundle-version="2.6.0",
+ org.eclipse.emf.common;bundle-version="2.6.0",
+ org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="2.6.0";resolution:=optional,
  org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
  org.antlr.runtime,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional

diff --git a/de.gebit.integrity.eclipse/META-INF/MANIFEST.MF b/de.gebit.integrity.eclipse/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Name: Integrity Test Framework - Eclipse Integration
 Bundle-SymbolicName: de.gebit.integrity.eclipse;singleton:=true
 Bundle-Version: 0.14.1.qualifier
 Bundle-Activator: de.gebit.integrity.eclipse.Activator
-Require-Bundle: de.gebit.integrity.remoting;bundle-version="0.6.5",
- de.gebit.integrity.dsl.ui;bundle-version="0.6.5",
+Require-Bundle: de.gebit.integrity.remoting,
+ de.gebit.integrity.dsl.ui,
  org.eclipse.osgi;bundle-version="3.7.0",
- org.eclipse.xtext.ui;bundle-version="2.4.0"
+ org.eclipse.xtext.ui;bundle-version="2.6.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: de.gebit.integrity.utils,

diff --git a/de.gebit.integrity.runner/META-INF/MANIFEST.MF b/de.gebit.integrity.runner/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Name: Integrity Test Framework - Test Runner
 Bundle-SymbolicName: de.gebit.integrity.runner
 Bundle-Version: 0.14.1.qualifier
 Bundle-ClassPath: .
-Require-Bundle: org.eclipse.xtext;bundle-version="2.4.0",
- de.gebit.integrity.dsl;bundle-version="0.1.0",
- org.eclipse.xtext.common.types;bundle-version="2.4.0",
- de.gebit.integrity.remoting;bundle-version="0.1.0";visibility:=reexport
+Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0",
+ de.gebit.integrity.dsl,
+ org.eclipse.xtext.common.types;bundle-version="2.6.0",
+ de.gebit.integrity.remoting;visibility:=reexport
 Export-Package: de.gebit.integrity.runner,
  de.gebit.integrity.runner.callbacks,
  de.gebit.integrity.runner.callbacks.console,