Set next release to be 3.1.0.

Change-Id: I4731f53db522baccec56da9d51e7a37dc8a71b64
Reviewed-on: https://git.eclipse.org/r/27612
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
Tested-by: Jeff Johnston <jjohnstn@redhat.com>

211 files changed, 410 insertions, 374 deletions

diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
index f92103ca73..f4532c54bc 100644
--- a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
@@ -14,10 +14,11 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog</artifactId>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools ChangeLog Feature</name>
diff --git a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
index 0fa05dddd6..4289aaf7c9 100644
--- a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
@@ -14,10 +14,11 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.c</artifactId>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools ChangeLog Feature for C/C++</name>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/pom.xml b/changelog/org.eclipse.linuxtools.changelog.core/pom.xml
index f7de86c366..7c04e5c4b1 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 ff79b7b89e..2d3acb482f 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 23a6632faa..877b478650 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 620a296455..629d61fccf 100644
--- a/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
@@ -14,10 +14,11 @@
   <parent>
     <artifactId>linuxtools-changelog-parent</artifactId>
     <groupId>org.eclipse.linuxtools.changelog</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.java</artifactId>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools ChangeLog Feature for Java</name>
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml b/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml
index c3b60435d3..f4831d323c 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 30c86db3d6..b5231ce5be 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.changelog.tests</artifactId>
diff --git a/changelog/pom.xml b/changelog/pom.xml
index 2e82aeceed..4f2820ea4d 100644
--- a/changelog/pom.xml
+++ b/changelog/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.changelog</groupId>
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml b/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
index d94ec3c524..0819803b22 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 678b4e4c19..36d949aaa0 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 05be059b22..62546a7038 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 9ca1166695..3a26b76b33 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 6f3b4e3349..15d94cfc56 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gcov.test</artifactId>
diff --git a/gcov/pom.xml b/gcov/pom.xml
index d688eace31..107cf16e20 100644
--- a/gcov/pom.xml
+++ b/gcov/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.gcov</groupId>
diff --git a/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml b/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
index 6bfe0666b0..eb73902284 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 befab1a489..097b867b4a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 01b34744e1..1140f3b036 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 036b72d110..8dd5418047 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 bf5e2a1355..1c540b082b 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gprof</artifactId>
diff --git a/gprof/pom.xml b/gprof/pom.xml
index df8e535aca..9daf9c6dc9 100644
--- a/gprof/pom.xml
+++ b/gprof/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.gprof</groupId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover-feature/pom.xml
index 0565640d40..83e9be93cb 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 7637abfc96..6334968eca 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 35e4baa83a..77753b80e3 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 a84dbc650c..17e1a54ccd 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 0a33eefe1a..070551f2b2 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 b2d6b1688e..0ada9f2437 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 49d48a51bb..302ad99f60 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 5e03f8acaf..c8c461387d 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 8f4c3d2e29..b5cee769bc 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.newlib</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.tests/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.tests/pom.xml
index 9794f34852..d34e9e8b82 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.tests/pom.xml
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-libhover-parent</artifactId>
     <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover.tests</artifactId>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover/pom.xml
index 29dfa8ede9..a58d23bb5c 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.cdt.libhover</artifactId>
diff --git a/libhover/pom.xml b/libhover/pom.xml
index 74a6363498..86b1aee2c7 100644
--- a/libhover/pom.xml
+++ b/libhover/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
diff --git a/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
index aabf9aec40..0a678d3ca8 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.ctf.core.tests/META-INF/MANIFEST.MF
@@ -11,15 +11,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.ctf.core.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests",
- org.eclipse.linuxtools.ctf.core.tests.ctftestsuite;x-internal:=true,
- org.eclipse.linuxtools.ctf.core.tests.event;x-internal:=true,
- org.eclipse.linuxtools.ctf.core.tests.headless;x-internal:=true,
- org.eclipse.linuxtools.ctf.core.tests.io;x-internal:=true,
- org.eclipse.linuxtools.ctf.core.tests.scope,
- org.eclipse.linuxtools.ctf.core.tests.shared,
- org.eclipse.linuxtools.ctf.core.tests.synthetictraces;x-internal:=true,
- org.eclipse.linuxtools.ctf.core.tests.trace;x-internal:=true,
- org.eclipse.linuxtools.ctf.core.tests.types;x-internal:=true
+Export-Package: org.eclipse.linuxtools.ctf.core.tests;x-friends:="org.
+ eclipse.linuxtools.lttng.alltests",org.eclipse.linuxtools.ctf.core.te
+ sts.ctftestsuite;x-internal:=true,org.eclipse.linuxtools.ctf.core.tes
+ ts.event;x-internal:=true,org.eclipse.linuxtools.ctf.core.tests.headl
+ ess;x-internal:=true,org.eclipse.linuxtools.ctf.core.tests.io;x-inter
+ nal:=true,org.eclipse.linuxtools.ctf.core.tests.scope,org.eclipse.lin
+ uxtools.ctf.core.tests.shared,org.eclipse.linuxtools.ctf.core.tests.s
+ ynthetictraces;x-internal:=true,org.eclipse.linuxtools.ctf.core.tests
+ .trace;x-internal:=true,org.eclipse.linuxtools.ctf.core.tests.types;x
+ -internal:=true
 Import-Package: com.google.common.collect,
  org.antlr.runtime;version="3.2.0"
diff --git a/lttng/org.eclipse.linuxtools.ctf.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.ctf.core.tests/pom.xml
index 528db5d074..4b48e72025 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.ctf.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <name>Linux Tools CTF Core Tests Plug-in</name>
diff --git a/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
index 1bbbc192f5..1385dc5c97 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
@@ -10,17 +10,18 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.linuxtools.ctf.parser;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.ctf.core,
- org.eclipse.linuxtools.ctf.core.event,
- org.eclipse.linuxtools.ctf.core.event.io,
- org.eclipse.linuxtools.ctf.core.event.scope,
- org.eclipse.linuxtools.ctf.core.event.types,
- org.eclipse.linuxtools.ctf.core.trace,
- org.eclipse.linuxtools.internal.ctf.core;x-friends:="org.eclipse.linuxtools.ctf.core.tests",
- org.eclipse.linuxtools.internal.ctf.core.event;x-friends:="org.eclipse.linuxtools.ctf.core.tests",
- org.eclipse.linuxtools.internal.ctf.core.event.metadata;x-friends:="org.eclipse.linuxtools.ctf.core.tests",
- org.eclipse.linuxtools.internal.ctf.core.event.metadata.exceptions;x-friends:="org.eclipse.linuxtools.ctf.core.tests",
- org.eclipse.linuxtools.internal.ctf.core.trace;x-friends:="org.eclipse.linuxtools.ctf.core.tests"
+Export-Package: org.eclipse.linuxtools.ctf.core,org.eclipse.linuxtools
+ .ctf.core.event,org.eclipse.linuxtools.ctf.core.event.io,org.eclipse.
+ linuxtools.ctf.core.event.scope,org.eclipse.linuxtools.ctf.core.event
+ .types,org.eclipse.linuxtools.ctf.core.trace,org.eclipse.linuxtools.i
+ nternal.ctf.core;x-friends:="org.eclipse.linuxtools.ctf.core.tests",o
+ rg.eclipse.linuxtools.internal.ctf.core.event;x-friends:="org.eclipse
+ .linuxtools.ctf.core.tests",org.eclipse.linuxtools.internal.ctf.core.
+ event.metadata;x-friends:="org.eclipse.linuxtools.ctf.core.tests",org
+ .eclipse.linuxtools.internal.ctf.core.event.metadata.exceptions;x-fri
+ ends:="org.eclipse.linuxtools.ctf.core.tests",org.eclipse.linuxtools.
+ internal.ctf.core.trace;x-friends:="org.eclipse.linuxtools.ctf.core.t
+ ests"
 Import-Package: com.google.common.base,
  com.google.common.collect,
  org.antlr.runtime;version="3.2.0",
diff --git a/lttng/org.eclipse.linuxtools.ctf.core/pom.xml b/lttng/org.eclipse.linuxtools.ctf.core/pom.xml
index f7211f8db8..9b55e9b85b 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.ctf.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <name>Linux Tools CTF Core Plug-in</name>
diff --git a/lttng/org.eclipse.linuxtools.ctf.parser.tests/pom.xml b/lttng/org.eclipse.linuxtools.ctf.parser.tests/pom.xml
index d407d281a3..f6405b6fe3 100644
--- a/lttng/org.eclipse.linuxtools.ctf.parser.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.ctf.parser.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.ctf.parser.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
index a37a60b314..63301b621c 100644
--- a/lttng/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.ctf.parser
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.linuxtools.ctf.parser;x-friends:="org.eclipse.linuxtools.ctf.core,org.eclipse.linuxtools.ctf.parser.tests"
+Export-Package: org.eclipse.linuxtools.ctf.parser;x-friends:="org.ecli
+ pse.linuxtools.ctf.core,org.eclipse.linuxtools.ctf.parser.tests"
 Import-Package: org.antlr.runtime;version="3.2.0",
  org.antlr.runtime.tree;version="3.2.0"
diff --git a/lttng/org.eclipse.linuxtools.ctf.parser/pom.xml b/lttng/org.eclipse.linuxtools.ctf.parser/pom.xml
index 8c8efd6416..604d9bea8a 100644
--- a/lttng/org.eclipse.linuxtools.ctf.parser/pom.xml
+++ b/lttng/org.eclipse.linuxtools.ctf.parser/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <name>Linux Tools CTF Parser Plug-in</name>
diff --git a/lttng/org.eclipse.linuxtools.ctf/pom.xml b/lttng/org.eclipse.linuxtools.ctf/pom.xml
index be0086185b..d80f300b5f 100644
--- a/lttng/org.eclipse.linuxtools.ctf/pom.xml
+++ b/lttng/org.eclipse.linuxtools.ctf/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <name>Linux Tools CTF (Common Trace Format) Feature</name>
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
index 6962305ec3..b36e52b936 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
index 3ccb286e13..58b75c4897 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
@@ -17,6 +17,8 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.linuxtools.internal.gdbtrace.core;x-friends:="org.eclipse.linuxtools.gdbtrace.core.tests",
- org.eclipse.linuxtools.internal.gdbtrace.core.event;x-friends:="org.eclipse.linuxtools.gdbtrace.ui",
- org.eclipse.linuxtools.internal.gdbtrace.core.trace;x-friends:="org.eclipse.linuxtools.gdbtrace.ui"
+Export-Package: org.eclipse.linuxtools.internal.gdbtrace.core;x-friend
+ s:="org.eclipse.linuxtools.gdbtrace.core.tests",org.eclipse.linuxtool
+ s.internal.gdbtrace.core.event;x-friends:="org.eclipse.linuxtools.gdb
+ trace.ui",org.eclipse.linuxtools.internal.gdbtrace.core.trace;x-frien
+ ds:="org.eclipse.linuxtools.gdbtrace.ui"
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/pom.xml b/lttng/org.eclipse.linuxtools.gdbtrace.core/pom.xml
index 175b3a5973..9255e20eef 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.help/pom.xml b/lttng/org.eclipse.linuxtools.gdbtrace.help/pom.xml
index 33c2c691a7..9eb883b70a 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.help/pom.xml
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.help/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.help</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml b/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
index 18e399e3d5..8396fe68ca 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.ui.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
index 82fe412b9e..1bb671850a 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
@@ -17,9 +17,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.linuxtools.gdbtrace.core;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.linuxtools.internal.gdbtrace.ui;x-friends:="org.eclipse.linuxtools.gdbtrace.ui.tests",
- org.eclipse.linuxtools.internal.gdbtrace.ui.views;x-internal:=true,
- org.eclipse.linuxtools.internal.gdbtrace.ui.views.events;x-internal:=true,
- org.eclipse.linuxtools.internal.gdbtrace.ui.views.project.dialogs;x-internal:=true,
- org.eclipse.linuxtools.internal.gdbtrace.ui.views.project.handlers;x-internal:=true
+Export-Package: org.eclipse.linuxtools.internal.gdbtrace.ui;x-friends:
+ ="org.eclipse.linuxtools.gdbtrace.ui.tests",org.eclipse.linuxtools.in
+ ternal.gdbtrace.ui.views;x-internal:=true,org.eclipse.linuxtools.inte
+ rnal.gdbtrace.ui.views.events;x-internal:=true,org.eclipse.linuxtools
+ .internal.gdbtrace.ui.views.project.dialogs;x-internal:=true,org.ecli
+ pse.linuxtools.internal.gdbtrace.ui.views.project.handlers;x-internal
+ :=true
 Import-Package: org.eclipse.cdt.core
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/pom.xml b/lttng/org.eclipse.linuxtools.gdbtrace.ui/pom.xml
index 042281dea3..b7572d91a7 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.ui</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace/pom.xml b/lttng/org.eclipse.linuxtools.gdbtrace/pom.xml
index 245f7f9b37..7e4b6c9f5f 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace/pom.xml
+++ b/lttng/org.eclipse.linuxtools.gdbtrace/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/pom.xml b/lttng/org.eclipse.linuxtools.lttng.help/pom.xml
index 69e58ce55a..0cdcd507f0 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.help/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.help</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng.releng-site/pom.xml b/lttng/org.eclipse.linuxtools.lttng.releng-site/pom.xml
index 395da01b6e..5e96fdb2c3 100644
--- a/lttng/org.eclipse.linuxtools.lttng.releng-site/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.releng-site/pom.xml
@@ -19,11 +19,11 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng.releng-site</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <name>Linux Tools LTTng Repository</name>
   <packaging>eclipse-repository</packaging>
 
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF
index 3400863498..7cbe5bd96d 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
  org.eclipse.linuxtools.lttng2.control.core;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.lttng2.control.core.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests",
- org.eclipse.linuxtools.lttng2.control.core.tests.model.impl;x-internal:=true,
- org.eclipse.linuxtools.lttng2.control.core.tests.relayd,
- org.eclipse.linuxtools.lttng2.control.core.tests.session
+Export-Package: org.eclipse.linuxtools.lttng2.control.core.tests;x-fri
+ ends:="org.eclipse.linuxtools.lttng.alltests",org.eclipse.linuxtools.
+ lttng2.control.core.tests.model.impl;x-internal:=true,org.eclipse.lin
+ uxtools.lttng2.control.core.tests.relayd,org.eclipse.linuxtools.lttng
+ 2.control.core.tests.session
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/pom.xml
index a77c2a4cfc..95e3b911a9 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.control.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF
index 8f45a6c349..ca1cc9effc 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF
@@ -12,11 +12,23 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.ctf.core;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.control.core;x-friends:="org.eclipse.linuxtools.lttng2.control.core.tests",
- org.eclipse.linuxtools.internal.lttng2.control.core.model;x-friends:="org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests,org.eclipse.linuxtools.lttng2.control.core.tests",
- org.eclipse.linuxtools.internal.lttng2.control.core.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests,org.eclipse.linuxtools.lttng2.control.core.tests",
- org.eclipse.linuxtools.internal.lttng2.control.core.relayd;x-friends:="org.eclipse.linuxtools.lttng2.control.core.tests,org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.core.relayd.impl;x-friends:="org.eclipse.linuxtools.lttng2.control.core.tests,org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.core.relayd.lttngviewerCommands;x-friends:="org.eclipse.linuxtools.lttng2.control.core.tests,org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.lttng2.control.core.session
+Export-Package: org.eclipse.linuxtools.internal.lttng2.control.core;x-
+ friends:="org.eclipse.linuxtools.lttng2.control.core.tests",org.eclip
+ se.linuxtools.internal.lttng2.control.core.model;x-friends:="org.ecli
+ pse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.contro
+ l.ui.tests,org.eclipse.linuxtools.lttng2.control.core.tests",org.ecli
+ pse.linuxtools.internal.lttng2.control.core.model.impl;x-friends:="or
+ g.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.
+ control.ui.tests,org.eclipse.linuxtools.lttng2.control.core.tests",or
+ g.eclipse.linuxtools.internal.lttng2.control.core.relayd;x-friends:="
+ org.eclipse.linuxtools.lttng2.control.core.tests,org.eclipse.linuxtoo
+ ls.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests",
+ org.eclipse.linuxtools.internal.lttng2.control.core.relayd.impl;x-fri
+ ends:="org.eclipse.linuxtools.lttng2.control.core.tests,org.eclipse.l
+ inuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.
+ tests",org.eclipse.linuxtools.internal.lttng2.control.core.relayd.ltt
+ ngviewerCommands;x-friends:="org.eclipse.linuxtools.lttng2.control.co
+ re.tests,org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxto
+ ols.lttng2.control.ui.tests",org.eclipse.linuxtools.lttng2.control.co
+ re.session
 Import-Package: com.google.common.collect
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.core/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.control.core/pom.xml
index e16e123944..0212e4536e 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.control.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF
index b0b8146c46..92f7027b35 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF
@@ -21,9 +21,11 @@ Import-Package: org.eclipse.rse.core,
  org.eclipse.rse.services.terminals,
  org.eclipse.rse.subsystems.files.core,
  org.eclipse.rse.subsystems.files.core.servicesubsystem
-Export-Package: org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs;x-internal:=true,
- org.eclipse.linuxtools.internal.lttng2.control.stubs.service;x-internal:=true,
- org.eclipse.linuxtools.internal.lttng2.control.stubs.shells;x-internal:=true,
- org.eclipse.linuxtools.lttng2.control.ui.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests",
- org.eclipse.linuxtools.lttng2.control.ui.tests.model.component;x-internal:=true,
- org.eclipse.linuxtools.lttng2.control.ui.tests.service;x-internal:=true
+Export-Package: org.eclipse.linuxtools.internal.lttng2.control.stubs.d
+ ialogs;x-internal:=true,org.eclipse.linuxtools.internal.lttng2.contro
+ l.stubs.service;x-internal:=true,org.eclipse.linuxtools.internal.lttn
+ g2.control.stubs.shells;x-internal:=true,org.eclipse.linuxtools.lttng
+ 2.control.ui.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests"
+ ,org.eclipse.linuxtools.lttng2.control.ui.tests.model.component;x-int
+ ernal:=true,org.eclipse.linuxtools.lttng2.control.ui.tests.service;x-
+ internal:=true
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/pom.xml
index 8f03187db7..7ee103d73a 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.control.ui.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF
index e6b6fd5b8f..e65c47f8a0 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF
@@ -16,18 +16,28 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.linuxtools.lttng2.control.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.control.ui;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.control.ui.tests,org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers;x-internal:=true,
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages;x-internal:=true,
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.model;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.property;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.control.ui.views.service;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests"
+Export-Package: org.eclipse.linuxtools.internal.lttng2.control.ui;x-fr
+ iends:="org.eclipse.linuxtools.lttng2.control.ui.tests",org.eclipse.l
+ inuxtools.internal.lttng2.control.ui.views;x-friends:="org.eclipse.li
+ nuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.control.ui.te
+ sts,org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests",org.eclipse
+ .linuxtools.internal.lttng2.control.ui.views.dialogs;x-friends:="org.
+ eclipse.linuxtools.lttng2.control.ui.tests",org.eclipse.linuxtools.in
+ ternal.lttng2.control.ui.views.handlers;x-internal:=true,org.eclipse.
+ linuxtools.internal.lttng2.control.ui.views.logging;x-friends:="org.e
+ clipse.linuxtools.lttng2.control.ui.tests",org.eclipse.linuxtools.int
+ ernal.lttng2.control.ui.views.messages;x-internal:=true,org.eclipse.l
+ inuxtools.internal.lttng2.control.ui.views.model;x-friends:="org.ecli
+ pse.linuxtools.lttng2.control.ui.tests",org.eclipse.linuxtools.intern
+ al.lttng2.control.ui.views.model.impl;x-friends:="org.eclipse.linuxto
+ ols.lttng2.control.ui.tests",org.eclipse.linuxtools.internal.lttng2.c
+ ontrol.ui.views.preferences;x-friends:="org.eclipse.linuxtools.lttng2
+ .control.ui.tests",org.eclipse.linuxtools.internal.lttng2.control.ui.
+ views.property;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.t
+ ests",org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote;
+ x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests",org.eclip
+ se.linuxtools.internal.lttng2.control.ui.views.service;x-friends:="or
+ g.eclipse.linuxtools.lttng2.control.ui.tests"
 Import-Package: org.eclipse.rse.core,
  org.eclipse.rse.core.model,
  org.eclipse.rse.core.subsystems,
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.ui/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.control.ui/pom.xml
index 7432d6c2a2..b000486461 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.control.ui</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.control/pom.xml
index 163176ab8f..4a1467a216 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.control/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.control</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
index 55ef24d7fe..bbec4e46f9 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.resources,
  org.eclipse.linuxtools.statesystem.core,
  org.eclipse.linuxtools.lttng2.control.core
-Export-Package: org.eclipse.linuxtools.lttng2.kernel.core.tests,
- org.eclipse.linuxtools.lttng2.kernel.core.tests.event.matchandsync,
- org.eclipse.linuxtools.lttng2.kernel.core.tests.stateprovider
+Export-Package: org.eclipse.linuxtools.lttng2.kernel.core.tests,org.ec
+ lipse.linuxtools.lttng2.kernel.core.tests.event.matchandsync,org.ecli
+ pse.linuxtools.lttng2.kernel.core.tests.stateprovider
 Import-Package: com.google.common.collect
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
index 47d1c1f5c0..7ee2b429dc 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
index b510893e0d..6694150cf9 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF
@@ -14,10 +14,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.ctf.core,
  org.eclipse.linuxtools.lttng2.control.core
-Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.kernel.core.tests",
- org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.kernel.core.tests",
- org.eclipse.linuxtools.lttng2.kernel.core.analysis,
- org.eclipse.linuxtools.lttng2.kernel.core.cpuusage,
- org.eclipse.linuxtools.lttng2.kernel.core.event.matching,
- org.eclipse.linuxtools.lttng2.kernel.core.trace
+Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-f
+ riends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtoo
+ ls.lttng2.kernel.core.tests",org.eclipse.linuxtools.internal.lttng2.k
+ ernel.core.stateprovider;x-friends:="org.eclipse.linuxtools.lttng2.ke
+ rnel.ui,org.eclipse.linuxtools.lttng2.kernel.core.tests",org.eclipse.
+ linuxtools.lttng2.kernel.core.analysis,org.eclipse.linuxtools.lttng2.
+ kernel.core.cpuusage,org.eclipse.linuxtools.lttng2.kernel.core.event.
+ matching,org.eclipse.linuxtools.lttng2.kernel.core.trace
 Import-Package: com.google.common.collect
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
index b6476317ae..73b3090fc7 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml
index f77e2ab073..6bf0d5acdb 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
index 8d847dcf57..fd11f58701 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.ui.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
index e74f843b1d..beddb61e38 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF
@@ -17,9 +17,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.linuxtools.lttng2.control.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.lttng2.control.ui;bundle-version="3.0.0",
  org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.ui;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.kernel.ui.viewers.events;x-internal:=true,
- org.eclipse.linuxtools.internal.lttng2.kernel.ui.views;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests",
- org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.controlflow;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests",
- org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.cpuusage;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests",
- org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests"
+Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.ui;x-fri
+ ends:="org.eclipse.linuxtools.lttng2.kernel.ui.tests",org.eclipse.lin
+ uxtools.internal.lttng2.kernel.ui.viewers.events;x-internal:=true,org
+ .eclipse.linuxtools.internal.lttng2.kernel.ui.views;x-friends:="org.e
+ clipse.linuxtools.lttng2.kernel.ui.swtbot.tests",org.eclipse.linuxtoo
+ ls.internal.lttng2.kernel.ui.views.controlflow;x-friends:="org.eclips
+ e.linuxtools.lttng2.kernel.ui.swtbot.tests",org.eclipse.linuxtools.in
+ ternal.lttng2.kernel.ui.views.cpuusage;x-friends:="org.eclipse.linuxt
+ ools.lttng2.kernel.ui.swtbot.tests",org.eclipse.linuxtools.internal.l
+ ttng2.kernel.ui.views.resources;x-friends:="org.eclipse.linuxtools.lt
+ tng2.kernel.ui.swtbot.tests"
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
index 5ac6b5bb8c..a7a3e6c4d9 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel.ui</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.kernel/pom.xml
index a30fae70e5..4af4650b6d 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.kernel/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.kernel/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.kernel</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF
index c848fed088..fdd61839de 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/META-INF/MANIFEST.MF
@@ -16,6 +16,6 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.linuxtools.tmf.ctf.core.tests,
  org.eclipse.linuxtools.lttng2.ust.core,
  org.eclipse.linuxtools.lttng2.control.core
-Export-Package: org.eclipse.linuxtools.lttng2.ust.core.tests,
- org.eclipse.linuxtools.lttng2.ust.core.tests.trace.callstack
+Export-Package: org.eclipse.linuxtools.lttng2.ust.core.tests,org.eclip
+ se.linuxtools.lttng2.ust.core.tests.trace.callstack
 Import-Package: com.google.common.collect
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml
index 86dfa768fd..8f0f03c977 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.ust.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF
index 1d29d34308..9e432ac003 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust.core/META-INF/MANIFEST.MF
@@ -8,11 +8,14 @@ Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ust.core;singleton:=true
 Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ust.core.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.linuxtools.internal.lttng2.ust.core;x-internal:=true,
- org.eclipse.linuxtools.internal.lttng2.ust.core.memoryusage;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui,org.eclipse.linuxtools.lttng2.ust.core.tests",
- org.eclipse.linuxtools.internal.lttng2.ust.core.trace.callstack;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui,org.eclipse.linuxtools.lttng2.ust.core.tests",
- org.eclipse.linuxtools.lttng2.ust.core.analysis.memory,
- org.eclipse.linuxtools.lttng2.ust.core.trace
+Export-Package: org.eclipse.linuxtools.internal.lttng2.ust.core;x-inte
+ rnal:=true,org.eclipse.linuxtools.internal.lttng2.ust.core.memoryusag
+ e;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui,org.eclipse.linuxt
+ ools.lttng2.ust.core.tests",org.eclipse.linuxtools.internal.lttng2.us
+ t.core.trace.callstack;x-friends:="org.eclipse.linuxtools.lttng2.ust.
+ ui,org.eclipse.linuxtools.lttng2.ust.core.tests",org.eclipse.linuxtoo
+ ls.lttng2.ust.core.analysis.memory,org.eclipse.linuxtools.lttng2.ust.
+ core.trace
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0",
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust.core/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.ust.core/pom.xml
index 80a9f9f3c9..98d5d651dd 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.ust.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml
index 046bb8be9d..61122975f5 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.ust.ui.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF
index 44cecfc812..088381d520 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust.ui/META-INF/MANIFEST.MF
@@ -15,6 +15,8 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.ctf.core
-Export-Package: org.eclipse.linuxtools.internal.lttng2.ust.ui;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui.tests",
- org.eclipse.linuxtools.internal.lttng2.ust.ui.views.memusage;x-friends:="org.eclipse.linuxtools.lttng2.ust.ui.tests",
- org.eclipse.linuxtools.lttng2.ust.ui.analysis.callstack
+Export-Package: org.eclipse.linuxtools.internal.lttng2.ust.ui;x-friend
+ s:="org.eclipse.linuxtools.lttng2.ust.ui.tests",org.eclipse.linuxtool
+ s.internal.lttng2.ust.ui.views.memusage;x-friends:="org.eclipse.linux
+ tools.lttng2.ust.ui.tests",org.eclipse.linuxtools.lttng2.ust.ui.analy
+ sis.callstack
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust.ui/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.ust.ui/pom.xml
index 47c2a54caa..202b7dd219 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.ust.ui</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust/pom.xml b/lttng/org.eclipse.linuxtools.lttng2.ust/pom.xml
index 167412a842..0404186791 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ust/pom.xml
+++ b/lttng/org.eclipse.linuxtools.lttng2.ust/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.lttng2.ust</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.statesystem.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.statesystem.core.tests/pom.xml
index e00ce493e9..17b7693983 100644
--- a/lttng/org.eclipse.linuxtools.statesystem.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.statesystem.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.statesystem.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.statesystem.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.statesystem.core/META-INF/MANIFEST.MF
index b2b95a6037..62d75c2d24 100644
--- a/lttng/org.eclipse.linuxtools.statesystem.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.statesystem.core/META-INF/MANIFEST.MF
@@ -10,12 +10,12 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources
-Export-Package: org.eclipse.linuxtools.internal.statesystem.core;x-friends:="org.eclipse.linuxtools.statesystem.core.tests",
- org.eclipse.linuxtools.internal.statesystem.core.backend.historytree;x-friends:="org.eclipse.linuxtools.statesystem.core.tests",
- org.eclipse.linuxtools.statesystem.core,
- org.eclipse.linuxtools.statesystem.core.backend,
- org.eclipse.linuxtools.statesystem.core.backend.historytree,
- org.eclipse.linuxtools.statesystem.core.exceptions,
- org.eclipse.linuxtools.statesystem.core.interval,
- org.eclipse.linuxtools.statesystem.core.statevalue
+Export-Package: org.eclipse.linuxtools.internal.statesystem.core;x-fri
+ ends:="org.eclipse.linuxtools.statesystem.core.tests",org.eclipse.lin
+ uxtools.internal.statesystem.core.backend.historytree;x-friends:="org
+ .eclipse.linuxtools.statesystem.core.tests",org.eclipse.linuxtools.st
+ atesystem.core,org.eclipse.linuxtools.statesystem.core.backend,org.ec
+ lipse.linuxtools.statesystem.core.backend.historytree,org.eclipse.lin
+ uxtools.statesystem.core.exceptions,org.eclipse.linuxtools.statesyste
+ m.core.interval,org.eclipse.linuxtools.statesystem.core.statevalue
 Import-Package: com.google.common.collect;version="12.0.0"
diff --git a/lttng/org.eclipse.linuxtools.statesystem.core/pom.xml b/lttng/org.eclipse.linuxtools.statesystem.core/pom.xml
index 7023fe5d22..1f80bfaae0 100644
--- a/lttng/org.eclipse.linuxtools.statesystem.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.statesystem.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.statesystem.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/pom.xml
index 9b9674c6b6..37dd6e9c06 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.analysis.xml.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml
index ae57bb32f6..953515737b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.analysis.xml.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml
index ce397b3e09..3f42010ad2 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.analysis.xml.ui.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui/pom.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui/pom.xml
index 326d18f7ac..3108d8dd84 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.analysis.xml.ui</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
index 39850b9a5b..b6cbea72fc 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.tmf.core.tests,
- org.eclipse.linuxtools.tmf.core.tests.shared,
- org.eclipse.linuxtools.tmf.tests.stubs.trace
+Export-Package: org.eclipse.linuxtools.tmf.core.tests,org.eclipse.linu
+ xtools.tmf.core.tests.shared,org.eclipse.linuxtools.tmf.tests.stubs.t
+ race
 Import-Package: com.google.common.collect
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.core.tests/pom.xml
index c35cd054ac..f86202b3b7 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
index 21f1670900..d63918c3bf 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
@@ -11,40 +11,34 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.linuxtools.statesystem.core;visibility:=reexport
-Export-Package: org.eclipse.linuxtools.internal.tmf.core;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
- org.eclipse.linuxtools.internal.tmf.core.analysis;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
- org.eclipse.linuxtools.internal.tmf.core.component;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
- org.eclipse.linuxtools.internal.tmf.core.request;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
- org.eclipse.linuxtools.internal.tmf.core.statesystem.backends.partial;x-friends:="org.eclipse.linuxtools.statesystem.core.tests",
- org.eclipse.linuxtools.internal.tmf.core.statesystem.mipmap;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
- org.eclipse.linuxtools.internal.tmf.core.trace;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
- org.eclipse.linuxtools.internal.tmf.core.trace.indexer;x-friends:="org.eclipse.linuxtools.tmf.core.tests",
- org.eclipse.linuxtools.tmf.core,
- org.eclipse.linuxtools.tmf.core.analysis,
- org.eclipse.linuxtools.tmf.core.callstack,
- org.eclipse.linuxtools.tmf.core.component,
- org.eclipse.linuxtools.tmf.core.event,
- org.eclipse.linuxtools.tmf.core.event.lookup,
- org.eclipse.linuxtools.tmf.core.event.matching,
- org.eclipse.linuxtools.tmf.core.exceptions,
- org.eclipse.linuxtools.tmf.core.filter,
- org.eclipse.linuxtools.tmf.core.filter.model,
- org.eclipse.linuxtools.tmf.core.filter.xml,
- org.eclipse.linuxtools.tmf.core.io,
- org.eclipse.linuxtools.tmf.core.parsers.custom,
- org.eclipse.linuxtools.tmf.core.project.model,
- org.eclipse.linuxtools.tmf.core.request,
- org.eclipse.linuxtools.tmf.core.signal,
- org.eclipse.linuxtools.tmf.core.statesystem,
- org.eclipse.linuxtools.tmf.core.statistics,
- org.eclipse.linuxtools.tmf.core.synchronization,
- org.eclipse.linuxtools.tmf.core.timestamp,
- org.eclipse.linuxtools.tmf.core.trace,
- org.eclipse.linuxtools.tmf.core.trace.indexer,
- org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint,
- org.eclipse.linuxtools.tmf.core.trace.location,
- org.eclipse.linuxtools.tmf.core.trace.text,
- org.eclipse.linuxtools.tmf.core.uml2sd,
- org.eclipse.linuxtools.tmf.core.util
+Export-Package: org.eclipse.linuxtools.internal.tmf.core;x-friends:="o
+ rg.eclipse.linuxtools.tmf.core.tests",org.eclipse.linuxtools.internal
+ .tmf.core.analysis;x-friends:="org.eclipse.linuxtools.tmf.core.tests"
+ ,org.eclipse.linuxtools.internal.tmf.core.component;x-friends:="org.e
+ clipse.linuxtools.tmf.core.tests",org.eclipse.linuxtools.internal.tmf
+ .core.request;x-friends:="org.eclipse.linuxtools.tmf.core.tests",org.
+ eclipse.linuxtools.internal.tmf.core.statesystem.backends.partial;x-f
+ riends:="org.eclipse.linuxtools.statesystem.core.tests",org.eclipse.l
+ inuxtools.internal.tmf.core.statesystem.mipmap;x-friends:="org.eclips
+ e.linuxtools.tmf.core.tests",org.eclipse.linuxtools.internal.tmf.core
+ .trace;x-friends:="org.eclipse.linuxtools.tmf.core.tests",org.eclipse
+ .linuxtools.internal.tmf.core.trace.indexer;x-friends:="org.eclipse.l
+ inuxtools.tmf.core.tests",org.eclipse.linuxtools.tmf.core,org.eclipse
+ .linuxtools.tmf.core.analysis,org.eclipse.linuxtools.tmf.core.callsta
+ ck,org.eclipse.linuxtools.tmf.core.component,org.eclipse.linuxtools.t
+ mf.core.event,org.eclipse.linuxtools.tmf.core.event.lookup,org.eclips
+ e.linuxtools.tmf.core.event.matching,org.eclipse.linuxtools.tmf.core.
+ exceptions,org.eclipse.linuxtools.tmf.core.filter,org.eclipse.linuxto
+ ols.tmf.core.filter.model,org.eclipse.linuxtools.tmf.core.filter.xml,
+ org.eclipse.linuxtools.tmf.core.io,org.eclipse.linuxtools.tmf.core.pa
+ rsers.custom,org.eclipse.linuxtools.tmf.core.project.model,org.eclips
+ e.linuxtools.tmf.core.request,org.eclipse.linuxtools.tmf.core.signal,
+ org.eclipse.linuxtools.tmf.core.statesystem,org.eclipse.linuxtools.tm
+ f.core.statistics,org.eclipse.linuxtools.tmf.core.synchronization,org
+ .eclipse.linuxtools.tmf.core.timestamp,org.eclipse.linuxtools.tmf.cor
+ e.trace,org.eclipse.linuxtools.tmf.core.trace.indexer,org.eclipse.lin
+ uxtools.tmf.core.trace.indexer.checkpoint,org.eclipse.linuxtools.tmf.
+ core.trace.location,org.eclipse.linuxtools.tmf.core.trace.text,org.ec
+ lipse.linuxtools.tmf.core.uml2sd,org.eclipse.linuxtools.tmf.core.util
 Import-Package: com.google.common.base,
  com.google.common.collect
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/pom.xml b/lttng/org.eclipse.linuxtools.tmf.core/pom.xml
index d6065d9590..595239641a 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/META-INF/MANIFEST.MF
index 6f9c9e50c1..79376143d3 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/META-INF/MANIFEST.MF
@@ -15,10 +15,10 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.linuxtools.tmf.ctf.core,
  org.eclipse.linuxtools.ctf.core,
  org.eclipse.linuxtools.ctf.core.tests
-Export-Package: org.eclipse.linuxtools.tmf.ctf.core.tests,
- org.eclipse.linuxtools.tmf.ctf.core.tests.headless;x-internal:=true,
- org.eclipse.linuxtools.tmf.ctf.core.tests.request;x-internal:=true,
- org.eclipse.linuxtools.tmf.ctf.core.tests.shared,
- org.eclipse.linuxtools.tmf.ctf.core.tests.statistics;x-internal:=true,
- org.eclipse.linuxtools.tmf.ctf.core.tests.stubs,
- org.eclipse.linuxtools.tmf.ctf.core.tests.tracemanager;x-internal:=true
+Export-Package: org.eclipse.linuxtools.tmf.ctf.core.tests,org.eclipse.
+ linuxtools.tmf.ctf.core.tests.headless;x-internal:=true,org.eclipse.l
+ inuxtools.tmf.ctf.core.tests.request;x-internal:=true,org.eclipse.lin
+ uxtools.tmf.ctf.core.tests.shared,org.eclipse.linuxtools.tmf.ctf.core
+ .tests.statistics;x-internal:=true,org.eclipse.linuxtools.tmf.ctf.cor
+ e.tests.stubs,org.eclipse.linuxtools.tmf.ctf.core.tests.tracemanager;
+ x-internal:=true
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/pom.xml
index 1afb24c185..91be5730bc 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ctf.core.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.ctf.core/META-INF/MANIFEST.MF
index 459474b70f..5b9b07b1f3 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.linuxtools.ctf.core;bundle-version="3.0.0",
  org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0"
-Export-Package: org.eclipse.linuxtools.internal.tmf.ctf.core;x-internal:=true,
- org.eclipse.linuxtools.tmf.ctf.core
+Export-Package: org.eclipse.linuxtools.internal.tmf.ctf.core;x-interna
+ l:=true,org.eclipse.linuxtools.tmf.ctf.core
 Import-Package: com.google.common.collect,
  org.eclipse.emf.common.util
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core/pom.xml b/lttng/org.eclipse.linuxtools.tmf.ctf.core/pom.xml
index cfb78c9fde..18b8c5eb8f 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ctf.core</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml
index a4451d11d9..d0be9b5462 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf/pom.xml b/lttng/org.eclipse.linuxtools.tmf.ctf/pom.xml
index c8ba755ab8..ca7094d1a5 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ctf</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.help/pom.xml b/lttng/org.eclipse.linuxtools.tmf.help/pom.xml
index 7813c7c55a..a09c65a1ac 100644
--- a/lttng/org.eclipse.linuxtools.tmf.help/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.help/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.help</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF
index b21dbb7fd1..ee735fe2b5 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.swtbot.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.linuxtools.tmf.ui.swtbot.tests,
- org.eclipse.linuxtools.tmf.ui.swtbot.tests.conditions
+Export-Package: org.eclipse.linuxtools.tmf.ui.swtbot.tests,org.eclipse
+ .linuxtools.tmf.ui.swtbot.tests.conditions
 Require-Bundle: org.apache.log4j,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml
index 9ad819eed6..ac1f1fb60b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ui.swtbot.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/pom.xml b/lttng/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
index 050ca7c62d..093ae38b7e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ui.tests</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/pom.xml b/lttng/org.eclipse.linuxtools.tmf.ui/pom.xml
index f281f6a106..866b0d728f 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf.ui</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tmf/pom.xml b/lttng/org.eclipse.linuxtools.tmf/pom.xml
index e6737f5e66..8f7f65a013 100644
--- a/lttng/org.eclipse.linuxtools.tmf/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tmf/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tmf</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tracing.examples/pom.xml b/lttng/org.eclipse.linuxtools.tracing.examples/pom.xml
index a6bcd48ebd..8765c0eb53 100644
--- a/lttng/org.eclipse.linuxtools.tracing.examples/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tracing.examples/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tracing.examples</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml b/lttng/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
index 81d671bdb6..2f5cfda472 100644
--- a/lttng/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tracing.rcp.branding.feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tracing.rcp.branding.feature</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml b/lttng/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
index bec271947f..180385bd45 100644
--- a/lttng/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tracing.rcp.branding/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.eclipse.linuxtools.tracing.rcp.branding</groupId>
 
   <parent>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
     <artifactId>linuxtools-lttng-parent</artifactId>
   </parent>
diff --git a/lttng/org.eclipse.linuxtools.tracing.rcp.help/pom.xml b/lttng/org.eclipse.linuxtools.tracing.rcp.help/pom.xml
index 0ad5cecc4e..578ed9c687 100644
--- a/lttng/org.eclipse.linuxtools.tracing.rcp.help/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tracing.rcp.help/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tracing.rcp.help</artifactId>
diff --git a/lttng/org.eclipse.linuxtools.tracing.rcp.product/pom.xml b/lttng/org.eclipse.linuxtools.tracing.rcp.product/pom.xml
index e088d33a91..ef81927c0a 100644
--- a/lttng/org.eclipse.linuxtools.tracing.rcp.product/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tracing.rcp.product/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <artifactId>linuxtools-lttng-parent</artifactId>
       <groupId>org.eclipse.linuxtools.lttng</groupId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/lttng/org.eclipse.linuxtools.tracing.rcp.ui/pom.xml b/lttng/org.eclipse.linuxtools.tracing.rcp.ui/pom.xml
index 2d03ff4c2f..8eb6d07c92 100644
--- a/lttng/org.eclipse.linuxtools.tracing.rcp.ui/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tracing.rcp.ui/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <artifactId>linuxtools-lttng-parent</artifactId>
       <groupId>org.eclipse.linuxtools.lttng</groupId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/lttng/org.eclipse.linuxtools.tracing.rcp/pom.xml b/lttng/org.eclipse.linuxtools.tracing.rcp/pom.xml
index 6fe561403a..3dffb41033 100644
--- a/lttng/org.eclipse.linuxtools.tracing.rcp/pom.xml
+++ b/lttng/org.eclipse.linuxtools.tracing.rcp/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-lttng-parent</artifactId>
     <groupId>org.eclipse.linuxtools.lttng</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tracing.rcp</artifactId>
diff --git a/lttng/pom.xml b/lttng/pom.xml
index d5e53661e2..e6ba4ddfc8 100644
--- a/lttng/pom.xml
+++ b/lttng/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.lttng</groupId>
   <artifactId>linuxtools-lttng-parent</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Linux Tools LTTng Parent</name>
diff --git a/man/org.eclipse.linuxtools.man-feature/pom.xml b/man/org.eclipse.linuxtools.man-feature/pom.xml
index f7be8500bf..3659fa3541 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 e16b90b869..afa1ef880b 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.man.core</artifactId>
diff --git a/man/pom.xml b/man/pom.xml
index 126f6c0e40..e1259c4234 100644
--- a/man/pom.xml
+++ b/man/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.man</groupId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml
index f58aaf26da..1aa518810a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 d70ab3d92c..d0f186d700 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.core.tests</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF
index 4020bbcc57..ddc0ff3be9 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF
@@ -13,15 +13,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: oprofile-core.jar
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.internal.oprofile.core,
- org.eclipse.linuxtools.internal.oprofile.core.daemon,
- org.eclipse.linuxtools.internal.oprofile.core.linux,
- org.eclipse.linuxtools.internal.oprofile.core.model,
- org.eclipse.linuxtools.internal.oprofile.core.opxml,
- org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent,
- org.eclipse.linuxtools.internal.oprofile.core.opxml.info,
- org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata,
- org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions
+Export-Package: org.eclipse.linuxtools.internal.oprofile.core,org.ecli
+ pse.linuxtools.internal.oprofile.core.daemon,org.eclipse.linuxtools.i
+ nternal.oprofile.core.linux,org.eclipse.linuxtools.internal.oprofile.
+ core.model,org.eclipse.linuxtools.internal.oprofile.core.opxml,org.ec
+ lipse.linuxtools.internal.oprofile.core.opxml.checkevent,org.eclipse.
+ linuxtools.internal.oprofile.core.opxml.info,org.eclipse.linuxtools.i
+ nternal.oprofile.core.opxml.modeldata,org.eclipse.linuxtools.internal
+ .oprofile.core.opxml.sessions
 Bundle-Localization: plugin
 Eclipse-BundleShape: dir
 Import-Package: org.eclipse.core.resources
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml
index 09fed6ea64..eca8556eff 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 666653d201..85194ad800 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.doc</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml
index b07a63b43e..5080db0fd7 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.launch.tests</artifactId>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml
index 8001838485..e704de32f4 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 76f382aabb..e3c0536174 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 9bcfc285c2..4aa47c5db0 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 c4f7972ef5..84d3876692 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 54ed318fb7..41f68e5944 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 3531bf1cd5..56e3091c6f 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.oprofile.ui</artifactId>
diff --git a/oprofile/pom.xml b/oprofile/pom.xml
index 0567b78ba6..4d916c7e9b 100644
--- a/oprofile/pom.xml
+++ b/oprofile/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.oprofile</groupId>
diff --git a/perf/org.eclipse.linuxtools.perf-feature/pom.xml b/perf/org.eclipse.linuxtools.perf-feature/pom.xml
index 72672fe02a..124bbafbf2 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 d067b427bf..50db82a3a0 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 63bcdce3ac..e46ce06d83 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 30dc64e27e..8ee99e8e51 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf.swtbot.tests</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf.tests/pom.xml b/perf/org.eclipse.linuxtools.perf.tests/pom.xml
index 457b184022..ca05a93bf9 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf.tests</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf/pom.xml b/perf/org.eclipse.linuxtools.perf/pom.xml
index 2d9f5a39f6..8bd5f7af9f 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.perf</artifactId>
diff --git a/perf/pom.xml b/perf/pom.xml
index a847e4cb82..04bc71d878 100644
--- a/perf/pom.xml
+++ b/perf/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.perf-parent</groupId>
diff --git a/pom.xml b/pom.xml
index f9f876c585..062e500ba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   </prerequisites>
   <groupId>org.eclipse.linuxtools</groupId>
   <artifactId>linuxtools-parent</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.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 e9de486fa2..d69853bf45 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 5da51bb364..613df2ffa7 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.dataviewers.feature</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml
index f4da41adbb..053bfd2a5b 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 060b148021..0bf3814306 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 a301d78342..6823f3eb8f 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 682b5e31b7..691a383844 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 4d7fec02f9..58f51ebc04 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 952c5b8b9b..c936e98f38 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
index a755dc9348..125bb90f2e 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
@@ -29,10 +29,11 @@ Import-Package: org.eclipse.cdt.core.model,
  org.eclipse.jface.text,
  org.eclipse.ui,
  org.eclipse.ui.console
-Export-Package: org.eclipse.linuxtools.internal.profiling.launch;x-internal:=true,
- org.eclipse.linuxtools.internal.profiling.launch.provider;x-friends:="org.eclipse.linuxtools.gprof.test",
- org.eclipse.linuxtools.internal.profiling.launch.provider.launch;x-friends:="org.eclipse.linuxtools.gprof.test",
- org.eclipse.linuxtools.profiling.launch,
- org.eclipse.linuxtools.profiling.launch.ui
+Export-Package: org.eclipse.linuxtools.internal.profiling.launch;x-int
+ ernal:=true,org.eclipse.linuxtools.internal.profiling.launch.provider
+ ;x-friends:="org.eclipse.linuxtools.gprof.test",org.eclipse.linuxtool
+ s.internal.profiling.launch.provider.launch;x-friends:="org.eclipse.l
+ inuxtools.gprof.test",org.eclipse.linuxtools.profiling.launch,org.ecl
+ ipse.linuxtools.profiling.launch.ui
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor.0
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
index 956e707b23..5adeeff40c 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 65638a8449..36bfb31389 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 a619444b8a..b64acbef2a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 74f47879e1..35d085635c 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 2737f36432..8ed702a210 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 b5a2a847a4..178b3f2749 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 9c1d867dfc..4536067252 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 ee46dcbf6f..2f307b28f7 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.ssh.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF
index a991dc32f4..e6e4200a8c 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem;bundle-version="1.3.100"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.tools.launch.core,
- org.eclipse.linuxtools.tools.launch.core.factory,
- org.eclipse.linuxtools.tools.launch.core.properties
+Export-Package: org.eclipse.linuxtools.tools.launch.core,org.eclipse.l
+ inuxtools.tools.launch.core.factory,org.eclipse.linuxtools.tools.laun
+ ch.core.properties
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml
index 1b3b9207d9..8e092960ea 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 60a77a1d8e..8ef136bb5a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.tools.launch.ui</artifactId>
diff --git a/profiling/pom.xml b/profiling/pom.xml
index bfb132431e..267cc2c794 100644
--- a/profiling/pom.xml
+++ b/profiling/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.profiling</groupId>
diff --git a/releng/org.eclipse.linuxtools.releng-site/pom.xml b/releng/org.eclipse.linuxtools.releng-site/pom.xml
index 162a3ac5ff..161da4b29b 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.releng-site</artifactId>
@@ -115,6 +115,6 @@
 
   <name>Linux Tools p2 Repository</name>
   <!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
 
 </project>
diff --git a/releng/pom.xml b/releng/pom.xml
index bba5fcd30c..3967866345 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.releng</groupId>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml b/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
index 454710aa7f..cbb4c38fd6 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 21cef8633e..ed3010c635 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 6e0af14e02..4eebd8b89d 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.core</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml
index 5dc23111a0..f99173f991 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-rpm-parent</artifactId>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.createrepo.tests</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml b/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml
index 2ec0301d13..44f67d7eab 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 7b2c5406a4..1b38b57329 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 c8c1bbe6cc..0c4a792222 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 efd986058d..3d70532733 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 8c2752a75b..ac20630840 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 df30132a12..9c9e8fb7c6 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpm.ui</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml b/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml
index f3082aaf8f..4d84c9b667 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools.rpm</groupId>
     <artifactId>linuxtools-rpm-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.rpmstubby</artifactId>
diff --git a/rpm/pom.xml b/rpm/pom.xml
index f8c063e490..d4f9bfa8bc 100644
--- a/rpm/pom.xml
+++ b/rpm/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.rpm</groupId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
index 5dcb230734..519fc62f70 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 e5052276c8..8f8cf8fd4c 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 5ffc199ff5..62cbf6631b 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 aad27f361f..1b27041d6d 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 82dbf2cf33..0e1b5beb2a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 4d035a0db2..749f559865 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 b11aae258f..aa09b7bf40 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 9f9d49f55e..1f9de5d1cf 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
index e42c058c13..5fea32d6e8 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.graphing.core.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml
index 350d3ba8b6..8c3af3291f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.graphing.core</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF
index cfe825b3dc..8f6fb5f576 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF
@@ -6,14 +6,13 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.systemtap.graphing.ui.GraphingUIPlugin
 Bundle-Vendor: %bundleProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.systemtap.graphing.ui,
- org.eclipse.linuxtools.systemtap.graphing.ui.charts,
- org.eclipse.linuxtools.systemtap.graphing.ui.charts.listeners,
- org.eclipse.linuxtools.systemtap.graphing.ui.datadisplay,
- org.eclipse.linuxtools.systemtap.graphing.ui.views,
- org.eclipse.linuxtools.systemtap.graphing.ui.widgets,
- org.eclipse.linuxtools.systemtap.graphing.ui.wizards.dataset,
- org.eclipse.linuxtools.systemtap.graphing.ui.wizards.graph
+Export-Package: org.eclipse.linuxtools.systemtap.graphing.ui,org.eclip
+ se.linuxtools.systemtap.graphing.ui.charts,org.eclipse.linuxtools.sys
+ temtap.graphing.ui.charts.listeners,org.eclipse.linuxtools.systemtap.
+ graphing.ui.datadisplay,org.eclipse.linuxtools.systemtap.graphing.ui.
+ views,org.eclipse.linuxtools.systemtap.graphing.ui.widgets,org.eclips
+ e.linuxtools.systemtap.graphing.ui.wizards.dataset,org.eclipse.linuxt
+ ools.systemtap.graphing.ui.wizards.graph
 Require-Bundle: org.eclipse.linuxtools.systemtap.graphing.core,
  org.eclipse.linuxtools.systemtap.structures,
  org.eclipse.ui,
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml
index 61b512f424..8e8f9f1720 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>linuxtools-systemtap-parent</artifactId>
     <groupId>org.eclipse.linuxtools.systemtap</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.graphing.ui</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
index 1b277d7996..eb3ad1e10a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.structures.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF
index e0ef9bfd34..183fc8d8fd 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.structures;singleton:=true
 Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %bundleProvider
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.systemtap.structures,
- org.eclipse.linuxtools.systemtap.structures.listeners,
- org.eclipse.linuxtools.systemtap.structures.process,
- org.eclipse.linuxtools.systemtap.structures.runnable
+Export-Package: org.eclipse.linuxtools.systemtap.structures,org.eclips
+ e.linuxtools.systemtap.structures.listeners,org.eclipse.linuxtools.sy
+ stemtap.structures.process,org.eclipse.linuxtools.systemtap.structure
+ s.runnable
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.linuxtools.profiling.launch;bundle-version="0.11.0",
  org.eclipse.core.filesystem;bundle-version="1.3.200",
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml
index bb36da7d1e..3f1f24d147 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 ae348b9a78..f235b116bc 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.consolelog.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
index 5609ab11d3..f1a4ab743c 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.consolelog.internal.ConsoleLogPlugin
 Bundle-Vendor: %bundleProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.systemtap.ui.consolelog,
- org.eclipse.linuxtools.systemtap.ui.consolelog.internal,
- org.eclipse.linuxtools.systemtap.ui.consolelog.preferences,
- org.eclipse.linuxtools.systemtap.ui.consolelog.structures,
- org.eclipse.linuxtools.systemtap.ui.consolelog.views
+Export-Package: org.eclipse.linuxtools.systemtap.ui.consolelog,org.ecl
+ ipse.linuxtools.systemtap.ui.consolelog.internal,org.eclipse.linuxtoo
+ ls.systemtap.ui.consolelog.preferences,org.eclipse.linuxtools.systemt
+ ap.ui.consolelog.structures,org.eclipse.linuxtools.systemtap.ui.conso
+ lelog.views
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.console,
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml
index 1a3776ea92..6ad6156704 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 8f3b861bea..044da0c8b5 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.doc</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
index cda513d662..acfe0b44d3 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.editor;singleton:=true
 Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %bundleProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.systemtap.ui.editor,
- org.eclipse.linuxtools.systemtap.ui.editor.handlers.file
+Export-Package: org.eclipse.linuxtools.systemtap.ui.editor,org.eclipse
+ .linuxtools.systemtap.ui.editor.handlers.file
 Require-Bundle: org.eclipse.core.filesystem,
  org.eclipse.core.runtime,
  org.eclipse.jface.text,
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/pom.xml
index e86db8b72f..601e048c27 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.editor</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 345ef46e7f..502ad6025f 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.ide.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
index 87af6906da..9df65acd1a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.ide</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.tests/pom.xml
index bb6aea9f5e..406010d0ae 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.tests</artifactId>
diff --git a/systemtap/pom.xml b/systemtap/pom.xml
index 04c60ace38..58a99da7cc 100644
--- a/systemtap/pom.xml
+++ b/systemtap/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.systemtap</groupId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
index e557635785..505daf391d 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 a6c9e6e337..bf426c8e32 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 2a73078d21..84f5c61e0f 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 5af19ba3ab..36238ef3db 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 c5b265ba1f..cf03a7aad4 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 ec3b19b3e5..65ab84995f 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 c5d196da1e..69cf07e9df 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.helgrind</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
index 5aedcccee9..7fe7bd8d3a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
@@ -28,16 +28,13 @@ Import-Package: org.eclipse.cdt.core.model,
  org.eclipse.linuxtools.valgrind.ui,
  org.eclipse.ui.model,
  org.eclipse.ui.views.navigator
-Export-Package: org.eclipse.linuxtools.internal.valgrind.launch;
-  x-friends:="org.eclipse.linuxtools.valgrind.cachegrind,
-   org.eclipse.linuxtools.valgrind.helgrind,
-   org.eclipse.linuxtools.valgrind.massif,
-   org.eclipse.linuxtools.valgrind.memcheck,
-   org.eclipse.linuxtools.valgrind.launch,
-   org.eclipse.linuxtools.valgrind.tests,
-   org.eclipse.linuxtools.valgrind.cachegrind.tests,
-   org.eclipse.linuxtools.valgrind.helgrind.tests,
-   org.eclipse.linuxtools.valgrind.massif.tests,
-   org.eclipse.linuxtools.valgrind.memcheck.tests",
- org.eclipse.linuxtools.valgrind.launch
+Export-Package: org.eclipse.linuxtools.internal.valgrind.launch; x-fri
+ ends:="org.eclipse.linuxtools.valgrind.cachegrind,  org.eclipse.linux
+ tools.valgrind.helgrind,  org.eclipse.linuxtools.valgrind.massif,  or
+ g.eclipse.linuxtools.valgrind.memcheck,  org.eclipse.linuxtools.valgr
+ ind.launch,  org.eclipse.linuxtools.valgrind.tests,  org.eclipse.linu
+ xtools.valgrind.cachegrind.tests,  org.eclipse.linuxtools.valgrind.he
+ lgrind.tests,  org.eclipse.linuxtools.valgrind.massif.tests,  org.ecl
+ ipse.linuxtools.valgrind.memcheck.tests",org.eclipse.linuxtools.valgr
+ ind.launch
 Bundle-Localization: plugin
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
index 0f6160a9a7..70ad3d8cd5 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 a2c36e90c7..47dfba4a0b 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 b0dbed4dda..961cd3cfcd 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 e98f78b5d4..0f55d99556 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 8349be0c18..134e351433 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 6e023ea4c0..dc3186fdef 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 fa50ca44f1..b05f2dd795 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 e956cb8c67..4472bfe69a 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 e225cf9c8f..7f25aac5ae 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.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 b53bbd0271..cb711283c7 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>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.linuxtools.valgrind.ui</artifactId>
diff --git a/valgrind/pom.xml b/valgrind/pom.xml
index a1ddcaa3cb..b5f83ba59a 100644
--- a/valgrind/pom.xml
+++ b/valgrind/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.valgrind</groupId>