From f8dde8f75e039e116b8298e7498d6d331e86931e Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Wed, 30 May 2012 15:37:36 -0400
Subject: [PATCH] Push LTTng MANIFEST.MF/pom.xml to 1.0 and correct features
 dependencies

---
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.eclipse.linuxtools.ctf.core.tests/pom.xml |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 org.eclipse.linuxtools.ctf.core/pom.xml       |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 org.eclipse.linuxtools.ctf.parser/pom.xml     |  2 +-
 org.eclipse.linuxtools.ctf/feature.xml        |  5 +--
 org.eclipse.linuxtools.ctf/pom.xml            |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 +--
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 +--
 org.eclipse.linuxtools.lttng.core/pom.xml     |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.eclipse.linuxtools.lttng.help/pom.xml     |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.eclipse.linuxtools.lttng.jni/pom.xml      |  2 +-
 .../category.xml                              | 11 +++--
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 +--
 org.eclipse.linuxtools.lttng.ui.tests/pom.xml |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 ++--
 org.eclipse.linuxtools.lttng.ui/pom.xml       |  2 +-
 org.eclipse.linuxtools.lttng/feature.xml      | 12 +++---
 org.eclipse.linuxtools.lttng/pom.xml          |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.eclipse.linuxtools.lttng2.core/pom.xml    |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 +--
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      | 12 +++---
 .../pom.xml                                   |  2 +-
 .../feature.xml                               | 36 +++++++++-------
 org.eclipse.linuxtools.lttng2.kernel/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 ++--
 org.eclipse.linuxtools.lttng2.ui/pom.xml      |  2 +-
 org.eclipse.linuxtools.lttng2/feature.xml     | 42 ++++++++++++++++++-
 org.eclipse.linuxtools.lttng2/pom.xml         |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 +--
 org.eclipse.linuxtools.tmf.core.tests/pom.xml |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 org.eclipse.linuxtools.tmf.core/pom.xml       |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 ++--
 org.eclipse.linuxtools.tmf.ui.tests/pom.xml   |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +-
 org.eclipse.linuxtools.tmf.ui/pom.xml         |  2 +-
 org.eclipse.linuxtools.tmf/feature.xml        | 11 +++--
 org.eclipse.linuxtools.tmf/pom.xml            |  2 +-
 54 files changed, 160 insertions(+), 113 deletions(-)

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 476751309a..95ddfbeb81 100644
--- a/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.linuxtools.ctf.core.tests/pom.xml b/org.eclipse.linuxtools.ctf.core.tests/pom.xml
index 694e46c4bf..a39761070b 100644
--- a/org.eclipse.linuxtools.ctf.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.ctf.core.tests/pom.xml
@@ -22,7 +22,7 @@
   <name>Linux Tools LTTng CTF Core Unit Test Suite</name>
   <groupId>org.eclipse.linuxtools.ctf</groupId>
   <artifactId>org.eclipse.linuxtools.ctf.core.tests</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
  <build>
diff --git a/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
index 8240824e6c..a0c344b8b1 100644
--- a/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.ctf.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.ctf.core.Activator
@@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.antlr.runtime;bundle-version="3.2.0",
- org.eclipse.linuxtools.ctf.parser;bundle-version="0.1.0"
+ 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,
  org.eclipse.linuxtools.ctf.core.trace,
diff --git a/org.eclipse.linuxtools.ctf.core/pom.xml b/org.eclipse.linuxtools.ctf.core/pom.xml
index 04b8f50712..c4c31a2364 100644
--- a/org.eclipse.linuxtools.ctf.core/pom.xml
+++ b/org.eclipse.linuxtools.ctf.core/pom.xml
@@ -20,7 +20,7 @@
   <name>Linux Tools LTTng CTF Core Plug-in</name>
   <groupId>org.eclipse.linuxtools.ctf</groupId>
   <artifactId>org.eclipse.linuxtools.ctf.core</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
  <build>
diff --git a/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
index 56773488b0..e7219d670f 100644
--- a/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.ctf.parser
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.antlr.runtime;bundle-version="3.0.0"
+Require-Bundle: org.antlr.runtime;bundle-version="3.2.0"
 Export-Package: org.eclipse.linuxtools.ctf.parser
diff --git a/org.eclipse.linuxtools.ctf.parser/pom.xml b/org.eclipse.linuxtools.ctf.parser/pom.xml
index 1784de274d..5dfca6fd61 100644
--- a/org.eclipse.linuxtools.ctf.parser/pom.xml
+++ b/org.eclipse.linuxtools.ctf.parser/pom.xml
@@ -20,7 +20,7 @@
   <name>Linux Tools LTTng CTF Parser Plug-in</name>
   <groupId>org.eclipse.linuxtools.ctf</groupId>
   <artifactId>org.eclipse.linuxtools.ctf.parser</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/org.eclipse.linuxtools.ctf/feature.xml b/org.eclipse.linuxtools.ctf/feature.xml
index 3516ed7c1c..2d342bdc84 100644
--- a/org.eclipse.linuxtools.ctf/feature.xml
+++ b/org.eclipse.linuxtools.ctf/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.ctf"
       label="%featureName"
-      version="0.1.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%featureProvider">
 
    <description url="http://www.example.com/description">
@@ -24,8 +24,7 @@
    <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.linuxtools.ctf.parser" version="0.1.0" match="greaterOrEqual"/>
-      <import plugin="org.antlr.runtime" version="3.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.ctf.parser" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.linuxtools.ctf/pom.xml b/org.eclipse.linuxtools.ctf/pom.xml
index a5a4346105..28450cbdad 100644
--- a/org.eclipse.linuxtools.ctf/pom.xml
+++ b/org.eclipse.linuxtools.ctf/pom.xml
@@ -20,7 +20,7 @@
   <name>Linux Tools LTTng CTF (Common Trace Format)</name>
   <artifactId>org.eclipse.linuxtools.ctf</artifactId>
   <groupId>org.eclipse.linuxtools.ctf</groupId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 
   <packaging>eclipse-feature</packaging>
 
diff --git a/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
index b867c78bbf..4589f91fce 100644
--- a/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.core.tests
 Bundle-ActivationPolicy: lazy
@@ -11,5 +11,5 @@ Fragment-Host: org.eclipse.linuxtools.lttng.core
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0"
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.lttng.jni;bundle-version="1.0.0"
diff --git a/org.eclipse.linuxtools.lttng.core.tests/pom.xml b/org.eclipse.linuxtools.lttng.core.tests/pom.xml
index 942a2884ec..d4af65c6ce 100644
--- a/org.eclipse.linuxtools.lttng.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng.core.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.core.tests</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng Core Unit Test Suite (legacy)</name>
diff --git a/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
index 333edce7bd..a2a814f62c 100644
--- a/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0",
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.lttng.jni;bundle-version="1.0.0",
  org.eclipse.rse.core;bundle-version="3.2.0",
  org.eclipse.tcf.core;bundle-version="1.0.0",
  org.eclipse.core.resources;bundle-version="3.7.100"
diff --git a/org.eclipse.linuxtools.lttng.core/pom.xml b/org.eclipse.linuxtools.lttng.core/pom.xml
index 3e167acefe..52f82360aa 100644
--- a/org.eclipse.linuxtools.lttng.core/pom.xml
+++ b/org.eclipse.linuxtools.lttng.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.core</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng Core Plug-in (legacy)</name>
diff --git a/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
index 3e92423074..55aa739f93 100644
--- a/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.help; singleton:=true
 Require-Bundle: org.eclipse.help;bundle-version="3.5.100"
diff --git a/org.eclipse.linuxtools.lttng.help/pom.xml b/org.eclipse.linuxtools.lttng.help/pom.xml
index d769d9a4aa..bdb01901dc 100644
--- a/org.eclipse.linuxtools.lttng.help/pom.xml
+++ b/org.eclipse.linuxtools.lttng.help/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.help</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng Help Plug-in</name>
diff --git a/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF
index 24012edf88..4eb68b9db3 100644
--- a/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.jni
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.linuxtools.lttng.jni/pom.xml b/org.eclipse.linuxtools.lttng.jni/pom.xml
index be9da4e7b8..49a7e16362 100644
--- a/org.eclipse.linuxtools.lttng.jni/pom.xml
+++ b/org.eclipse.linuxtools.lttng.jni/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.jni</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng JNI Plug-in (legacy)</name>
diff --git a/org.eclipse.linuxtools.lttng.releng-site/category.xml b/org.eclipse.linuxtools.lttng.releng-site/category.xml
index 088abd77a2..c374fe96e6 100644
--- a/org.eclipse.linuxtools.lttng.releng-site/category.xml
+++ b/org.eclipse.linuxtools.lttng.releng-site/category.xml
@@ -4,12 +4,11 @@
    <description url="http://download.eclipse.org/technology/linuxtools/updates-nightly">
       Nightly builds of Linux Tools project.
    </description>
-   <feature url="features/org.eclipse.linuxtools.lttng_0.5.0.qualifier.jar" id="org.eclipse.linuxtools.lttng" version="0.5.0.qualifier" os="linux" ws="*" arch="*">
+   <feature url="features/org.eclipse.linuxtools.lttng_1.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng" version="1.0.0.qualifier" os="linux" ws="*" arch="*">
       <category name="LTTng"/>
    </feature>
-   <category-def name="LTTng" label="Linux Tools LTTng">
-      <description>
-         Eclipse Linux Tools LTTng
-      </description>
-   </category-def>
+   <feature url="features/org.eclipse.linuxtools.lttng2.kernel_1.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.kernel" version="1.0.0.qualifier">
+      <category name="LTTng"/>
+   </feature>
+   <category-def name="LTTng" label="Linux Tracing Toolkit"/>
 </site>
diff --git a/org.eclipse.linuxtools.lttng.releng-site/pom.xml b/org.eclipse.linuxtools.lttng.releng-site/pom.xml
index 2511b19d00..08f7143d21 100644
--- a/org.eclipse.linuxtools.lttng.releng-site/pom.xml
+++ b/org.eclipse.linuxtools.lttng.releng-site/pom.xml
@@ -23,7 +23,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.releng-site</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <name>Linux Tools LTTng Repository</name>
   <packaging>eclipse-repository</packaging>
 
diff --git a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
index ca5e9c6561..6279586560 100644
--- a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui.tests
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Fragment-Host: org.eclipse.linuxtools.lttng.ui
 Require-Bundle: org.junit;bundle-version="3.8.2",
- org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
+ org.eclipse.linuxtools.lttng.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
  org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/org.eclipse.linuxtools.lttng.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
index 058fffd1bb..7711813f06 100644
--- a/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng.ui.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.ui.tests</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng UI Unit Test Suite (legacy)</name>
diff --git a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
index 41179f26e2..32f50ed532 100644
--- a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng.ui.Activator
@@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
  org.eclipse.core.filesystem;bundle-version="1.3.100",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.tmf.ui;bundle-version="0.4.0",
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.ui;bundle-version="1.0.0",
  org.eclipse.tcf.core;bundle-version="1.0.0",
  org.eclipse.tcf.rse;bundle-version="1.0.0",
  org.eclipse.rse.core;bundle-version="3.2.0",
  org.eclipse.rse.services;bundle-version="3.2.100",
  org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",
  org.eclipse.rse.ui;bundle-version="3.2.0",
- org.eclipse.linuxtools.lttng.core;bundle-version="0.4.0"
+ org.eclipse.linuxtools.lttng.core;bundle-version="1.0.0"
diff --git a/org.eclipse.linuxtools.lttng.ui/pom.xml b/org.eclipse.linuxtools.lttng.ui/pom.xml
index 2aabe161d3..a9734e2142 100644
--- a/org.eclipse.linuxtools.lttng.ui/pom.xml
+++ b/org.eclipse.linuxtools.lttng.ui/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.ui</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng UI Plug-in (legacy)</name>
diff --git a/org.eclipse.linuxtools.lttng/feature.xml b/org.eclipse.linuxtools.lttng/feature.xml
index 1f802eb9e9..eb08e74599 100644
--- a/org.eclipse.linuxtools.lttng/feature.xml
+++ b/org.eclipse.linuxtools.lttng/feature.xml
@@ -3,7 +3,7 @@
 <feature
       id="org.eclipse.linuxtools.lttng"
       label="%featureName"
-      version="0.5.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%featureProvider"
       os="linux"
       ws="*"
@@ -32,21 +32,21 @@
 
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.core" version="0.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng.jni" version="0.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.rse.core" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tcf.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.7.100" 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.filesystem" version="1.3.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tcf.rse" version="1.0.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.linuxtools.lttng.core" version="0.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.help" version="3.5.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tcf.rse" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng.jni" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.linuxtools.lttng/pom.xml b/org.eclipse.linuxtools.lttng/pom.xml
index d899ed248a..94d8d2bbe8 100644
--- a/org.eclipse.linuxtools.lttng/pom.xml
+++ b/org.eclipse.linuxtools.lttng/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools LTTng (legacy)</name>
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 7142736037..383a6e03b2 100644
--- a/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.tests
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.linuxtools.lttng2.core.tests/pom.xml b/org.eclipse.linuxtools.lttng2.core.tests/pom.xml
index 9f1592740d..aedbc67118 100644
--- a/org.eclipse.linuxtools.lttng2.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.core.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.core.tests</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng Core Unit Test Suite</name>
diff --git a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
index ce226a29e1..f8503ea69c 100644
--- a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator
diff --git a/org.eclipse.linuxtools.lttng2.core/pom.xml b/org.eclipse.linuxtools.lttng2.core/pom.xml
index c86667f055..04ac52b67e 100644
--- a/org.eclipse.linuxtools.lttng2.core/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.core</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng Core Plug-in</name>
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 a2f0dfd7cf..a18496be9c 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core.tests
 Bundle-ActivationPolicy: lazy
@@ -11,4 +11,4 @@ Fragment-Host: org.eclipse.linuxtools.lttng2.kernel.core
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0"
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0"
diff --git a/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
index e361c8aa5b..e7c7fa4d05 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.core.tests</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng Kernel Analysis Core Unit Test Suite</name>
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 65087dd780..bb8e8cfbfe 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.kernel.core.Activator
@@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0"
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui",
  org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider;x-internal:=true,
  org.eclipse.linuxtools.lttng2.kernel.core.trace
diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
index 32a7607145..8fe1241d3e 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.core</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng Kernel Analysis Core</name>
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 d791c9b4ce..24e56dbb3e 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 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="3.8.2",
- org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
- org.eclipse.linuxtools.lttng2.ui;bundle-version="0.1.0",
+ org.eclipse.linuxtools.lttng2.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.lttng2.ui;bundle-version="1.0.0",
  org.eclipse.core.resources;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.ui;bundle-version="3.7.0"
diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
index d573dac2c0..9bdb501ba0 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.ui.tests</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng Kernel Analysis UI Unit Test Suite</name>
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 9f846ebea4..82638c423c 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.kernel.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.kernel.ui.Activator
@@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0",
- org.eclipse.linuxtools.tmf.ui;bundle-version="0.5.0",
- org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
- org.eclipse.linuxtools.lttng2.ui;bundle-version="0.1.0",
- org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="0.1.0"
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.ui;bundle-version="1.0.0",
+ org.eclipse.linuxtools.lttng2.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.lttng2.ui;bundle-version="1.0.0",
+ org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="1.0.0"
diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
index dd8e4fffff..6a36829ebd 100644
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.ui</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng Kernel Analysis UI Plug-in</name>
diff --git a/org.eclipse.linuxtools.lttng2.kernel/feature.xml b/org.eclipse.linuxtools.lttng2.kernel/feature.xml
index aba142ee9b..f07cdfb21f 100644
--- a/org.eclipse.linuxtools.lttng2.kernel/feature.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel/feature.xml
@@ -3,7 +3,7 @@
 <feature
       id="org.eclipse.linuxtools.lttng2.kernel"
       label="%featureName"
-      version="0.1.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%featureProvider">
 
    <description>
@@ -27,25 +27,36 @@
          version="0.0.0"
          name="Tracing and Monitoring Framework (TMF) (Incubation)"/>
 
+   <includes
+         id="org.eclipse.linuxtools.lttng2"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.linuxtools.ctf"
+         version="0.0.0"/>
+
    <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.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"/>
    </requires>
 
    <plugin
-         id="org.eclipse.linuxtools.lttng.core"
-         os="linux"
-         ws="*"
-         arch="*"
+         id="org.eclipse.linuxtools.lttng2.kernel.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.linuxtools.lttng.ui"
-         os="linux"
-         ws="*"
-         arch="*"
+         id="org.eclipse.linuxtools.lttng2.kernel.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -57,11 +68,4 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.linuxtools.lttng.jni"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/org.eclipse.linuxtools.lttng2.kernel/pom.xml b/org.eclipse.linuxtools.lttng2.kernel/pom.xml
index e3292d31cd..01d91bc474 100644
--- a/org.eclipse.linuxtools.lttng2.kernel/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools LTTng Kernel Analysis</name>
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 9643e2f82f..57decd536a 100644
--- a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.tests
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml
index 5bd57ca60e..b8a2877620 100644
--- a/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.ui.tests</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng UI Unit Test Suite</name>
diff --git a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
index fc8a01818b..a5f6413cd8 100644
--- a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ui.Activator
@@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
  org.eclipse.core.filesystem;bundle-version="1.3.100",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0",
- org.eclipse.linuxtools.tmf.ui;bundle-version="0.5.0",
+ org.eclipse.linuxtools.lttng2.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.ui;bundle-version="1.0.0",
  org.eclipse.rse.core;bundle-version="3.2.0",
  org.eclipse.rse.services;bundle-version="3.2.100",
  org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",
diff --git a/org.eclipse.linuxtools.lttng2.ui/pom.xml b/org.eclipse.linuxtools.lttng2.ui/pom.xml
index aa3e28b589..e2c5a87ec0 100644
--- a/org.eclipse.linuxtools.lttng2.ui/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.ui/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.ui</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng UI Plug-in</name>
diff --git a/org.eclipse.linuxtools.lttng2/feature.xml b/org.eclipse.linuxtools.lttng2/feature.xml
index 527d045eda..fbf39cda70 100644
--- a/org.eclipse.linuxtools.lttng2/feature.xml
+++ b/org.eclipse.linuxtools.lttng2/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.lttng2"
       label="%featureName"
-      version="0.1.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%featureProvider">
 
    <description url="http://www.example.com/description">
@@ -26,4 +26,44 @@
          version="0.0.0"
          name="Tracing and Monitoring Framework (TMF)"/>
 
+   <includes
+         id="org.eclipse.linuxtools.ctf"
+         version="0.0.0"/>
+
+   <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.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"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng2.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng2.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.linuxtools.lttng.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/org.eclipse.linuxtools.lttng2/pom.xml b/org.eclipse.linuxtools.lttng2/pom.xml
index bea9647c49..c19fcf91c3 100644
--- a/org.eclipse.linuxtools.lttng2/pom.xml
+++ b/org.eclipse.linuxtools.lttng2/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools LTTng (Linux Tracing Toolkit)</name>
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 f09ae57717..a4559f6a89 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core.tests;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin
@@ -11,6 +11,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.ctf.core;bundle-version="0.1.0"
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.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.tests/pom.xml b/org.eclipse.linuxtools.tmf.core.tests/pom.xml
index cb0490ffd6..2b72e86d99 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.tmf.core.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.core.tests</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng TMF Core Unit Test Suite</name>
diff --git a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
index 674f65dac4..573157a3b1 100644
--- a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.tmf.core.Activator
@@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.ctf.core;bundle-version="0.1.0",
+ org.eclipse.linuxtools.ctf.core;bundle-version="1.0.0",
  org.eclipse.core.filesystem;bundle-version="1.3.100"
 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.core/pom.xml b/org.eclipse.linuxtools.tmf.core/pom.xml
index c63fdacfa7..4b80965639 100644
--- a/org.eclipse.linuxtools.tmf.core/pom.xml
+++ b/org.eclipse.linuxtools.tmf.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.core</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng TMF Core Plug-in</name>
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 a503ce17d1..5eb1c846ad 100644
--- a/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
@@ -11,6 +11,6 @@ Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0",
- org.eclipse.linuxtools.tmf.ui;bundle-version="0.4.0",
- org.eclipse.linuxtools.tmf.core.tests;bundle-version="0.4.0"
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.ui;bundle-version="1.0.0",
+ org.eclipse.linuxtools.tmf.core.tests;bundle-version="1.0.0"
diff --git a/org.eclipse.linuxtools.tmf.ui.tests/pom.xml b/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
index e097684718..76b64122ba 100644
--- a/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ui.tests</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools LTTng TMF UI Unit Test Suite</name>
diff --git a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
index bb8daef957..bc73de886a 100644
--- a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.tmf.ui.Activator
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.core.filesystem;bundle-version="1.3.100",
  org.eclipse.core.resources;bundle-version="3.7.100",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.linuxtools.tmf.core;bundle-version="0.5.0",
+ org.eclipse.linuxtools.tmf.core;bundle-version="1.0.0",
  org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.ui.navigator;bundle-version="3.5.100",
diff --git a/org.eclipse.linuxtools.tmf.ui/pom.xml b/org.eclipse.linuxtools.tmf.ui/pom.xml
index 9f8bfe9f77..965cd7bcc8 100644
--- a/org.eclipse.linuxtools.tmf.ui/pom.xml
+++ b/org.eclipse.linuxtools.tmf.ui/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ui</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools LTTng TMF UI Plug-in</name>
diff --git a/org.eclipse.linuxtools.tmf/feature.xml b/org.eclipse.linuxtools.tmf/feature.xml
index 328e0b2dba..4a618621bd 100644
--- a/org.eclipse.linuxtools.tmf/feature.xml
+++ b/org.eclipse.linuxtools.tmf/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.tmf"
       label="%featureName"
-      version="0.5.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="%featureProvider">
 
    <description>
@@ -26,11 +26,16 @@
          version="0.0.0"/>
 
    <requires>
-      <import plugin="org.eclipse.ui"/>
       <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.linuxtools.tmf.core" version="0.3.2" 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.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"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.linuxtools.tmf/pom.xml b/org.eclipse.linuxtools.tmf/pom.xml
index 4a9b2cab88..d07b250eb9 100644
--- a/org.eclipse.linuxtools.tmf/pom.xml
+++ b/org.eclipse.linuxtools.tmf/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools LTTng TMF (Tracing and Monitoring Framework)</name>
-- 
2.34.1