Add support for older Eclipse version (e.g. 3.6) than 3.8

Change-Id: I67ec91e26e608ddb4b243eb9f21261b070ae6d03
Reviewed-on: https://git.eclipse.org/r/8654
Tested-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
IP-Clean: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Tested-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
IP-Clean: Patrick Tasse <patrick.tasse@gmail.com>

diff --git a/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
index 9e756b3edd296899f1fb9a3fc6e51db52622bc24..6c8b9b87c2ef678042c5ac5567fd5d5ddf23b270 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Fragment-Host: org.eclipse.linuxtools.ctf.core
-Require-Bundle: org.junit4;bundle-version="4.8.0"
+Require-Bundle: org.junit4

diff --git a/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
index f37eef0812a0a3ff8c97dd8475a5af4078099701..cf7ace5bc505bd2739ee17bb01263f7e67549568 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.ctf.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.linuxtools.ctf.parser;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.ctf.core.event,
  org.eclipse.linuxtools.ctf.core.event.types,

diff --git a/org.eclipse.linuxtools.ctf/feature.xml b/org.eclipse.linuxtools.ctf/feature.xml
index 90582aa6433a57d92fec8464b1c9e486be46a12d..c7de35ee5ca118a17d29fb1f22305b98a0ef1f36 100644 (file)
--- a/org.eclipse.linuxtools.ctf/feature.xml
+++ b/org.eclipse.linuxtools.ctf/feature.xml
@@ -22,8 +22,8 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
index a4cabb0a06168e09de1b0589f3f6ab4c8661d3af..0acf47d7c9e3dfe767297e78b39123708771971c 100644 (file)
--- a/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.help; singleton:=true
-Require-Bundle: org.eclipse.help;bundle-version="3.6.0"
+Require-Bundle: org.eclipse.help

diff --git a/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
index 9f1d9d9b209770e28c8da2b9d9598c656f91a755..26a0b1ff25222ab33e94a06a33709d0aa125844f 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.tests
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Fragment-Host: org.eclipse.linuxtools.lttng2.core
-Require-Bundle: org.junit;bundle-version="4.8.0"
+Require-Bundle: org.junit

diff --git a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
index dded32f0221ea4ade3f0aea49708f5d49684a3ec..07f8e444a2ca085a057c4563f59a524b1bed9097 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0"
+Require-Bundle: org.eclipse.core.runtime
 Export-Package: org.eclipse.linuxtools.internal.lttng2.core.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui",
  org.eclipse.linuxtools.internal.lttng2.core.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui"

diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
index 0aa82b55758a844964aa6871815a6447d7a6cdbc..b28f75e3b4aad23f60ac9835f3b5eca7a01e0862 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core.tests
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.core
-Require-Bundle: org.junit;bundle-version="4.8.0",
+Require-Bundle: org.junit,
  org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0"

diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
index 7b32fb234b2407da7dad0219bde76c13dbd27aae..5ad6a54fa09ae40a3edb2166fe7a7343f5b2f2ae 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.kernel.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
  org.eclipse.linuxtools.ctf.core;bundle-version="1.0.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0"
 Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui",

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
index 9d873476de54fe7950fd37a2ca577b86ba200ce4..39de0db1448a9dd2a3e383507389d56257fe3bb6 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui.tests
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.ui
-Require-Bundle: org.junit;bundle-version="4.8.0"
+Require-Bundle: org.junit

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
index 4e3ebdaef369ec89c2f8cecf6a26e0df9de941e2..0df94c56b15a49574192d20120d01fa356ab2902 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.kernel.ui.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
  org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="2.0.0",
  org.eclipse.linuxtools.lttng2.core;bundle-version="2.0.0",

diff --git a/org.eclipse.linuxtools.lttng2.kernel/feature.xml b/org.eclipse.linuxtools.lttng2.kernel/feature.xml
index 7038716a828b4d684da79f8d1959483eaf27b421..2fcc0785afa4d1b0ef2e58d184f6faaf91e33c1b 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel/feature.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel/feature.xml
@@ -38,17 +38,17 @@
          name="Common Trace Format (CTF)"/>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.help" version="3.5.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.core" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng2.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng2.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng2.kernel.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.linuxtools.ctf.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.core" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng2.core" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng2.ui" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng2.kernel.core" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.help"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
index 00a15a0442671d92a79ebeebaeb4cd7be2013c09..f95c8543f7fcc6b10a67afcaa04800d199cceb29 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.tests
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Fragment-Host: org.eclipse.linuxtools.lttng2.ui
-Require-Bundle: org.junit;bundle-version="4.8.0"
+Require-Bundle: org.junit

diff --git a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
index 5b49a9a3a3a087b61abe9b974644255536462101..f0fe2c3e724d648fa5d7434d1eb3af5a9e168a3d 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ui.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
  org.eclipse.linuxtools.lttng2.core;bundle-version="2.0.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="1.0.0"

diff --git a/org.eclipse.linuxtools.lttng2/feature.xml b/org.eclipse.linuxtools.lttng2/feature.xml
index 4fd6e35741fb9f1049a2eeee94761a8a49f2f584..25643356f6b1c57a2e5934069ac4c53936f4ee73 100644 (file)
--- a/org.eclipse.linuxtools.lttng2/feature.xml
+++ b/org.eclipse.linuxtools.lttng2/feature.xml
@@ -32,19 +32,18 @@
          name="Common Trace Format (CTF)"/>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng2.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.linuxtools.lttng2.core" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.core" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.linuxtools.tmf.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.core" version="3.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.help" version="3.5.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.core" version="3.1.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.services" version="3.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.rse.ui" version="3.1.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.help"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
index dd789fa8c800fd3e081adc964ca2c4990cf05602..e373f6a7d1755c1b05b98a8b1118d7c4c5bbfbcd 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core.tests;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="4.8.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
+Require-Bundle: org.junit,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
  org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0",
  org.eclipse.linuxtools.ctf.core;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.tmf.tests.stubs.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests"

diff --git a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
index 68ef90d5a0dac7d392fe9747f754296b4ca6a52b..b45e159217738f2ea270c626b5ff8acf8f903efe 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.tmf.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.ui.views;bundle-version="3.6.100",
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui.views,
  org.eclipse.linuxtools.ctf.core;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.internal.tmf.core;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
  org.eclipse.linuxtools.internal.tmf.core.component;x-friends:="org.eclipse.linuxtools.tmf.core.tests",

diff --git a/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
index b2c129788652af37703380e77ae69c99c005f0bc..118c87c88df30880deaeb7e6be4cf048036f54b0 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="4.8.0",
- org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
+Require-Bundle: org.junit,
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
  org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="2.0.0",
  org.eclipse.linuxtools.tmf.core.tests;bundle-version="2.0.0"

diff --git a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
index a808e1e704f0310f95717be62e36f06626eb80ea..a48e65543327821cb8f9a08b8f32f126142ebaa9 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
@@ -8,14 +8,14 @@ Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.tmf.ui.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
+Require-Bundle: org.eclipse.core.expressions,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
  org.eclipse.linuxtools.tmf.core;bundle-version="2.0.0",
- org.eclipse.ui;bundle-version="3.8.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.ui.navigator;bundle-version="3.5.200",
- org.eclipse.ui.navigator.resources;bundle-version="3.4.400"
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.navigator.resources
 Export-Package: org.eclipse.linuxtools.internal.tmf.ui;x-friends:="org.eclipse.linuxtools.tmf.ui.tests",
  org.eclipse.linuxtools.internal.tmf.ui.commands;x-internal:=true,
  org.eclipse.linuxtools.internal.tmf.ui.dialogs;x-internal:=true,

diff --git a/org.eclipse.linuxtools.tmf/feature.xml b/org.eclipse.linuxtools.tmf/feature.xml
index 53adc792131273b3dfbe4df084415b13b27177c2..6c7582cad46553e439897e768168e9452b9953dd 100644 (file)
--- a/org.eclipse.linuxtools.tmf/feature.xml
+++ b/org.eclipse.linuxtools.tmf/feature.xml
@@ -27,16 +27,16 @@
          name="Common Trace Format (CTF)"/>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.linuxtools.ctf.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.linuxtools.tmf.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.navigator" version="3.5.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.navigator.resources" version="3.4.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.core" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.navigator"/>
+      <import plugin="org.eclipse.ui.navigator.resources"/>
    </requires>
 
    <plugin