diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml b/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
index d55cdee..5d1fd1f 100644
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
+++ b/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.tests.feature</artifactId>
-  <version>3.4.0-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
index d1eb2b2..ddd7e13 100644
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.common.runtime.tests</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
index cd86915..8393af2 100644
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.contentassist.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
index baaec73..6215a8a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.context.symbol.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
index e4cc19e..afb1013 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.core.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
index ed1dde5..2e86556 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.designtime.tests</artifactId>
-  <version>1.14.0-SNAPSHOT</version>
+  <version>1.15.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
index 3d22488..0b91ecc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.facesconfig.tests</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
index 8633e0e..62b883f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.facesconfig.ui.test</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
index 6ba86b6..4d70887 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.metadata.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml
index aec28f7..1a050f8 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.metadataprocessingtests2</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml b/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
index 4d96eac..aaf56c5 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.test.util</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
index 65eec6a..4f93b63 100644
--- a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.ui.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
index 1548017..22a4d2a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.validation.el.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
index d4547c8..1728efa 100644
--- a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
@@ -16,12 +16,12 @@
   <parent>
     <groupId>org.eclipse.webtools.jsf</groupId>
     <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.pagedesigner.tests</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index e4e56ca..9183537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.webtools.jsf.tests</artifactId>
-  <version>3.5.0-SNAPSHOT</version>
+  <version>3.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>