Merge branch 'master' into lttng-luna

178 files changed, 897 insertions, 385 deletions

diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
index 99a77079aa..6a266f008c 100644
--- a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
index a6a18e8cb3..e0863480de 100644
--- a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.c</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/pom.xml b/changelog/org.eclipse.linuxtools.changelog.core/pom.xml
index 440f930eec..f7de86c366 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.core</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml b/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml
index 5100c4e8db..ff79b7b89e 100644
--- a/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.cparser</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml b/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml
index a94d9e8f99..23a6632faa 100644
--- a/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.doc</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
index 45755f2500..f7f7134032 100644
--- a/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.java</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml b/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml
index faef75b2d0..c3b60435d3 100644
--- a/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.parsers.java</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml b/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml
index 8bd375a59f..f684b0d25c 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.tests</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml b/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml
index 4ae6a6d6f8..18dfe8f0de 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.ui.tests</artifactId>
diff --git a/changelog/pom.xml b/changelog/pom.xml
index c5b86c052a..0b0ed67a69 100644
--- a/changelog/pom.xml
+++ b/changelog/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.changelog</groupId>
   <artifactId>linuxtools-changelog-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools ChangeLog Parent</name>
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml b/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
index 770e76101c..a0398234df 100644
--- a/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gcov-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gcov</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gcov</artifactId>
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/pom.xml b/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
index 0ecad87f49..45a7aeed3f 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gcov-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gcov</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gcov.core</artifactId>
diff --git a/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml b/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml
index e420f58b29..05be059b22 100644
--- a/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.gcov</groupId>
     <artifactId>linuxtools-gcov-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gcov.docs</artifactId>
diff --git a/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml b/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml
index 244951c705..9ca1166695 100644
--- a/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gcov-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gcov</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gcov.launch</artifactId>
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/pom.xml b/gcov/org.eclipse.linuxtools.gcov.test/pom.xml
index ee10968a33..720424295a 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.test/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gcov-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gcov</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gcov.test</artifactId>
diff --git a/gcov/pom.xml b/gcov/pom.xml
index a0ae1a2f0c..4adca35162 100644
--- a/gcov/pom.xml
+++ b/gcov/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.gcov</groupId>
   <artifactId>linuxtools-gcov-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools GCov Parent</name>
diff --git a/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml b/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
index 73792b77d1..e6eeeaa207 100644
--- a/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gprof-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gprof</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gprof.feature</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml b/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml
index 9b86440a35..befab1a489 100644
--- a/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-gprof-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gprof</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gprof.docs</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml b/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml
index 3a176de137..01b34744e1 100644
--- a/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gprof-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gprof</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gprof.launch</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/pom.xml b/gprof/org.eclipse.linuxtools.gprof.test/pom.xml
index 8a04aba1a9..2e5f7cf272 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof.test/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gprof-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gprof</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gprof.test</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof/pom.xml b/gprof/org.eclipse.linuxtools.gprof/pom.xml
index 7b21b5ab27..bf5e2a1355 100644
--- a/gprof/org.eclipse.linuxtools.gprof/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-gprof-parent</artifactId>
     <groupId>org.eclipse.linuxtools.gprof</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gprof</artifactId>
diff --git a/gprof/pom.xml b/gprof/pom.xml
index d3f43dd068..08715ea416 100644
--- a/gprof/pom.xml
+++ b/gprof/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.gprof</groupId>
   <artifactId>linuxtools-gprof-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools GProf Parent</name>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml
index da5bac76b6..6589e17304 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.feature</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml
index b9299c77af..0e7052f75f 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.devhelp.feature</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml
index 261cd8b2be..fab6b8ea0f 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.devhelp.tests</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml
index 233a4f7d26..a84dbc650c 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.devhelp</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/pom.xml
index 3e69e2a360..0a33eefe1a 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.glibc/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.glibc</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.library.docs/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.library.docs/pom.xml
index a6626c2da7..b2d6b1688e 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.library.docs/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.library.docs/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.library.docs</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml
index f8a2348eb7..49d48a51bb 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.libstdcxx</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml
index c614eaf4e9..5e03f8acaf 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.newlib.feature</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/pom.xml
index f9696aa18c..8f4c3d2e29 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.newlib</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover/pom.xml
index f4ec34ef3c..29dfa8ede9 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover</artifactId>
diff --git a/libhover/pom.xml b/libhover/pom.xml
index 5252ce6d5c..c27c0e8324 100644
--- a/libhover/pom.xml
+++ b/libhover/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
   <artifactId>linuxtools-libhover-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools Libhover Parent</name>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml b/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml
index c2cda58c17..3c2fe469da 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -627,18 +627,26 @@
                   checkEnabled="false">
                <with
                      variable="selection">
-                  <and>
-                     <count
-                           value="1">
-                     </count>
-                     <iterate
-                           ifEmpty="false"
-                           operator="and">
-                        <instanceof
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                        </instanceof>
-                     </iterate>
-                  </and>
+                     <or>
+                        <iterate
+                              ifEmpty="false"
+                              operator="and">
+                           <instanceof
+                                 value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
+                           </instanceof>
+                        </iterate>
+                        <and>
+                           <count
+                                 value="1">
+                           </count>
+                           <iterate
+                                 operator="and">
+                              <instanceof
+                                    value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
+                              </instanceof>
+                           </iterate>
+                        </and>
+                     </or>
                </with>
             </visibleWhen>
          </command>
@@ -1260,19 +1268,6 @@
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.importexport.ExportTracePackageHandler"
             commandId="org.eclipse.linuxtools.tmf.ui.command.exporttracepkg">
-         <activeWhen>
-            <and>
-               <count
-                     value="1">
-               </count>
-               <iterate
-                     operator="and">
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                  </instanceof>
-               </iterate>
-            </and>
-         </activeWhen>
       </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.importexport.ImportTracePackageHandler"
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/schema/export-manifest.xsd b/lttng/org.eclipse.linuxtools.tmf.ui/schema/export-manifest.xsd
index 4f19998ae7..21480bd8d7 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/schema/export-manifest.xsd
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/schema/export-manifest.xsd
@@ -15,7 +15,7 @@
   <xs:element name="tmf-export">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="trace">
+        <xs:element name="trace" maxOccurs="unbounded" minOccurs="0">
           <xs:complexType>
             <xs:sequence>
 
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/Messages.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/Messages.java
index 9b1996bea9..ab451ab7b3 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/Messages.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/Messages.java
@@ -25,8 +25,8 @@ public class Messages extends NLS {
 
     public static String SelectSpplementaryResources_DialogTitle;
     public static String SelectSpplementaryResources_ResourcesGroupTitle;
-    public static String SelectSpplementaryResources_SelectAll;
-    public static String SelectSpplementaryResources_DeselectAll;
+    public static String Dialog_SelectAll;
+    public static String Dialog_DeselectAll;
 
     static {
         // initialize resource bundle
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java
index 4357da8dd8..7a91bcc51e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java
@@ -178,7 +178,7 @@ public class SelectSupplementaryResourcesDialog extends Dialog {
         btComp.setLayoutData(gd);
 
         final Button selectAll = new Button(btComp, SWT.PUSH);
-        selectAll.setText(Messages.SelectSpplementaryResources_SelectAll);
+        selectAll.setText(Messages.Dialog_SelectAll);
         selectAll.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
@@ -192,7 +192,7 @@ public class SelectSupplementaryResourcesDialog extends Dialog {
         });
 
         final Button deselectAll = new Button(btComp, SWT.PUSH);
-        deselectAll.setText(Messages.SelectSpplementaryResources_DeselectAll);
+        deselectAll.setText(Messages.Dialog_DeselectAll);
         deselectAll.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/messages.properties b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/messages.properties
index ab6840b537..476306e1fd 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/messages.properties
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/messages.properties
@@ -12,5 +12,5 @@
 ###############################################################################
 SelectSpplementaryResources_DialogTitle=Delete Resources
 SelectSpplementaryResources_ResourcesGroupTitle=Select resources to delete
-SelectSpplementaryResources_SelectAll=Select All
-SelectSpplementaryResources_DeselectAll=Deselect All
\ No newline at end of file
+Dialog_SelectAll=Select All
+Dialog_DeselectAll=Deselect All
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageOperation.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageOperation.java
index 03376610de..ee13ca5167 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageOperation.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageOperation.java
@@ -139,6 +139,25 @@ abstract public class AbstractTracePackageOperation {
     }
 
     /**
+     * Returns whether or not the Files element is checked under the given trace
+     * package element
+     *
+     * @param tracePackageElement
+     *            the trace package element
+     * @return whether or not the Files element is checked under the given trace
+     *         package element
+     */
+    public static boolean isFilesChecked(TracePackageElement tracePackageElement) {
+        for (TracePackageElement element : tracePackageElement.getChildren()) {
+            if (element instanceof TracePackageFilesElement) {
+                return element.isChecked();
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Common interface between ZipEntry and TarEntry
      */
     protected interface ArchiveEntry {
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageWizardPage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageWizardPage.java
index 655a06b6ad..e8d3d08369 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/AbstractTracePackageWizardPage.java
@@ -89,11 +89,11 @@ abstract public class AbstractTracePackageWizardPage extends WizardPage {
     /**
      * Create the element viewer
      *
-     * @param parent
+     * @param compositeParent
      *            the parent composite
      */
-    protected void createElementViewer(Composite parent) {
-        fElementViewer = new CheckboxTreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.CHECK);
+    protected void createElementViewer(Composite compositeParent) {
+        fElementViewer = new CheckboxTreeViewer(compositeParent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.CHECK);
 
         fElementViewer.addCheckStateListener(new ICheckStateListener() {
             @Override
@@ -105,6 +105,29 @@ abstract public class AbstractTracePackageWizardPage extends WizardPage {
                     setSubtreeChecked(fElementViewer, element, true, event.getChecked());
                 }
                 maintainCheckIntegrity(element);
+
+                if (element.getParent() != null) {
+                    // Uncheck everything in this trace if Trace files are unchecked
+                    if (element instanceof TracePackageFilesElement) {
+                        if (!element.isChecked()) {
+                            setSubtreeChecked(fElementViewer, element.getParent(), false, false);
+                        }
+                    // Check Trace files if anything else is selected
+                    } else if (element.isChecked()) {
+                        TracePackageElement parent = element.getParent();
+                        while (parent != null) {
+                            for (TracePackageElement e : parent.getChildren()) {
+                                if (e instanceof TracePackageFilesElement) {
+                                    setSubtreeChecked(fElementViewer, e, false, true);
+                                    break;
+                                }
+                            }
+                            parent = parent.getParent();
+                        }
+                    }
+                }
+
+
                 updateApproximateSelectedSize();
                 updatePageCompletion();
             }
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageHandler.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageHandler.java
index 525af468d2..e6674d8bc1 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageHandler.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageHandler.java
@@ -12,6 +12,9 @@
 
 package org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.importexport;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -19,6 +22,10 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectElement;
+import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement;
+import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder;
+import org.eclipse.ui.ISources;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.HandlerUtil;
@@ -30,25 +37,69 @@ import org.eclipse.ui.handlers.HandlerUtil;
  */
 public class ExportTracePackageHandler extends AbstractHandler {
 
+    private boolean fEnabled = false;
+
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
-        ExportTracePackageWizard w = new ExportTracePackageWizard();
         IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
         if (window == null) {
             return false;
         }
 
         ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
         IStructuredSelection sec = StructuredSelection.EMPTY;
+        List<TmfTraceElement> selectedTraces = new ArrayList<TmfTraceElement>();
         if (currentSelection instanceof IStructuredSelection) {
             sec = (IStructuredSelection) currentSelection;
+            Object[] selectedElements = sec.toArray();
+            for (Object selectedElement : selectedElements) {
+                if (selectedElement instanceof TmfTraceElement) {
+                    TmfTraceElement tmfTraceElement = (TmfTraceElement) selectedElement;
+                    selectedTraces.add(tmfTraceElement.getElementUnderTraceFolder());
+                } else if (selectedElement instanceof TmfTraceFolder) {
+                    TmfTraceFolder tmfTraceFolder = (TmfTraceFolder) selectedElement;
+                    selectedTraces = tmfTraceFolder.getTraces();
+                }
+            }
         }
 
+        ExportTracePackageWizard w = new ExportTracePackageWizard(selectedTraces);
+
         w.init(PlatformUI.getWorkbench(), sec);
         WizardDialog dialog = new WizardDialog(window.getShell(), w);
         dialog.open();
         return null;
     }
 
+    @Override
+    public boolean isEnabled() {
+        return super.isEnabled() && fEnabled;
+    }
+
+    @Override
+    public void setEnabled(Object evaluationContext) {
+        super.setEnabled(evaluationContext);
+
+        fEnabled = true;
+
+        Object s = HandlerUtil.getVariable(evaluationContext, ISources.ACTIVE_MENU_SELECTION_NAME);
+        if (s instanceof IStructuredSelection) {
+            IStructuredSelection selection = (IStructuredSelection) s;
+            // If we have traces selected, make sure they are all from the same
+            // project, disable handler otherwise
+            Object[] selectedElements = selection.toArray();
+            TmfProjectElement firstProject = null;
+            for (Object selectedElement : selectedElements) {
+                if (selectedElement instanceof TmfTraceElement) {
+                    TmfTraceElement tmfTraceElement = (TmfTraceElement) selectedElement;
+                    TmfProjectElement project = tmfTraceElement.getProject();
+                    if (firstProject != null && !project.equals(firstProject)) {
+                        fEnabled =  false;
+                    }
+
+                    firstProject = project;
+                }
+            }
+        }
+    }
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageSelectTraceWizardPage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageSelectTraceWizardPage.java
index eaf11bc6e4..ead9438820 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageSelectTraceWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageSelectTraceWizardPage.java
@@ -32,6 +32,7 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
@@ -88,7 +89,7 @@ public class ExportTracePackageSelectTraceWizardPage extends WizardPage {
         projectViewer.setLabelProvider(new WorkbenchLabelProvider());
         projectViewer.setInput(TraceUtils.getOpenedTmfProjects().toArray(new IProject[] {}));
 
-        fTraceTable = new Table(projectSelectionGroup, SWT.SINGLE | SWT.BORDER);
+        fTraceTable = new Table(projectSelectionGroup, SWT.BORDER | SWT.CHECK);
         fTraceTable.setLayoutData(new GridData(GridData.FILL_BOTH));
 
         final TableViewer traceViewer = new TableViewer(fTraceTable);
@@ -113,12 +114,8 @@ public class ExportTracePackageSelectTraceWizardPage extends WizardPage {
         fTraceTable.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
-                TableItem[] items = fTraceTable.getSelection();
-                TmfTraceElement trace = (TmfTraceElement) items[0].getData();
-                ExportTracePackageWizardPage page = (ExportTracePackageWizardPage) getWizard().getPage(ExportTracePackageWizardPage.PAGE_NAME);
-                ArrayList<TmfTraceElement> traces = new ArrayList<TmfTraceElement>();
-                traces.add(trace);
-                page.setSelectedTraces(traces);
+                getWizard().getContainer().updateButtons();
+                updateNextPageData();
             }
         });
 
@@ -143,13 +140,67 @@ public class ExportTracePackageSelectTraceWizardPage extends WizardPage {
             }
         });
 
+        Composite btComp = new Composite(projectSelectionGroup, SWT.NONE);
+        btComp.setLayout(new GridLayout(2, true));
+        GridData gd = new GridData();
+        gd.horizontalSpan = 2;
+        gd.horizontalAlignment = SWT.RIGHT;
+        btComp.setLayoutData(gd);
+
+        final Button selectAll = new Button(btComp, SWT.PUSH);
+        selectAll.setText(org.eclipse.linuxtools.internal.tmf.ui.project.dialogs.Messages.Dialog_SelectAll);
+        selectAll.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TableItem[] items = fTraceTable.getItems();
+                for (TableItem item : items) {
+                    item.setChecked(true);
+                }
+
+                getWizard().getContainer().updateButtons();
+                updateNextPageData();
+            }
+        });
+
+        final Button deselectAll = new Button(btComp, SWT.PUSH);
+        deselectAll.setText(org.eclipse.linuxtools.internal.tmf.ui.project.dialogs.Messages.Dialog_DeselectAll);
+        deselectAll.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TableItem[] items = fTraceTable.getItems();
+                for (TableItem item : items) {
+                    item.setChecked(false);
+                }
+
+                getWizard().getContainer().updateButtons();
+                updateNextPageData();
+            }
+        });
+
         setControl(projectSelectionGroup);
         setTitle(Messages.ExportTracePackageWizardPage_Title);
         setMessage(Messages.ExportTracePackageSelectTraceWizardPage_ChooseTrace);
     }
 
+    private ArrayList<TmfTraceElement> getCheckedTraces() {
+        TableItem[] items = fTraceTable.getItems();
+        ArrayList<TmfTraceElement> traces = new ArrayList<TmfTraceElement>();
+        for (TableItem item : items) {
+            if (item.getChecked()) {
+                TmfTraceElement trace = (TmfTraceElement) item.getData();
+                traces.add(trace);
+            }
+        }
+        return traces;
+    }
+
+    private void updateNextPageData() {
+        ExportTracePackageWizardPage page = (ExportTracePackageWizardPage) getWizard().getPage(ExportTracePackageWizardPage.PAGE_NAME);
+        page.setSelectedTraces(getCheckedTraces());
+    }
+
     @Override
     public boolean canFlipToNextPage() {
-        return fTraceTable.getSelectionCount() > 0;
+        return getCheckedTraces().size() > 0;
     }
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizard.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizard.java
index 2eb2c2ad0d..21889161d4 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizard.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizard.java
@@ -12,6 +12,9 @@
 
 package org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.importexport;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
@@ -29,6 +32,7 @@ public class ExportTracePackageWizard extends Wizard implements IExportWizard {
 
     private static final String STORE_EXPORT_TRACE_WIZARD = "ExportTraceWizard"; //$NON-NLS-1$
     private IStructuredSelection fSelection;
+    private List<TmfTraceElement> fSelectedTraces;
     private ExportTracePackageWizardPage fPage;
 
     /**
@@ -42,11 +46,24 @@ public class ExportTracePackageWizard extends Wizard implements IExportWizard {
             section = workbenchSettings.addNewSection(STORE_EXPORT_TRACE_WIZARD);
         }
         setDialogSettings(section);
+        fSelectedTraces = new ArrayList<TmfTraceElement>();
+    }
+
+    /**
+     * Constructor for the export trace wizard with known selected traces
+     *
+     * @param selectedTraces
+     *            the selected traces
+     */
+    public ExportTracePackageWizard(List<TmfTraceElement> selectedTraces) {
+        this();
+        fSelectedTraces = selectedTraces;
     }
 
     @Override
     public void init(IWorkbench workbench, IStructuredSelection selection) {
         fSelection = selection;
+
         setNeedsProgressMonitor(true);
     }
 
@@ -58,8 +75,8 @@ public class ExportTracePackageWizard extends Wizard implements IExportWizard {
     @Override
     public void addPages() {
         super.addPages();
-        fPage = new ExportTracePackageWizardPage(fSelection);
-        if (!(fSelection.getFirstElement() instanceof TmfTraceElement)) {
+        fPage = new ExportTracePackageWizardPage(fSelection, fSelectedTraces);
+        if (fSelectedTraces.isEmpty()) {
             addPage(new ExportTracePackageSelectTraceWizardPage());
         }
         addPage(fPage);
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizardPage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizardPage.java
index 575ddd4251..b7e1734108 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ExportTracePackageWizardPage.java
@@ -90,17 +90,12 @@ public class ExportTracePackageWizardPage extends AbstractTracePackageWizardPage
      *
      * @param selection
      *            the current object selection
+     * @param selectedTraces
+     *            the selected traces from the selection
      */
-    public ExportTracePackageWizardPage(IStructuredSelection selection) {
+    public ExportTracePackageWizardPage(IStructuredSelection selection, List<TmfTraceElement> selectedTraces) {
         super(PAGE_NAME, Messages.ExportTracePackageWizardPage_Title, Activator.getDefault().getImageDescripterFromPath(ICON_PATH), selection);
-
-        Object[] selectedElements = getSelection().toArray();
-        fSelectedTraces = new ArrayList<TmfTraceElement>();
-        for (Object selectedElement : selectedElements) {
-            if (selectedElement instanceof TmfTraceElement) {
-                fSelectedTraces.add(((TmfTraceElement) selectedElement).getElementUnderTraceFolder());
-            }
-        }
+        fSelectedTraces = selectedTraces;
     }
 
     /**
@@ -144,6 +139,16 @@ public class ExportTracePackageWizardPage extends AbstractTracePackageWizardPage
         setControl(composite);
     }
 
+    @Override
+    public void setVisible(boolean visible) {
+        super.setVisible(visible);
+        if (visible) {
+            updatePageCompletion();
+        } else {
+            setPageComplete(false);
+        }
+    }
+
     /**
      * Restore widget values to the values that they held last time this wizard
      * was used to completion.
@@ -299,8 +304,6 @@ public class ExportTracePackageWizardPage extends AbstractTracePackageWizardPage
             List<TracePackageElement> children = new ArrayList<TracePackageElement>();
             TracePackageFilesElement filesElement = new TracePackageFilesElement(traceElement, tmfTraceElement.getResource());
             filesElement.setChecked(true);
-            // Always export the files
-            filesElement.setEnabled(false);
             children.add(filesElement);
 
             // Supplementary files
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ImportTracePackageWizardPage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ImportTracePackageWizardPage.java
index e57e5e4fcb..51613905aa 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ImportTracePackageWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/ImportTracePackageWizardPage.java
@@ -14,12 +14,15 @@ package org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.importex
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -27,6 +30,7 @@ import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfImportHelper;
+import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.AbstractTracePackageOperation;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.AbstractTracePackageWizardPage;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageElement;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageFilesElement;
@@ -233,18 +237,12 @@ public class ImportTracePackageWizardPage extends AbstractTracePackageWizardPage
             // Canceled
         }
 
-        TracePackageElement resultElement = op.getResultElement();
-        if (resultElement == null) {
+        TracePackageElement[] resultElements = op.getResultElement();
+        if (resultElements == null || resultElements.length == 0) {
             return null;
         }
 
-        for (TracePackageElement e : resultElement.getChildren()) {
-            if (e instanceof TracePackageFilesElement) {
-                e.setEnabled(false);
-            }
-        }
-
-        return new TracePackageElement[] { resultElement };
+        return resultElements;
     }
 
     @Override
@@ -313,9 +311,9 @@ public class ImportTracePackageWizardPage extends AbstractTracePackageWizardPage
 
         saveWidgetValues();
 
-        TracePackageElement[] input = (TracePackageElement[]) getElementViewer().getInput();
-        TracePackageTraceElement traceElement = (TracePackageTraceElement) input[0];
-        final TracePackageImportOperation importOperation = new TracePackageImportOperation(fValidatedFilePath, traceElement, fTmfTraceFolder);
+        Object input = getElementViewer().getInput();
+        TracePackageElement[] traceElements = (TracePackageElement[]) input;
+        final TracePackageImportOperation importOperation = new TracePackageImportOperation(fValidatedFilePath, traceElements, fTmfTraceFolder);
 
         try {
             getContainer().run(true, true, new IRunnableWithProgress() {
@@ -339,16 +337,72 @@ public class ImportTracePackageWizardPage extends AbstractTracePackageWizardPage
     }
 
     private boolean checkForOverwrite() {
-        TracePackageTraceElement traceElement = (TracePackageTraceElement) ((TracePackageElement[]) getElementViewer().getInput())[0];
-        String traceName = traceElement.getText();
+        TracePackageElement[] traceElements = (TracePackageElement[]) getElementViewer().getInput();
+        List<TracePackageTraceElement> noImportTraces = new ArrayList<TracePackageTraceElement>();
+        boolean noToAll = false;
+        for (TracePackageElement packageElement : traceElements) {
+            TracePackageTraceElement traceElement = (TracePackageTraceElement) packageElement;
+            if (!AbstractTracePackageOperation.isFilesChecked(traceElement)) {
+                continue;
+            }
+
+            if (noToAll) {
+                noImportTraces.add(traceElement);
+                continue;
+            }
+
+            String traceName = traceElement.getText();
+            if (traceExists(traceName)) {
+                int returnCode = promptForOverwrite(traceName);
+                final String[] response = new String[] { IDialogConstants.NO_TO_ALL_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.YES_LABEL };
+                if (response[returnCode].equals(IDialogConstants.YES_TO_ALL_LABEL)) {
+                    break;
+                } else if (response[returnCode].equals(IDialogConstants.NO_TO_ALL_LABEL)) {
+                    noToAll = true;
+                    noImportTraces.add(traceElement);
+                } else if (response[returnCode].equals(IDialogConstants.NO_LABEL)) {
+                    noImportTraces.add(traceElement);
+                }
+            }
+        }
+
+        // Unselect the traces that the user decided not to import
+        for (TracePackageTraceElement t : noImportTraces) {
+            for (TracePackageElement e : t.getChildren()) {
+                if (e instanceof TracePackageFilesElement) {
+                    ((TracePackageFilesElement) e).setChecked(false);
+                }
+            }
+        }
+
+        return true;
+    }
 
+    private boolean traceExists(String traceName) {
         List<TmfTraceElement> traces = fTmfTraceFolder.getTraces();
         for (TmfTraceElement t : traces) {
             if (t.getName().equals(traceName)) {
-                return MessageDialog.openQuestion(getContainer().getShell(), null, Messages.ImportTracePackageWizardPage_AlreadyExists);
+                return true;
             }
         }
 
-        return true;
+        return false;
+    }
+
+    private int promptForOverwrite(String traceName) {
+        final MessageDialog dialog = new MessageDialog(getContainer()
+                .getShell(), null, null, MessageFormat.format(Messages.ImportTracePackageWizardPage_AlreadyExists, traceName),
+                MessageDialog.QUESTION, new String[] {
+                        IDialogConstants.NO_TO_ALL_LABEL,
+                        IDialogConstants.NO_LABEL,
+                        IDialogConstants.YES_TO_ALL_LABEL,
+                        IDialogConstants.YES_LABEL,
+                }, 3) {
+            @Override
+            protected int getShellStyle() {
+                return super.getShellStyle() | SWT.SHEET;
+            }
+        };
+        return dialog.open();
     }
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/Messages.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/Messages.java
index 051423a5dd..f8a6f0bf4e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/Messages.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/Messages.java
@@ -188,6 +188,11 @@ public class Messages extends NLS {
     public static String TracePackageImportOperation_ErrorCreatingBookmark;
 
     /**
+     * Text for the detecting trace type job
+     */
+    public static String TracePackageImportOperation_DetectingTraceType;
+
+    /**
      * Text when error occurs creating a bookmark file
      */
     public static String TracePackageImportOperation_ErrorCreatingBookmarkFile;
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java
index c53b56dd50..23f053e789 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java
@@ -16,7 +16,8 @@ import java.io.ByteArrayInputStream;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
@@ -30,6 +31,7 @@ import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -65,7 +67,7 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
     private final TracePackageTraceElement[] fTraceExportElements;
     private final boolean fUseCompression;
     private final boolean fUseTar;
-    private final List<IResource> fResources;
+    private final Set<IResource> fResources;
     private IFolder fExportFolder;
 
     /**
@@ -85,7 +87,7 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
         fTraceExportElements = traceExportElements;
         fUseCompression = useCompression;
         fUseTar = useTar;
-        fResources = new ArrayList<IResource>();
+        fResources = new HashSet<IResource>();
     }
 
     /**
@@ -110,6 +112,10 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
             Node tmfNode = doc.appendChild(createElement);
 
             for (TracePackageTraceElement tracePackageElement : fTraceExportElements) {
+                if (!isFilesChecked(tracePackageElement)) {
+                    continue;
+                }
+
                 exportTrace(progressMonitor, tmfNode, tracePackageElement);
             }
 
@@ -190,9 +196,13 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
                 ModalContext.checkCanceled(monitor);
                 IResource res = supplFile.getResource();
                 res.refreshLocal(0, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
-                createExportResource(traceSuppFilesFolder, res);
+                IResource link = createExportResource(traceSuppFilesFolder, res);
                 Element suppFileElement = doc.createElement(ITracePackageConstants.SUPPLEMENTARY_FILE_ELEMENT);
-                suppFileElement.setAttribute(ITracePackageConstants.SUPPLEMENTARY_FILE_NAME_ATTRIB, res.getName());
+
+                // project/.traceExport/.tracing/kernel/statistics.ht -> .tracing/kernel/statistics.ht
+                IPath archiveRelativePath = link.getFullPath().makeRelativeTo(fExportFolder.getFullPath());
+
+                suppFileElement.setAttribute(ITracePackageConstants.SUPPLEMENTARY_FILE_NAME_ATTRIB, archiveRelativePath.toString());
                 traceNode.appendChild(suppFileElement);
             }
 
@@ -208,9 +218,11 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
             folder.create(IResource.FORCE, true, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
         }
 
-        createExportResource(folder, resource);
+        IResource link = createExportResource(folder, resource);
         Element fileElement = doc.createElement(ITracePackageConstants.TRACE_FILE_ELEMENT);
-        fileElement.setAttribute(ITracePackageConstants.TRACE_FILE_NAME_ATTRIB, resource.getName());
+        // project/.traceExport/Traces/kernel -> Traces/kernel
+        IPath archiveRelativePath = link.getFullPath().makeRelativeTo(fExportFolder.getFullPath());
+        fileElement.setAttribute(ITracePackageConstants.TRACE_FILE_NAME_ATTRIB, archiveRelativePath.toString());
         traceNode.appendChild(fileElement);
         fResources.add(folder);
     }
@@ -221,16 +233,21 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
      * @param exportFolder the folder that will contain the linked resource
      * @param res the resource to export
      * @throws CoreException when createLink fails
+     * @return the created linked resource
      */
-    private static void createExportResource(IFolder exportFolder, IResource res) throws CoreException {
+    private static IResource createExportResource(IFolder exportFolder, IResource res) throws CoreException {
+        IResource ret = null;
         // Note: The resources cannot be HIDDEN or else they are ignored by ArchiveFileExportOperation
         if (res instanceof IFolder) {
             IFolder folder = exportFolder.getFolder(res.getName());
             folder.createLink(res.getLocationURI(), IResource.NONE, null);
+            ret = folder;
         } else if (res instanceof IFile) {
             IFile file = exportFolder.getFile(res.getName());
             file.createLink(res.getLocationURI(), IResource.NONE, null);
+            ret = file;
         }
+        return ret;
     }
 
     private static void exportBookmarks(IProgressMonitor monitor, Node traceNode, TracePackageBookmarkElement element) throws CoreException, InterruptedException {
@@ -268,7 +285,7 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
     }
 
     private IStatus exportToArchive(IProgressMonitor monitor, int totalWork) throws InvocationTargetException, InterruptedException {
-        ArchiveFileExportOperation op = new ArchiveFileExportOperation(fResources, getFileName());
+        ArchiveFileExportOperation op = new ArchiveFileExportOperation(new ArrayList<IResource>(fResources), getFileName());
         op.setCreateLeadupStructure(false);
         op.setUseCompression(fUseCompression);
         op.setUseTarFormat(fUseTar);
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExtractManifestOperation.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExtractManifestOperation.java
index 7cff208d55..d4648cef3e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExtractManifestOperation.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExtractManifestOperation.java
@@ -19,8 +19,10 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -65,7 +67,7 @@ public class TracePackageExtractManifestOperation extends AbstractTracePackageOp
     private static final String EXPORT_MANIFEST_SCHEMA_FILE_NAME = "export-manifest.xsd"; //$NON-NLS-1$
 
     // Result of reading the manifest
-    private TracePackageElement fResultElement;
+    private TracePackageElement[] fResultElements;
 
     /**
      * Constructs a new import operation for reading the manifest
@@ -87,7 +89,7 @@ public class TracePackageExtractManifestOperation extends AbstractTracePackageOp
      */
     @Override
     public void run(IProgressMonitor progressMonitor) {
-        TracePackageElement element = null;
+        TracePackageElement[] elements = null;
         try {
             progressMonitor.worked(1);
             ArchiveFile archiveFile = getSpecifiedArchiveFile();
@@ -114,7 +116,7 @@ public class TracePackageExtractManifestOperation extends AbstractTracePackageOp
                     validateManifest(inputStream);
 
                     inputStream = archiveFile.getInputStream(entry);
-                    element = loadElementsFromManifest(inputStream);
+                    elements = loadElementsFromManifest(inputStream);
                     break;
                 }
 
@@ -125,10 +127,15 @@ public class TracePackageExtractManifestOperation extends AbstractTracePackageOp
                 setStatus(Status.OK_STATUS);
             }
             else {
-                setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.TracePackageExtractManifestOperation_ErrorManifestNotFound, ITracePackageConstants.MANIFEST_FILENAME)));
+                elements = generateElementsFromArchive();
+                if (elements.length > 0) {
+                    setStatus(Status.OK_STATUS);
+                } else {
+                    setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.TracePackageExtractManifestOperation_ErrorManifestNotFound, ITracePackageConstants.MANIFEST_FILENAME)));
+                }
             }
 
-            fResultElement = element;
+            fResultElements = elements;
 
         } catch (InterruptedException e) {
             setStatus(Status.CANCEL_STATUS);
@@ -137,13 +144,36 @@ public class TracePackageExtractManifestOperation extends AbstractTracePackageOp
         }
     }
 
+    private TracePackageElement[] generateElementsFromArchive() {
+        ArchiveFile archiveFile = getSpecifiedArchiveFile();
+        Enumeration<?> entries = archiveFile.entries();
+        Set<String> traceFileNames = new HashSet<String>();
+        while (entries.hasMoreElements()) {
+            ArchiveEntry entry = (ArchiveEntry) entries.nextElement();
+            String entryName = entry.getName();
+            IPath fullArchivePath = new Path(entryName);
+            if (!fullArchivePath.hasTrailingSeparator() && fullArchivePath.segmentCount() > 0) {
+                traceFileNames.add(fullArchivePath.segment(0));
+            }
+        }
+
+        List<TracePackageElement> packageElements = new ArrayList<TracePackageElement>();
+        for (String traceFileName : traceFileNames) {
+            TracePackageTraceElement traceElement = new TracePackageTraceElement(null, traceFileName, null);
+            traceElement.setChildren(new TracePackageElement[] { new TracePackageFilesElement(traceElement, traceFileName) });
+            packageElements.add(traceElement);
+        }
+
+        return packageElements.toArray(new TracePackageElement[] {});
+    }
+
     /**
      * Get the resulting element from extracting the manifest from the archive
      *
      * @return the resulting element
      */
-    public TracePackageElement getResultElement() {
-        return fResultElement;
+    public TracePackageElement[] getResultElement() {
+        return fResultElements;
     }
 
     private static void validateManifest(InputStream xml) throws IOException
@@ -165,7 +195,8 @@ public class TracePackageExtractManifestOperation extends AbstractTracePackageOp
         }
     }
 
-    private static TracePackageElement loadElementsFromManifest(InputStream inputStream) throws IOException, SAXException, ParserConfigurationException {
+    private static TracePackageElement[] loadElementsFromManifest(InputStream inputStream) throws IOException, SAXException, ParserConfigurationException {
+        List<TracePackageElement> packageElements = new ArrayList<TracePackageElement>();
         TracePackageElement element = null;
         Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream);
 
@@ -236,8 +267,9 @@ public class TracePackageExtractManifestOperation extends AbstractTracePackageOp
                 }
 
                 element.setChildren(children.toArray(new TracePackageElement[] {}));
+                packageElements.add(element);
             }
         }
-        return element;
+        return packageElements.toArray(new TracePackageElement[] {});
     }
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
index 2717e70a49..ec3710b641 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
@@ -33,6 +33,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.operation.ModalContext;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
+import org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfTraceImportException;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.AbstractTracePackageOperation;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageBookmarkElement;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageElement;
@@ -40,7 +41,6 @@ import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePack
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageSupplFileElement;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageSupplFilesElement;
 import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageTraceElement;
-import org.eclipse.linuxtools.tmf.core.TmfCommonConstants;
 import org.eclipse.linuxtools.tmf.ui.editors.TmfEventsEditor;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfNavigatorContentProvider;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement;
@@ -61,25 +61,22 @@ import org.eclipse.ui.wizards.datatransfer.ImportOperation;
 @SuppressWarnings("restriction")
 public class TracePackageImportOperation extends AbstractTracePackageOperation implements IOverwriteQuery {
 
-    private final TracePackageTraceElement fImportTraceElement;
+    private final TracePackageElement[] fImportTraceElements;
     private final TmfTraceFolder fTmfTraceFolder;
 
-    // Result of reading the manifest
-    private TracePackageElement fResultElement;
-
     /**
      * Constructs a new import operation
      *
-     * @param importTraceElement
+     * @param importTraceElements
      *            the trace element to be imported
      * @param fileName
      *            the output file name
      * @param tmfTraceFolder
      *            the destination folder
      */
-    public TracePackageImportOperation(String fileName, TracePackageTraceElement importTraceElement, TmfTraceFolder tmfTraceFolder) {
+    public TracePackageImportOperation(String fileName, TracePackageElement[] importTraceElements, TmfTraceFolder tmfTraceFolder) {
         super(fileName);
-        fImportTraceElement = importTraceElement;
+        fImportTraceElements = importTraceElements;
         fTmfTraceFolder = tmfTraceFolder;
     }
 
@@ -168,7 +165,7 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
      */
     @Override
     public void run(IProgressMonitor progressMonitor) {
-        int totalWork = getNbCheckedElements(new TracePackageElement[] { fImportTraceElement }) * 2;
+        int totalWork = getNbCheckedElements(fImportTraceElements) * 2;
         progressMonitor.beginTask(Messages.TracePackageImportOperation_ImportingPackage, totalWork);
         doRun(progressMonitor);
         progressMonitor.done();
@@ -176,79 +173,108 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
 
     private void doRun(IProgressMonitor progressMonitor) {
         try {
-            setStatus(deleteExistingTrace(progressMonitor));
+            setStatus(deleteExistingTraces(progressMonitor));
             if (getStatus().getSeverity() != IStatus.OK) {
                 return;
             }
 
-            TracePackageElement[] children = fImportTraceElement.getChildren();
-            for (TracePackageElement element : children) {
-                ModalContext.checkCanceled(progressMonitor);
+            for (TracePackageElement packageElement : fImportTraceElements) {
+                TracePackageTraceElement traceElement = (TracePackageTraceElement) packageElement;
+                if (!isFilesChecked(packageElement)) {
+                    continue;
+                }
+
+                TracePackageElement[] children = traceElement.getChildren();
+                for (TracePackageElement element : children) {
+                    ModalContext.checkCanceled(progressMonitor);
 
-                if (element instanceof TracePackageFilesElement) {
-                    TracePackageFilesElement traceFilesElement = (TracePackageFilesElement) element;
-                    setStatus(importTraceFiles(progressMonitor, traceFilesElement));
+                    if (element instanceof TracePackageFilesElement) {
+                        TracePackageFilesElement traceFilesElement = (TracePackageFilesElement) element;
+                        setStatus(importTraceFiles(traceFilesElement, progressMonitor));
+
+                    } else if (element instanceof TracePackageSupplFilesElement) {
+                        TracePackageSupplFilesElement suppFilesElement = (TracePackageSupplFilesElement) element;
+                        setStatus(importSupplFiles(suppFilesElement, traceElement, progressMonitor));
+                    }
 
-                } else if (element instanceof TracePackageSupplFilesElement) {
-                    TracePackageSupplFilesElement suppFilesElement = (TracePackageSupplFilesElement) element;
-                    setStatus(importSupplFiles(progressMonitor, suppFilesElement));
+                    if (getStatus().getSeverity() != IStatus.OK) {
+                        return;
+                    }
                 }
 
-                if (getStatus().getSeverity() != IStatus.OK) {
+                String traceName = traceElement.getText();
+                IResource traceRes = fTmfTraceFolder.getResource().findMember(traceName);
+                if (traceRes == null || !traceRes.exists()) {
+                    setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorFindingImportedTrace, traceName)));
                     return;
                 }
-            }
 
-            String traceName = fImportTraceElement.getText();
-            IResource traceRes = fTmfTraceFolder.getResource().findMember(traceName);
-            if (traceRes == null || !traceRes.exists()) {
-                setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorFindingImportedTrace, traceName)));
-                return;
-            }
+                TraceTypeHelper traceType = null;
+                String traceTypeStr = traceElement.getTraceType();
+                if (traceTypeStr != null) {
+                    traceType = TmfTraceType.getInstance().getTraceType(traceTypeStr);
+                    if (traceType == null) {
+                        setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorSettingTraceType, traceElement.getTraceType(), traceName)));
+                        return;
+                    }
+                } else {
+                    try {
+                        progressMonitor.subTask(MessageFormat.format(Messages.TracePackageImportOperation_DetectingTraceType, traceName));
+                        traceType = TmfTraceType.getInstance().selectTraceType(traceRes.getLocation().toOSString(), null, null);
+                    } catch (TmfTraceImportException e) {
+                        // Could not figure out the type
+                    }
+                }
 
-            TraceTypeHelper traceType = TmfTraceType.getInstance().getTraceType(fImportTraceElement.getTraceType());
-            if (traceType == null) {
-                setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorSettingTraceType, fImportTraceElement.getTraceType(), traceName)));
-                return;
-            }
+                if (traceType != null) {
+                    try {
+                        TmfTraceType.setTraceType(traceRes.getFullPath(), traceType);
+                    } catch (CoreException e) {
+                        setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorSettingTraceType, traceElement.getTraceType(), traceName), e));
+                    }
+                }
 
-            try {
-                TmfTraceType.setTraceType(traceRes.getFullPath(), traceType);
-            } catch (CoreException e) {
-                setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorSettingTraceType, fImportTraceElement.getTraceType(), traceName), e));
+                importBookmarks(traceRes, traceElement, progressMonitor);
             }
 
-            importBookmarks(traceRes, progressMonitor);
+
 
         } catch (InterruptedException e) {
             setStatus(Status.CANCEL_STATUS);
         }
     }
 
-    private IStatus deleteExistingTrace(IProgressMonitor progressMonitor) {
+    private IStatus deleteExistingTraces(IProgressMonitor progressMonitor) {
         List<TmfTraceElement> traces = fTmfTraceFolder.getTraces();
-        TmfTraceElement existingTrace = null;
 
-        for (TmfTraceElement t : traces) {
-            if (t.getName().equals(fImportTraceElement.getText())) {
-                existingTrace = t;
-                break;
+        for (TracePackageElement packageElement : fImportTraceElements) {
+            TracePackageTraceElement traceElement = (TracePackageTraceElement) packageElement;
+            if (!isFilesChecked(traceElement)) {
+                continue;
             }
-        }
 
-        if (existingTrace != null) {
-            try {
-                existingTrace.delete(new SubProgressMonitor(progressMonitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
-            } catch (CoreException e) {
-                return new Status(IStatus.ERROR, Activator.PLUGIN_ID, org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.Messages.TracePackage_ErrorOperation, e);
+            TmfTraceElement existingTrace = null;
+            for (TmfTraceElement t : traces) {
+                if (t.getName().equals(traceElement.getText())) {
+                    existingTrace = t;
+                    break;
+                }
+            }
+
+            if (existingTrace != null) {
+                try {
+                    existingTrace.delete(new SubProgressMonitor(progressMonitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+                } catch (CoreException e) {
+                    return new Status(IStatus.ERROR, Activator.PLUGIN_ID, org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.Messages.TracePackage_ErrorOperation, e);
+                }
             }
         }
 
         return Status.OK_STATUS;
     }
 
-    private void importBookmarks(IResource traceRes, IProgressMonitor monitor) {
-        for (TracePackageElement o : fImportTraceElement.getChildren()) {
+    private void importBookmarks(IResource traceRes, TracePackageTraceElement traceElement, IProgressMonitor monitor) {
+        for (TracePackageElement o : traceElement.getChildren()) {
             if (o instanceof TracePackageBookmarkElement && o.isChecked()) {
 
                 // Get element
@@ -315,19 +341,18 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
         return fileMatch || folderMatch;
     }
 
-    private IStatus importTraceFiles(IProgressMonitor monitor, TracePackageFilesElement traceFilesElement) {
+    private IStatus importTraceFiles(TracePackageFilesElement traceFilesElement, IProgressMonitor monitor) {
         List<String> fileNames = new ArrayList<String>();
-        IPath prefix = new Path(TmfTraceFolder.TRACE_FOLDER_NAME);
         fileNames.add(traceFilesElement.getFileName());
         IPath containerPath = fTmfTraceFolder.getPath();
-        IStatus status = importFiles(getSpecifiedArchiveFile(), fileNames, prefix, containerPath, monitor);
+        IStatus status = importFiles(getSpecifiedArchiveFile(), fileNames, containerPath, monitor);
         if (status.isOK()) {
             new TmfNavigatorContentProvider().getChildren(fTmfTraceFolder);
         }
         return status;
     }
 
-    private IStatus importSupplFiles(IProgressMonitor monitor, TracePackageSupplFilesElement suppFilesElement) {
+    private IStatus importSupplFiles(TracePackageSupplFilesElement suppFilesElement, TracePackageTraceElement traceElement, IProgressMonitor monitor) {
         List<String> fileNames = new ArrayList<String>();
         for (TracePackageElement child : suppFilesElement.getChildren()) {
             TracePackageSupplFileElement supplFile = (TracePackageSupplFileElement) child;
@@ -336,30 +361,28 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
 
         if (!fileNames.isEmpty()) {
             List<TmfTraceElement> traces = fTmfTraceFolder.getTraces();
-            TmfTraceElement traceElement = null;
+            TmfTraceElement tmfTraceElement = null;
             for (TmfTraceElement t : traces) {
-                if (t.getName().equals(fImportTraceElement.getText())) {
-                    traceElement = t;
+                if (t.getName().equals(traceElement.getText())) {
+                    tmfTraceElement = t;
                     break;
                 }
             }
 
-            if (traceElement != null) {
+            if (tmfTraceElement != null) {
                 ArchiveFile archiveFile = getSpecifiedArchiveFile();
-                traceElement.refreshSupplementaryFolder();
-                String traceName = traceElement.getResource().getName();
+                tmfTraceElement.refreshSupplementaryFolder();
+                String traceName = tmfTraceElement.getResource().getName();
                 // Project/.tracing/tracename
-                IPath destinationContainerPath = traceElement.getTraceSupplementaryFolder(traceName).getFullPath();
-                // .tracing/tracename
-                IPath pathInArchive = new Path(TmfCommonConstants.TRACE_SUPPLEMENATARY_FOLDER_NAME).append(traceName);
-                return importFiles(archiveFile, fileNames, pathInArchive, destinationContainerPath, monitor);
+                IPath destinationContainerPath = tmfTraceElement.getTraceSupplementaryFolder(traceName).getFullPath();
+                return importFiles(archiveFile, fileNames, destinationContainerPath, monitor);
             }
         }
 
         return Status.OK_STATUS;
     }
 
-    private IStatus importFiles(ArchiveFile archiveFile, List<String> fileNames, IPath pathInArchive, IPath destinationContainerPath, IProgressMonitor monitor) {
+    private IStatus importFiles(ArchiveFile archiveFile, List<String> fileNames, IPath destinationContainerPath, IProgressMonitor monitor) {
         List<ArchiveProviderElement> objects = new ArrayList<ArchiveProviderElement>();
         Enumeration<?> entries = archiveFile.entries();
         while (entries.hasMoreElements()) {
@@ -372,13 +395,19 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
             }
 
             for (String fileName : fileNames) {
+
+                // Examples: Traces/kernel/     .tracing/testtexttrace.txt/statistics.ht
+                IPath searchedArchivePath = new Path(fileName);
+
                 // Check if this archive entry matches the searched file name at this archive location
-                IPath searchedArchivePath = pathInArchive.append(fileName);
                 if (fileNameMatches(searchedArchivePath.toString(), entryName)) {
-                    // Traces/kernel/metadata
-                    // kernel/metadata, the ImportOperation will take care of creating the kernel folder
-                    IPath destinationPath = fullArchivePath.removeFirstSegments(pathInArchive.segmentCount());
-                    // metadata
+                    // Traces/     .tracing/testtexttrace.txt/
+                    IPath searchedArchivePathContainer = searchedArchivePath.removeLastSegments(1);
+
+                    // Traces/kernel/metadata -> kernel/metadata   .tracing/testtexttrace.txt/statistics.ht -> statistics.ht
+                    // Note: The ImportOperation will take care of creating the kernel folder
+                    IPath destinationPath = fullArchivePath.makeRelativeTo(searchedArchivePathContainer);
+                    // metadata    statistics.ht
                     String resourceLabel = fullArchivePath.lastSegment();
 
                     ArchiveProviderElement pe = new ArchiveProviderElement(destinationPath.toString(), resourceLabel, archiveFile, entry);
@@ -419,14 +448,4 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
         // We always overwrite once we reach this point
         return null;
     }
-
-    /**
-     * Get the resulting element from extracting the manifest from the archive
-     *
-     * @return the resulting element
-     */
-    public TracePackageElement getResultElement() {
-        return fResultElement;
-    }
-
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/messages.properties b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/messages.properties
index 055afc0167..a5fc3ed167 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/messages.properties
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/messages.properties
@@ -10,9 +10,9 @@
 #     Marc-Andre Laperle - Initial API and implementation
 ###############################################################################
 
-ExportTracePackageSelectTraceWizardPage_ChooseTrace=Choose a trace to export
+ExportTracePackageSelectTraceWizardPage_ChooseTrace=Choose traces to export
 ExportTracePackageSelectTraceWizardPage_ProjectSelection=Project
-ExportTracePackageSelectTraceWizardPage_TraceSelection=Trace
+ExportTracePackageSelectTraceWizardPage_TraceSelection=Traces
 ExportTracePackageWizardPage_AlreadyExitst = Target file already exists. Would you like to overwrite it?
 ExportTracePackageWizardPage_ApproximateSizeLbl=Approximate uncompressed size: {0}
 ExportTracePackageWizardPage_ChooseContent=Choose the content to export
@@ -29,7 +29,7 @@ ExportTracePackageWizardPage_SizeMegabyte=MB
 ExportTracePackageWizardPage_SizeTerabyte=TB
 ExportTracePackageWizardPage_Title=Export trace package
 ExportTracePackageWizardPage_ToArchive=To &archive file:
-ImportTracePackageWizardPage_AlreadyExists=A trace with the same name already exists. Would you like to overwrite it?
+ImportTracePackageWizardPage_AlreadyExists=A trace with the name ''{0}'' already exists. Would you like to overwrite it?
 ImportTracePackageWizardPage_ErrorFileNotFound=File does not exist
 ImportTracePackageWizardPage_ErrorOperation=Error occurred during import trace operation
 ImportTracePackageWizardPage_ErrorSettingTraceType=Error setting the type {0} for the trace {1}
@@ -50,3 +50,4 @@ TracePackageExtractManifestOperation_SchemaFileNotFound=The schema file {0} coul
 TracePackageImportOperation_ErrorCreatingBookmark=Error creating bookmark for the trace {0}
 TracePackageImportOperation_ErrorCreatingBookmarkFile=Error creating bookmark file for the trace {0}
 TracePackageImportOperation_ImportingPackage=Importing package
+TracePackageImportOperation_DetectingTraceType=Detecting trace type for ''{0}''
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceType.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceType.java
index c3dfb185d4..09fb06ea99 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceType.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceType.java
@@ -634,8 +634,9 @@ public final class TmfTraceType {
      * @throws TmfTraceImportException
      *             if the traces don't match or there are errors in the trace
      *             file
+     * @since 2.2
      */
-    TraceTypeHelper selectTraceType(String path, Shell shell, String traceTypeHint) throws TmfTraceImportException {
+    public TraceTypeHelper selectTraceType(String path, Shell shell, String traceTypeHint) throws TmfTraceImportException {
         List<TraceTypeHelper> validCandidates = new ArrayList<TraceTypeHelper>();
         getCustomTraceTypes();
         final Set<String> traceTypes = fTraceTypes.keySet();
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java
index 12d7a29a5c..ebb16cba99 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java
@@ -108,7 +108,7 @@ public class FullTraceHistogram extends Histogram {
 
     @Override
     public void mouseDown(MouseEvent event) {
-        if (fDragState == DRAG_NONE && fDataModel.getNbEvents() != 0) {
+        if (fScaledData != null && fDragState == DRAG_NONE && fDataModel.getNbEvents() != 0) {
             if (event.button == 2 || (event.button == 1 && (event.stateMask & SWT.MODIFIER_MASK) == SWT.CTRL)) {
                 fDragState = DRAG_RANGE;
                 fDragButton = event.button;
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Histogram.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Histogram.java
index 9d3a29cb60..b2882d7ea1 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Histogram.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Histogram.java
@@ -685,6 +685,10 @@ public abstract class Histogram implements ControlListener, PaintListener, KeyLi
             final int width = image.getBounds().width;
             final int height = image.getBounds().height;
 
+            // Turn off anti-aliasing
+            int aliasing = imageGC.getAntialias();
+            imageGC.setAntialias(SWT.OFF);
+
             // Clear the drawing area
             imageGC.setBackground(fBackgroundColor);
             imageGC.fillRectangle(0, 0, image.getBounds().width + 1, image.getBounds().height + 1);
@@ -693,24 +697,24 @@ public abstract class Histogram implements ControlListener, PaintListener, KeyLi
             final int limit = width < scaledData.fWidth ? width : scaledData.fWidth;
             double factor = HistogramScaledData.hideLostEvents ? scaledData.fScalingFactor : scaledData.fScalingFactorCombined;
             for (int i = 0; i < limit; i++) {
-                imageGC.setForeground(fHistoBarColor);
                 final int value = (int) Math.ceil(scaledData.fData[i] * factor);
                 int x = i + fOffset;
-                imageGC.drawLine(x, height - value, x, height);
 
+                // in Linux, the last pixel in a line is not drawn,
+                // so draw lost events first, one pixel too far
                 if (!HistogramScaledData.hideLostEvents) {
                     imageGC.setForeground(fLostEventColor);
                     final int lostEventValue = (int) Math.ceil(scaledData.fLostEventsData[i] * factor);
                     if (lostEventValue != 0) {
-                        if (lostEventValue == 1) {
-                            // in linux, a line from x to x is not drawn, in windows it is.
-                            imageGC.drawPoint(x, height - value - 1);
-                        } else {
-                            // drawing a line is inclusive, so we need to remove 1 from the destination to have the correct length
-                            imageGC.drawLine(x, height - value - lostEventValue, x, height - value - 1);
-                        }
+                        // drawing a line is inclusive, so we should remove 1 from y2
+                        // but we don't because Linux
+                        imageGC.drawLine(x, height - value - lostEventValue, x, height - value);
                     }
                 }
+
+                // then draw normal events second, to overwrite that extra pixel
+                imageGC.setForeground(fHistoBarColor);
+                imageGC.drawLine(x, height - value, x, height);
             }
 
             // Draw the selection bars
@@ -743,6 +747,9 @@ public abstract class Histogram implements ControlListener, PaintListener, KeyLi
             imageGC.setBackground(fFillColor);
             imageGC.fillRectangle(delimiterIndex + 1, 0, width - (delimiterIndex + 1), height);
 
+            // Restore anti-aliasing
+            imageGC.setAntialias(aliasing);
+
         } catch (final Exception e) {
             // Do nothing
         }
@@ -771,6 +778,10 @@ public abstract class Histogram implements ControlListener, PaintListener, KeyLi
      */
     protected void drawTimeRangeWindow(GC imageGC, long rangeStartTime, long rangeDuration) {
 
+        if (fScaledData == null) {
+            return;
+        }
+
         // Map times to histogram coordinates
         long bucketSpan = Math.max(fScaledData.fBucketDuration, 1);
         long startTime = Math.min(rangeStartTime, rangeStartTime + rangeDuration);
@@ -780,17 +791,18 @@ public abstract class Histogram implements ControlListener, PaintListener, KeyLi
         int right = left + rangeWidth;
         int center = (left + right) / 2;
         int height = fCanvas.getSize().y;
+        int arc = Math.min(15, rangeWidth);
 
         // Draw the selection window
         imageGC.setForeground(fTimeRangeColor);
         imageGC.setLineWidth(1);
         imageGC.setLineStyle(SWT.LINE_SOLID);
-        imageGC.drawRoundRectangle(left, 0, rangeWidth, height - 1, 15, 15);
+        imageGC.drawRoundRectangle(left, 0, rangeWidth, height - 1, arc, arc);
 
         // Fill the selection window
         imageGC.setBackground(fTimeRangeColor);
         imageGC.setAlpha(35);
-        imageGC.fillRoundRectangle(left + 1, 1, rangeWidth - 1, height - 2, 15, 15);
+        imageGC.fillRoundRectangle(left + 1, 1, rangeWidth - 1, height - 2, arc, arc);
         imageGC.setAlpha(255);
 
         // Draw the cross hair
@@ -826,7 +838,7 @@ public abstract class Histogram implements ControlListener, PaintListener, KeyLi
 
     @Override
     public void mouseDown(final MouseEvent event) {
-        if (event.button == 1 && fDragState == DRAG_NONE && fDataModel.getNbEvents() != 0) {
+        if (fScaledData != null && event.button == 1 && fDragState == DRAG_NONE && fDataModel.getNbEvents() != 0) {
             fDragState = DRAG_SELECTION;
             fDragButton = event.button;
             if ((event.stateMask & SWT.MODIFIER_MASK) == SWT.SHIFT) {
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java
index e5d5b22b4c..04b99e932e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java
@@ -114,7 +114,7 @@ public class TimeRangeHistogram extends Histogram {
 
     @Override
     public void mouseDown(MouseEvent event) {
-        if (fDragState == DRAG_NONE && fDataModel.getNbEvents() != 0) {
+        if (fScaledData != null && fDragState == DRAG_NONE && fDataModel.getNbEvents() != 0) {
             if (event.button == 2 || (event.button == 1 && (event.stateMask & SWT.MODIFIER_MASK) == SWT.CTRL)) {
                 fDragState = DRAG_RANGE;
                 fDragButton = event.button;
diff --git a/lttng/pom.xml b/lttng/pom.xml
index 66c8a3fd1b..7c281f5cd6 100644
--- a/lttng/pom.xml
+++ b/lttng/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.lttng</groupId>
diff --git a/man/org.eclipse.linuxtools.man-feature/pom.xml b/man/org.eclipse.linuxtools.man-feature/pom.xml
index 270d8c6858..ef640bb788 100644
--- a/man/org.eclipse.linuxtools.man-feature/pom.xml
+++ b/man/org.eclipse.linuxtools.man-feature/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.man</groupId>
     <artifactId>linuxtools-man-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.man</artifactId>
diff --git a/man/org.eclipse.linuxtools.man.core/pom.xml b/man/org.eclipse.linuxtools.man.core/pom.xml
index 9201eb8a6f..e16b90b869 100644
--- a/man/org.eclipse.linuxtools.man.core/pom.xml
+++ b/man/org.eclipse.linuxtools.man.core/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.man</groupId>
     <artifactId>linuxtools-man-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.man.core</artifactId>
diff --git a/man/pom.xml b/man/pom.xml
index e505ce4f8d..6bfd5e0229 100644
--- a/man/pom.xml
+++ b/man/pom.xml
@@ -19,12 +19,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.man</groupId>
   <artifactId>linuxtools-man-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools Man Parent</name>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml
index fc682e179a..473bfc8462 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.feature</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/pom.xml
index b872509c2a..d70ab3d92c 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.core.tests</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml
index 5516d5cd39..d67c47e905 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.core</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/pom.xml
index 9aef8334a1..666653d201 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.doc/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.doc</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs
index 1ac25acb97..cfdbcb3f8c 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
@@ -43,6 +44,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warni
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
@@ -63,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
@@ -77,7 +80,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
@@ -86,6 +89,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.ui.prefs b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..879fe26342
--- /dev/null
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml
index a0ec6200dc..b07a63b43e 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.launch.tests</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java
index 47748855d3..dd285d7953 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java
@@ -11,7 +11,8 @@
 
 package org.eclipse.linuxtools.oprofile.launch.tests;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunch;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunchingExternalProject.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunchingExternalProject.java
index 44d139ae0e..0615407447 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunchingExternalProject.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunchingExternalProject.java
@@ -11,13 +11,13 @@
 
 package org.eclipse.linuxtools.oprofile.launch.tests;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
index 76337beb9f..a03802351a 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestManualLaunching.java
@@ -11,7 +11,8 @@
 
 package org.eclipse.linuxtools.oprofile.launch.tests;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunch;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java
index 28abac6783..5634c4a65b 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java
@@ -11,7 +11,10 @@
 
 package org.eclipse.linuxtools.oprofile.launch.tests;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml
index 215a7ff77f..47cca3d559 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.launch</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/pom.xml
index bca79d58fd..ae032f2580 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.remote.feature</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/pom.xml
index 0c4dcce14e..94c5d38b31 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
     <artifactId>org.eclipse.linuxtools.oprofile.remote.launch</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/pom.xml
index 2b996d6c50..c4f7972ef5 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.tests</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/pom.xml
index 946bf1e1a6..1c3e8fbabd 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.ui.tests</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.ui/pom.xml
index 47d2bc92d9..ca1cdaad5f 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/pom.xml
+++ b/oprofile/org.eclipse.linuxtools.oprofile.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-oprofile-parent</artifactId>
     <groupId>org.eclipse.linuxtools.oprofile</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.ui</artifactId>
diff --git a/oprofile/pom.xml b/oprofile/pom.xml
index 9b8236bc6d..8eca658816 100644
--- a/oprofile/pom.xml
+++ b/oprofile/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.oprofile</groupId>
   <artifactId>linuxtools-oprofile-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools OProfile Parent</name>
diff --git a/perf/org.eclipse.linuxtools.perf-feature/pom.xml b/perf/org.eclipse.linuxtools.perf-feature/pom.xml
index 916ac2460b..72672fe02a 100644
--- a/perf/org.eclipse.linuxtools.perf-feature/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-perf-parent</artifactId>
     <groupId>org.eclipse.linuxtools.perf-parent</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf.feature</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf.doc/pom.xml b/perf/org.eclipse.linuxtools.perf.doc/pom.xml
index 75cf37a30a..d067b427bf 100644
--- a/perf/org.eclipse.linuxtools.perf.doc/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.doc/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>linuxtools-perf-parent</artifactId>
     <groupId>org.eclipse.linuxtools.perf-parent</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf.doc</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml b/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
index 90509ccde8..63bcdce3ac 100644
--- a/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-perf-parent</artifactId>
     <groupId>org.eclipse.linuxtools.perf-parent</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf.remote.feature</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf.swtbot.tests/pom.xml b/perf/org.eclipse.linuxtools.perf.swtbot.tests/pom.xml
index ae23645e66..30dc64e27e 100644
--- a/perf/org.eclipse.linuxtools.perf.swtbot.tests/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.swtbot.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-perf-parent</artifactId>
     <groupId>org.eclipse.linuxtools.perf-parent</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf.swtbot.tests</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs
index 0591f52a10..a74bf7880f 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs
@@ -7,7 +7,11 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -80,7 +84,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
diff --git a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.ui.prefs b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..879fe26342
--- /dev/null
+++ b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/perf/org.eclipse.linuxtools.perf.tests/pom.xml b/perf/org.eclipse.linuxtools.perf.tests/pom.xml
index 30f9e17da4..6d157920b8 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-perf-parent</artifactId>
     <groupId>org.eclipse.linuxtools.perf-parent</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf.tests</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/DataManipulatorTest.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/DataManipulatorTest.java
index ac5aeb7040..b06086794f 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/DataManipulatorTest.java
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/DataManipulatorTest.java
@@ -18,7 +18,6 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.perf.PerfPlugin;
 import org.eclipse.linuxtools.internal.perf.ReportComparisonData;
 import org.eclipse.linuxtools.internal.perf.SourceDisassemblyData;
 import org.eclipse.linuxtools.internal.perf.StatData;
diff --git a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/StatsComparisonTest.java b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/StatsComparisonTest.java
index a52dd0601f..b79580047a 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/StatsComparisonTest.java
+++ b/perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/StatsComparisonTest.java
@@ -14,7 +14,6 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
@@ -24,8 +23,6 @@ import java.util.ArrayList;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.perf.BaseDataManipulator;
-import org.eclipse.linuxtools.internal.perf.PerfPlugin;
 import org.eclipse.linuxtools.internal.perf.StatComparisonData;
 import org.eclipse.linuxtools.internal.perf.model.PMStatEntry;
 import org.junit.Before;
diff --git a/perf/org.eclipse.linuxtools.perf/pom.xml b/perf/org.eclipse.linuxtools.perf/pom.xml
index c57a0ac77e..6c26c1e932 100644
--- a/perf/org.eclipse.linuxtools.perf/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-perf-parent</artifactId>
     <groupId>org.eclipse.linuxtools.perf-parent</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf</artifactId>
diff --git a/perf/pom.xml b/perf/pom.xml
index e5ea73a93f..5d7a29cc47 100644
--- a/perf/pom.xml
+++ b/perf/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.perf-parent</groupId>
   <artifactId>linuxtools-perf-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools Perf Parent</name>
diff --git a/pom.xml b/pom.xml
index 86c7572101..5ff9622501 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,11 +17,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.0.5</maven>
   </prerequisites>
   <groupId>org.eclipse.linuxtools</groupId>
   <artifactId>linuxtools-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools Parent</name>
diff --git a/profiling/org.eclipse.linuxtools.binutils/pom.xml b/profiling/org.eclipse.linuxtools.binutils/pom.xml
index 273aaefb83..5c5b45210a 100644
--- a/profiling/org.eclipse.linuxtools.binutils/pom.xml
+++ b/profiling/org.eclipse.linuxtools.binutils/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.binutils</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
index 4f3b249d36..cfc8d6a718 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.dataviewers.feature</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/pom.xml
index faadc24d33..06f09a421a 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers.annotatedsourceeditor/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.dataviewers.annotatedsourceeditor</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml
index f4e544b35a..52745aca4a 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.dataviewers.charts</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml
index f023bea780..86c5bece94 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.dataviewers.piechart</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers/pom.xml
index 90de19835f..e1e2e23eb5 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.dataviewers</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
index 420a3cfa8c..30fecae7f2 100644
--- a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml b/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml
index b9d6765613..4d7fec02f9 100644
--- a/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
     <artifactId>linuxtools-profiling-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.docs</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml
index 8d29275b59..b10c3f7a98 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
index f487ca53c8..c85edac261 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.launch</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml b/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml
index 99c93c199e..65638a8449 100644
--- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.provider.tests</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
index 2be5c96d92..a619444b8a 100644
--- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.remote</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml b/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml
index 3c523d97bd..74f47879e1 100644
--- a/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.tests</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml b/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml
index eb67d0bdf7..2737f36432 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.ui.capability</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml b/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml
index b60853a4ae..45860c97b8 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.ui</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
index f4dfbeb924..9c1d867dfc 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rdt.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml b/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml
index 564228d376..ee46dcbf6f 100644
--- a/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml
+++ b/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.ssh.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch-feature/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch-feature/pom.xml
index 68f40b92b4..89ea2c4edd 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.tools.launch-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tools.launch</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml
index cb80c84877..636dad2851 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tools.launch.core</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml
index 98b5c34ab2..0fd451c532 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml
+++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-profiling-parent</artifactId>
     <groupId>org.eclipse.linuxtools.profiling</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tools.launch.ui</artifactId>
diff --git a/profiling/pom.xml b/profiling/pom.xml
index eedc6a5221..77b6a8c7f0 100644
--- a/profiling/pom.xml
+++ b/profiling/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.profiling</groupId>
   <artifactId>linuxtools-profiling-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools Profiling Framework Parent</name>
diff --git a/releng/org.eclipse.linuxtools.license-feature/pom.xml b/releng/org.eclipse.linuxtools.license-feature/pom.xml
index a9b62742a6..ffc672ff79 100644
--- a/releng/org.eclipse.linuxtools.license-feature/pom.xml
+++ b/releng/org.eclipse.linuxtools.license-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-releng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.releng</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.license.feature</artifactId>
diff --git a/releng/org.eclipse.linuxtools.releng-site/pom.xml b/releng/org.eclipse.linuxtools.releng-site/pom.xml
index 88b5eff312..21201023ad 100644
--- a/releng/org.eclipse.linuxtools.releng-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.releng-site/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.releng</groupId>
     <artifactId>linuxtools-releng-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.releng-site</artifactId>
diff --git a/releng/pom.xml b/releng/pom.xml
index dbf41789d5..997ca71e6c 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -19,12 +19,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.releng</groupId>
   <artifactId>linuxtools-releng-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools Releng Parent</name>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml b/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
index 3cc8106373..13074f0380 100644
--- a/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml b/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml
index 909e4bb361..40b9fcd94c 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.core.tests</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/pom.xml b/rpm/org.eclipse.linuxtools.rpm.core/pom.xml
index 85545d3539..6e0af14e02 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.core</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml b/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml
index 062ea8c0e2..2ec0301d13 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.createrepo</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml b/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml
index e23a38c97e..7b2c5406a4 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.rpmlint</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml
index f73d6b74ae..c8c1bbe6cc 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.ui.editor.doc</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml
index 5803458967..39bfb28a87 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.ui.editor.tests</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml
index 8c65fbaa9f..f43dd60e07 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.ui.editor</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml
index d7a4be988c..df30132a12 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.ui</artifactId>
diff --git a/rpm/pom.xml b/rpm/pom.xml
index 06cac8f1b4..c6221573ec 100644
--- a/rpm/pom.xml
+++ b/rpm/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.rpm</groupId>
   <artifactId>linuxtools-rpm-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools RPM Parent</name>
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/pom.xml b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/pom.xml
index 15dc2aa764..f87b6807ec 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/pom.xml
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.rpmstubby</groupId>
     <artifactId>linuxtools-rpmstubby-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpmstubby.feature</artifactId>
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/pom.xml b/rpmstubby/org.eclipse.linuxtools.rpmstubby/pom.xml
index 1f2423d52c..ce342c714d 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/pom.xml
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.rpmstubby</groupId>
     <artifactId>linuxtools-rpmstubby-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpmstubby</artifactId>
diff --git a/rpmstubby/pom.xml b/rpmstubby/pom.xml
index 09a78b87ff..16537f784e 100644
--- a/rpmstubby/pom.xml
+++ b/rpmstubby/pom.xml
@@ -19,12 +19,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.rpmstubby</groupId>
   <artifactId>linuxtools-rpmstubby-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools RPM Stubby Parent</name>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
index 4d335b4c76..4e35e1fb9c 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.callgraph.feature</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml
index 46c0d669f3..a315c82b42 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.callgraph.core</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml
index fe29c8bc06..5ffc199ff5 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.callgraph.docs</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
index f39290e809..c462f3b22f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.callgraph.launch.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml
index 2e7a528ea3..82dbf2cf33 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.callgraph.launch</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml
index 8249bbd68e..2310972a8f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.callgraph.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph/pom.xml
index fcd1f290d3..b11aae258f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.callgraph</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
index 16fc1e0637..97caab6c2e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core.tests/pom.xml
index 7ad0f89564..7b487b81c7 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.graphingapi.core.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core/pom.xml
index 0ab8c0a492..fa8fdc5e36 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.graphingapi.core</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/pom.xml
index 27addf0c72..3b6d731d85 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.graphingapi.ui</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties
index 9a7c2c05f3..01b0dc6be4 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties
@@ -139,7 +139,7 @@ SelectGraphAndSeriesWizardPage.SelectGraphAndSeries=Select Graph and Series
 SelectGraphAndSeriesWizardPage.Graph=Graph Type:
 SelectGraphAndSeriesWizardPage.Title=Title:
 SelectGraphAndSeriesWizardPage.XSeries=X Series:
-SelectGraphAndSeriesWizardPage.RowID=Row ID
+SelectGraphAndSeriesWizardPage.RowID=Row Num
 SelectGraphAndSeriesWizardPage.YSeries=Y Series {0}:
 SelectGraphAndSeriesWizardPage.TitleNotSet=Title not set
 SelectGraphAndSeriesWizardPage.KeyFilter=Key filter:
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java
index 4aef7194d1..f8c15293a7 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java
@@ -290,7 +290,8 @@ public class DataGrid implements IUpdateListener {
 					item = new TableItem(table, SWT.NONE);
 					os = filteredDataSet.getRow(i);
 
-					item.setText(0, "" + i); //$NON-NLS-1$
+					//Add 1 to the index/row num since graphs start counting rows at 1, not 0.
+					item.setText(0, Integer.toString(i + 1));
 					for(j=0; j<os.length; j++) {
 						//Ignore null items
 						if (os[j] != null) {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/dataset/DataSetFactory.java b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/dataset/DataSetFactory.java
index 4f00d2ac5c..92c0cb92ed 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/dataset/DataSetFactory.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/dataset/DataSetFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.linuxtools.systemtap.graphingapi.core.datasets.row.RowDataSet
 import org.eclipse.linuxtools.systemtap.graphingapi.core.datasets.table.FilteredTableDataSet;
 import org.eclipse.linuxtools.systemtap.graphingapi.core.datasets.table.TableDataSet;
 import org.eclipse.linuxtools.systemtap.graphingapi.ui.datadisplay.DataGrid;
-import org.eclipse.linuxtools.systemtap.graphingapi.ui.wizards.graph.SelectGraphAndSeriesWizard;
 import org.eclipse.swt.widgets.Composite;
 
 
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java
index da330f5975..227488af25 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java
@@ -391,14 +391,16 @@ public class SelectGraphAndSeriesWizardPage extends WizardPage implements Listen
 	}
 
 	private void checkErrors(){
-		if(txtTitle.getText().length() == 0) {
-			setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.TitleNotSet")); //$NON-NLS-1$
-		} else if(!isSeriesUnique()) {
+		if(!isSeriesUnique()) {
 			setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.SeriesNotUnique")); //$NON-NLS-1$
 		}
 		else if(isSeriesDeleted()) {
 			setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.SeriesDeleted")); //$NON-NLS-1$
-		} else {
+		}
+		else if(txtTitle.getText().length() == 0) {
+			setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.TitleNotSet")); //$NON-NLS-1$
+		}
+		else {
 			setErrorMessage(null);
 		}
 		getWizard().getContainer().updateButtons();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
index a2abde5ace..642475c6b4 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.structures.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml
index b4c55249c7..d4d50ff800 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.structures</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
index ae6c212c09..fdd9192736 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.consolelog.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml
index aabf938004..5cf665af2d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.consolelog</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml
index 522ccf60b6..de6b4e0dab 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.doc</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml
index b95995b9c2..114c4115dc 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.editor</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/pom.xml
index 2c4413be6d..dada04cf88 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.graphing</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
index a05053a1f8..5ccf9c086b 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.ide.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
index 0561f09daf..58e70188bc 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
@@ -523,7 +523,7 @@ public class TestCreateSystemtapScript {
 		assertEquals(title, text.getText());
 
 		SWTBotCombo combo_x = bot.comboBoxWithLabel("X Series:");
-		assertEquals(3, combo_x.itemCount()); // X Series includes "Row ID" as a selection
+		assertEquals(3, combo_x.itemCount()); // X Series includes "Row Num" as a selection
 		SWTBotCombo combo_y0 = bot.comboBoxWithLabel("Y Series 0:");
 		assertEquals(2, combo_y0.itemCount()); // Y Series 0 only includes series entries
 		combo_y0.setSelection(0);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties
index 9a259e52f2..a2155f4002 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties
@@ -46,8 +46,11 @@ action.import.name=Import Tapset...
 action.import.desc=Import tapset directory
 action.runOptions.name=Run w/Options
 action.runOptions.desc=Run the Script w/Options
-action.run.name=Run
-action.run.desc=Run the Script
+action.run.name=Simple Run
+action.run.desc=Run the script without options/charts
+
+launch.run.name=SystemTap Script
+launch.run.desc=Run SystemTap script with project launch options
 
 action.runChart.name=Run w/Chart
 action.runChart.desc=Run the Script w/Chart
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
index c630cc1ac2..e18337135f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
@@ -63,6 +63,9 @@
                 icon="icons/actions/run/run_exc.gif"
                 label="%action.run.name"
                 style="push">
+             <visibleWhen
+                   checkEnabled="true">
+             </visibleWhen>
           </command>
        </menuContribution>
        <menuContribution
@@ -269,6 +272,7 @@
 			targetID="org.eclipse.linuxtools.systemtap.ui.ide.IDEPerspective">
 			<actionSet id="org.eclipse.linuxtools.systemtap.ui.editor.FileActionSet"/>
 			<actionSet id="org.eclipse.linuxtools.systemtap.ui.ide.FileActionSet"/>
+			<actionSet id="org.eclipse.debug.ui.launchActionSet"/>
 
 		</perspectiveExtension>
 		<perspectiveExtension
@@ -306,7 +310,9 @@
     <shortcut
           class="org.eclipse.linuxtools.internal.systemtap.ui.ide.launcher.SystemTapScriptLaunchShortcut"
           id="org.eclipse.linuxtools.systemtap.ui.ide.StapLaunchShortcut"
-          label="Systemtap Script"
+          label="%launch.run.name"
+          description="%launch.run.desc"
+          icon="icons/smileytap_small.gif"
           modes="run">
        <contextualLaunch>
           <enablement>
@@ -327,12 +333,17 @@
                                   value="*.stp">
                             </test>
                          </and>
-                         <with
-                               variable="activeEditorId">
-                            <equals
-                                  value="org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor">
-                            </equals>
-                         </with>
+                         <and>
+                            <instanceof
+                                  value="org.eclipse.ui.IPathEditorInput">
+                            </instanceof>
+                            <with
+                                  variable="activeEditorId">
+                               <equals
+                                     value="org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor">
+                               </equals>
+                            </with>
+                         </and>
                       </or>
                    </iterate>
                 </with>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
index 470b6fb5f8..1f5d871130 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.ide</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/actions/RunScriptHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/actions/RunScriptHandler.java
index a8a31adb34..3d7b8f81eb 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/actions/RunScriptHandler.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/actions/RunScriptHandler.java
@@ -45,10 +45,14 @@ import org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences.EnvironmentV
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IPathEditorInput;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.ResourceUtil;
-
 import com.jcraft.jsch.JSchException;
 
 /**
@@ -67,6 +71,8 @@ public class RunScriptHandler extends AbstractHandler {
 	 */
 	protected boolean continueRun = true;
 	private boolean runLocal = true;
+	private IEditorPart ed = null;
+	private Shell shell = null;
 	private String fileName = null;
 	private String tmpfileName = null;
 	private String serverfileName = null;
@@ -86,13 +92,60 @@ public class RunScriptHandler extends AbstractHandler {
 	}
 
 	/**
+	 * Finds the editor containing the target script to run, so the script can be saved
+	 * when it is run, if appropriate.
+	 * The script is saved when it is run with the "simple" run button on the toolbar (path == null),
+	 * or if the script is outside of a project (working with a PathEditorInput).
+	 */
+	private void findTargetEditor() {
+		ed = null;
+		shell = null;
+
+		if (path == null) {
+			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+			ed = window.getActivePage().getActiveEditor();
+			shell = window.getShell();
+			return;
+		}
+
+		for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) {
+			IEditorPart ed_test = window.getActivePage().getActiveEditor();
+			if (matchesEditor(ed_test.getEditorInput(), ed_test, window.getShell())) {
+				return;
+			}
+			for (IEditorReference ref : window.getActivePage().getEditorReferences()) {
+				try {
+					if (matchesEditor(ref.getEditorInput(), ref.getEditor(false), window.getShell())) {
+						return;
+					}
+				} catch (PartInitException e) {
+					continue;
+				}
+			}
+		}
+	}
+
+	private boolean matchesEditor(IEditorInput input, IEditorPart editor, Shell shell) {
+		if (input instanceof IPathEditorInput && ((IPathEditorInput) (input)).getPath().equals(this.path)) {
+			// Only save the editor when working with a file without a project (PathEditorInput),
+			// otherwise the editor isn't needed at all (saving is handled elsewhere in that case).
+			if (input instanceof PathEditorInput) {
+				this.ed = editor;
+				this.shell = shell;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
 	 * The main body of this event. Starts by making sure the current editor is valid to run,
 	 * then builds the command line arguments for stap and retrieves the environment variables.
 	 * Finally, it gets an instance of <code>ScriptConsole</code> to run the script.
 	 */
 	@Override
 	public Object execute(ExecutionEvent event){
-
+		findTargetEditor();
 		if(isValid()) {
 			if(getRunLocal() == false) {
 				try{
@@ -156,7 +209,9 @@ public class RunScriptHandler extends AbstractHandler {
 		if (path != null){
 			return path.toOSString();
 		}
-		IEditorPart ed = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+		if (ed == null) {
+			return ""; //$NON-NLS-1$
+		}
 		if(ed.getEditorInput() instanceof PathEditorInput){
 			return ((PathEditorInput)ed.getEditorInput()).getPath().toString();
 		} else {
@@ -172,26 +227,30 @@ public class RunScriptHandler extends AbstractHandler {
 	private boolean isValid() {
 		// If the path is not set this action will run the script from
 		// the active editor
-		if (this.path == null){
-			IEditorPart ed = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-			if(!isValidEditor(ed)){
+		if(!tryEditorSave()){
+			if (this.path == null){
+				String msg = MessageFormat.format(Localization.getString("RunScriptAction.NoScriptFile"),(Object[]) null); //$NON-NLS-1$
+				MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Localization.getString("RunScriptAction.Problem"), msg); //$NON-NLS-1$
 				return false;
 			}
 		}
-
-		return this.getFilePath().endsWith(".stp") //$NON-NLS-1$
-				&& isValidDirectory(this.getFilePath());
+		String filePath = this.getFilePath();
+		return filePath.endsWith(".stp") //$NON-NLS-1$
+				&& isValidDirectory(filePath);
 	}
 
-	private boolean isValidEditor(IEditorPart ed) {
+	private boolean tryEditorSave() {
 		if(null == ed) {
-			String msg = MessageFormat.format(Localization.getString("RunScriptAction.NoScriptFile"),(Object[]) null); //$NON-NLS-1$
-			MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Localization.getString("RunScriptAction.Problem"), msg); //$NON-NLS-1$
 			return false;
 		}
 
 		if(ed.isDirty()) {
-			ed.doSave(new ProgressMonitorPart(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), new FillLayout()));
+			Display.getDefault().syncExec(new Runnable() {
+				@Override
+				public void run() {
+					ed.doSave(new ProgressMonitorPart(shell, new FillLayout()));
+				}
+			});
 		}
 
 		return true;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java
index 2a1a9dba72..8805beaf50 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/Messages.java
@@ -74,6 +74,8 @@ public class Messages extends NLS {
 	public static String SystemTapScriptLaunchConfigurationTab_runWithChart;
 	public static String SystemTapScriptLaunchShortcut_couldNotFindConfig;
 	public static String SystemTapScriptLaunchShortcut_couldNotLaunchScript;
+	public static String SystemTapScriptLaunchConfigurationTab_couldNotFindFile;
+	public static String SystemTapScriptLaunchConfigurationTab_fileNotStp;
 	public static String SystemTapScriptOptionsTab_0;
 	public static String SystemTapScriptOptionsTab_1;
 	public static String SystemTapScriptOptionsTab_2;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationDelegate.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationDelegate.java
index 3915d68b81..4101453916 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationDelegate.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationDelegate.java
@@ -39,7 +39,7 @@ public class SystemTapScriptLaunchConfigurationDelegate extends
 
 	static final String CONFIGURATION_TYPE = "org.eclipse.linuxtools.systemtap.ui.ide.SystemTapLaunchConfigurationType"; //$NON-NLS-1$
 
-	private IProject[] scriptProject = new IProject[1];
+	private IProject[] scriptProject;
 
 	/**
 	 * Keep a reference to the target running script's parent project, so only that project
@@ -55,11 +55,10 @@ public class SystemTapScriptLaunchConfigurationDelegate extends
 		// Find the parent project of the target script.
 		IPath path = Path.fromOSString(configuration.getAttribute(SystemTapScriptLaunchConfigurationTab.SCRIPT_PATH_ATTR, (String)null));
 		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
-		IProject project = file == null ? null : file.getProject();
+		scriptProject = file == null ? null : new IProject[]{file.getProject()};
 
 		// Only save the target script's project if a project is found.
-		if (project != null) {
-			scriptProject[0] = project;
+		if (scriptProject != null) {
 			return super.preLaunchCheck(configuration, mode, monitor);
 		}
 		return true;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java
index 7914859e53..bf14fa39c6 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java
@@ -11,9 +11,12 @@
 
 package org.eclipse.linuxtools.internal.systemtap.ui.ide.launcher;
 
+import java.text.MessageFormat;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -65,6 +68,15 @@ public class SystemTapScriptLaunchConfigurationTab extends
 	private Label hostNamelabel;
 	private FileDialog fileDialog;
 
+	/**
+	 * @return The path of the chosen script the Run Configuration will be applied to,
+	 * or <code>null</code> if no file exists at the given path.
+	 */
+	IPath getScriptPath() {
+		IPath scriptPath = new Path(scriptPathText.getText());
+		return scriptPath.toFile().exists() ? scriptPath : null;
+	}
+
 	@Override
 	public void createControl(Composite parent) {
 
@@ -268,6 +280,24 @@ public class SystemTapScriptLaunchConfigurationTab extends
 	}
 
 	@Override
+	public boolean isValid(ILaunchConfiguration launchConfig) {
+		setErrorMessage(null);
+
+		IPath scriptPath = getScriptPath();
+		if (scriptPath == null) {
+			setErrorMessage(MessageFormat.format(Messages.SystemTapScriptLaunchConfigurationTab_couldNotFindFile, scriptPathText.getText()));
+			return false;
+		}
+		String extension = scriptPath.getFileExtension();
+		if (extension == null || !extension.equals("stp")) { //$NON-NLS-1$
+			setErrorMessage(Messages.SystemTapScriptLaunchConfigurationTab_fileNotStp);
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override
 	public String getName() {
 		return Messages.SystemTapScriptLaunchConfigurationTab_9;
 	}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties
index 5e0f2fa38b..448a9a9e25 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/messages.properties
@@ -72,6 +72,8 @@ SystemTapScriptLaunchConfigurationTab_11=Select Systemtap Script
 SystemTapScriptLaunchConfigurationTab_errorInitializingTab=Could not initialize tab
 SystemTapScriptLaunchConfigurationTab_options=Options:
 SystemTapScriptLaunchConfigurationTab_runWithChart=Run the script with a chart.
+SystemTapScriptLaunchConfigurationTab_couldNotFindFile=No Systemtap script exists with the path {0}.
+SystemTapScriptLaunchConfigurationTab_fileNotStp=Must provide a path to a valid Systemtap script (with extension ".stp").
 SystemTapScriptLaunchShortcut_couldNotFindConfig=Could Not Find configuration
 SystemTapScriptLaunchShortcut_couldNotLaunchScript=Could Not Launch Script
 SystemTapScriptOptionsTab_0=Select target executable.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/pom.xml
index daadb61de1..bf7f8c975a 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.systemtapgui</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.tests/pom.xml
index b2fd6fe939..bb6aea9f5e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.tests</artifactId>
diff --git a/systemtap/pom.xml b/systemtap/pom.xml
index 6ca73a98d6..8238e2d4d2 100644
--- a/systemtap/pom.xml
+++ b/systemtap/pom.xml
@@ -15,12 +15,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.systemtap</groupId>
   <artifactId>linuxtools-systemtap-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools SystemTap Parent</name>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
index 0848de3f39..fbda4ceb49 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml
index 20808b9c50..a6c9e6e337 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.cachegrind.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml
index 557b094013..2a73078d21 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.cachegrind</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml
index e4077318f2..5af19ba3ab 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.core</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml
index 508795b2d8..c5b265ba1f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.doc</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml
index 3de2779379..ec3b19b3e5 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.helgrind.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml
index 6cbb766467..c5d196da1e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.helgrind</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
index ae4dc3e08b..f04de5ddab 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.launch</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml
index 5c32fa4523..a2c36e90c7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.massif.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml
index e172aaeafb..b0dbed4dda 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.massif</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/pom.xml
index 034678e233..8e8c688eff 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.memcheck.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml
index b404674d93..8349be0c18 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.memcheck</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
index 51a5c3f12f..6e023ea4c0 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.remote</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml
index fa710751d8..fa50ca44f1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml
index 99ae052ec4..e956cb8c67 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.ui.editor</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
index 60eec68d2b..35f07898da 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.ui.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml
index d3234dca51..e4a8708093 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-valgrind-parent</artifactId>
     <groupId>org.eclipse.linuxtools.valgrind</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.ui</artifactId>
diff --git a/valgrind/pom.xml b/valgrind/pom.xml
index 143327db9d..9ada87bf00 100644
--- a/valgrind/pom.xml
+++ b/valgrind/pom.xml
@@ -16,12 +16,11 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.valgrind</groupId>
   <artifactId>linuxtools-valgrind-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools Valgrind Parent</name>