Bug 426156 - Configure Build to compile with Java 1.5 + code signing
Compiled with Java 5, Code Signing
https://bugs.eclipse.org/bugs/show_bug.cgi?id=426156
diff --git a/bundles/org.eclipse.emf.emfstore.branding/pom.xml b/bundles/org.eclipse.emf.emfstore.branding/pom.xml
index 2acbb2b..658b9b8 100644
--- a/bundles/org.eclipse.emf.emfstore.branding/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.branding/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.branding</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
index a415e99..c3a1b31 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.model.edit</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml b/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
index b407548..bd7a300 100644
--- a/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.transaction</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
index 4753636..dca36a4 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.historybrowsercomparator</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
index 51ad9b6..f30781f 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.client/pom.xml b/bundles/org.eclipse.emf.emfstore.client/pom.xml
index c8644ac..5282a2a 100644
--- a/bundles/org.eclipse.emf.emfstore.client/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
index 8f8e160..1c417f8 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common.model.edit</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/pom.xml b/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
index 1121609..77b0577 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common.model</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.common/pom.xml b/bundles/org.eclipse.emf.emfstore.common/pom.xml
index 37205a5..1fac2f3 100644
--- a/bundles/org.eclipse.emf.emfstore.common/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/pom.xml b/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
index faa3707..1b63941 100644
--- a/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.ecore</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml b/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
index 71bbe3c..82534b1 100644
--- a/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.helloworld</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml b/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
index 21d4dd5..ab09555 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.installer</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml b/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
index 86389ce..795726a 100644
--- a/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.merging</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
index 8eb2174..80b4f1a 100644
--- a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.sessionprovider</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
index 2c05439..a13cd3a 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.examplemodel.edit</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml b/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
index 8d4663b..421dac2 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.examplemodel</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
index 994e511..ed7e964 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.emf.edit</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
index 31f45e9..29c76d4 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.emf.editor</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
index 02e0d2d..cb1c2d6 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.emf.example</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
index de18f20..8cfba46 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.emf</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy/pom.xml
index 10d86e7..59a6b73 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.migration/pom.xml b/bundles/org.eclipse.emf.emfstore.migration/pom.xml
index e281191..b5b6d34 100644
--- a/bundles/org.eclipse.emf.emfstore.migration/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.migration/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.migration</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml b/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
index fd04066..63b2cdd 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.modelmutator</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
index 48c29cd..e71659e 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.client</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
index 4b5c16f..1514614 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.server</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
index e23f87a..a4c83fa 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
index 0ed0120..ad8fd85 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server.model.edit</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/pom.xml b/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
index 88a4bca..b393ed3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server.model</artifactId>
diff --git a/bundles/org.eclipse.emf.emfstore.server/pom.xml b/bundles/org.eclipse.emf.emfstore.server/pom.xml
index a59af69..2893edf 100644
--- a/bundles/org.eclipse.emf.emfstore.server/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-bundles-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.client.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.feature/pom.xml
index c129149..a507584 100644
--- a/features/org.eclipse.emf.emfstore.client.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
index c29a5ed..a1bed99 100644
--- a/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.transaction.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
index 8048924..6e2c40c 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
index 2c3d91f..35dd12b 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.common.feature/pom.xml b/features/org.eclipse.emf.emfstore.common.feature/pom.xml
index cdadcd0..c55f1f9 100644
--- a/features/org.eclipse.emf.emfstore.common.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.common.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml b/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
index 06eb491..e567296 100644
--- a/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.ecore.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.ecp.feature/pom.xml b/features/org.eclipse.emf.emfstore.ecp.feature/pom.xml
index 055f848..f5d8736 100644
--- a/features/org.eclipse.emf.emfstore.ecp.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.ecp.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.ecp.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.example.feature/pom.xml b/features/org.eclipse.emf.emfstore.example.feature/pom.xml
index 4ef62b5..73ecec3 100644
--- a/features/org.eclipse.emf.emfstore.example.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.example.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml b/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
index 6a71855..f50b23f 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
index adcfdc1..19a7182 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.test.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml b/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
index aa40134..af845de 100644
--- a/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.modelmutator.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml b/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
index 930bc7c..124b81c 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.client.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml b/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
index 191d967..b2ef7d8 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.server.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.perspective.feature/pom.xml b/features/org.eclipse.emf.emfstore.perspective.feature/pom.xml
index d02f3a5..704071f 100644
--- a/features/org.eclipse.emf.emfstore.perspective.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.perspective.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.perspective.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml b/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
index 2586ccf..eda6268 100644
--- a/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.sdk.feature</artifactId>
diff --git a/features/org.eclipse.emf.emfstore.server.feature/pom.xml b/features/org.eclipse.emf.emfstore.server.feature/pom.xml
index e9fc3ac..136fe34 100644
--- a/features/org.eclipse.emf.emfstore.server.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.server.feature/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-features-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server.feature</artifactId>
diff --git a/releng/_target/emfstore.target b/releng/_target/emfstore.target
index 56d89cc..668fca4 100644
--- a/releng/_target/emfstore.target
+++ b/releng/_target/emfstore.target
@@ -2,11 +2,11 @@
 <?pde version="3.8"?><target name="EMFStore" sequenceNumber="216">

 <locations>

 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">

-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.1.1.201307101628"/>

-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.1.1.201307101628"/>

-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.1.1.201307101628"/>

-<unit id="org.eclipse.swtbot.feature.group" version="2.1.1.201307101628"/>

-<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="2.1.1.201307101628"/>

+<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>

+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>

+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>

+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>

+<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>

 <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>

 <unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>

 <unit id="org.hamcrest.library.source" version="1.3.0.v201305281000"/>

diff --git a/releng/emfstore-parent/pom.xml b/releng/emfstore-parent/pom.xml
index b637add..c31e6d4 100644
--- a/releng/emfstore-parent/pom.xml
+++ b/releng/emfstore-parent/pom.xml
@@ -1,329 +1,194 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.eclipse.emf.emfstore</groupId>
-  <artifactId>emfstore-parent</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+	<groupId>org.eclipse.emf.emfstore</groupId>
+	<artifactId>emfstore-parent</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
-  <properties>
-    <tycho-version>0.18.0</tycho-version>
-    <junit-version>4.8.2</junit-version>
-    <maven-checkstyle-version>2.10</maven-checkstyle-version>
-    <jacoco-version>0.5.7.201204190339</jacoco-version>
-	<emfstore-version>1.1.0-SNAPSHOT</emfstore-version>
-	<!-- Properties to enable jacoco code coverage analysis with sonar -->
-	<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-	<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-	<sonar.jacoco.reportPath>../../tests/org.eclipse.emf.emfstore.client.test.alltests/target/jacoco.exec</sonar.jacoco.reportPath>
-  </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<tycho-version>0.18.0</tycho-version>
+		<junit-version>4.8.2</junit-version>
+		<maven-checkstyle-version>2.10</maven-checkstyle-version>
+		<jacoco-version>0.5.7.201204190339</jacoco-version>
+		<emfstore-version>1.1.0-SNAPSHOT</emfstore-version>
+		<jarsigner-version>1.0.5</jarsigner-version>
+		<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
+		<!-- Properties to enable jacoco code coverage analysis with sonar -->
+		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+		<sonar.jacoco.reportPath>../../tests/org.eclipse.emf.emfstore.client.test.alltests/target/jacoco.exec</sonar.jacoco.reportPath>
+	</properties>
 
-<!-- 
-  <profiles>
-    <profile>
-      <id>platform-galileo</id>
-      <activation>
-        <property>
-          <name>platform-version-name</name>
-          <value>galileo</value>
-        </property>
-      </activation>
-      <properties>
-        <eclipse-site>http://download.eclipse.org/releases/galileo</eclipse-site>
-        <eclipse-platform>http://download.eclipse.org/eclipse/updates/3.5</eclipse-platform>
-        <platform-version>[3.5,3.6)</platform-version>
-      </properties>
-    </profile>
-    <profile>
-      <id>platform-helios</id>
-      <activation>
-        <property>
-          <name>platform-version-name</name>
-          <value>helios</value>
-        </property>
-      </activation>
-      <properties>
-        <eclipse-site>http://download.eclipse.org/releases/helios</eclipse-site>
-        <eclipse-platform>http://download.eclipse.org/eclipse/updates/3.6</eclipse-platform>
-        <platform-version>[3.6,3.7)</platform-version>
-      </properties>
-    </profile>
-    <profile>
-      <id>platform-indigo</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-        <property>
-          <name>platform-version-name</name>
-          <value>indigo</value>
-        </property>
-      </activation>
-      <properties>
-        <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
-        <eclipse-platform>http://download.eclipse.org/eclipse/updates/3.7</eclipse-platform>
-        <platform-version>[3.7,3.8)</platform-version>
-      </properties>
-    </profile>
-    <profile>
-      <id>platform-juno</id>
-      <activation>
-        <property>
-          <name>platform-version-name</name>
-          <value>juno</value>
-        </property>
-      </activation>
-      <properties>
-        <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site>
-        <platform-version>[3.8,3.9)</platform-version>
-      </properties>
-    </profile>
-  </profiles>
- -->
- 
-  <modules>
-  	<module>../../releng/_target</module>
-    <!-- EMFStore Core Features -->
-    <module>../../features/org.eclipse.emf.emfstore.common.feature</module>
-    <!-- <module>../../bundles/org.eclipse.emf.emfstore.branding</module>-->
-    <module>../../bundles/org.eclipse.emf.emfstore.common</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.common.model</module>
+	<profiles>
+		<profile>
+			<id>aggregateSites</id>
+			<activation>
+				<property>
+					<name>aggSite</name>
+				</property>
+			</activation>
+		</profile>
+		<profile>
+			<id>build-server</id>
+			<activation>
+				<property>
+					<name>build-server</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<!-- Configure build to use the java compiler as specified in manifest -->
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-compiler-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<configuration>
+							<useJDK>BREE</useJDK>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
-    <module>../../features/org.eclipse.emf.emfstore.server.feature</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.migration</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.server</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.server.model</module>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>eclipse-maven-releases</id>
+			<url>https://repo.eclipse.org/content/repositories/releases/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 
-    <module>../../features/org.eclipse.emf.emfstore.client.ui.feature</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.client.model.edit</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.client.ui</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.common.model.edit</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.server.model.edit</module>
+	<modules>
+		<module>../../releng/_target</module>
+		<module>../../releng/org.eclipse.emf.emfstore.p2repository</module>
+		<module>../../releng/org.eclipse.emf.emfstore.products</module>
 
-    <!-- 
-    <module>../org.eclipse.emf.emfstore.perspective.feature</module>
-    <module>../../org.eclipse.emf.emfstore.core/org.eclipse.emf.emfstore.perspective</module>
- -->
-    <module>../../features/org.eclipse.emf.emfstore.ecore.feature</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.ecore</module>
+		<module>../../releng/org.eclipse.emf.emfstore.releng.bundles</module>
+		<module>../../releng/org.eclipse.emf.emfstore.releng.features</module>
+		<module>../../releng/org.eclipse.emf.emfstore.releng.tests</module>
+	</modules>
 
+	<build>
+		<!-- Use java/eclipse conventions for src and bin here, because of build.properties -->
+		<sourceDirectory>src</sourceDirectory>
+		<outputDirectory>bin</outputDirectory>
 
-    <module>../../features/org.eclipse.emf.emfstore.client.feature</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.client</module>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
 
-    <!-- EMFStore Additional Features -->
-    <module>../../features/org.eclipse.emf.emfstore.client.transaction.feature</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.client.transaction</module>
-	<module>../../features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature</module>
-	<module>../../bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator</module>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<resolver>p2</resolver>
+					<pomDependencies>consider</pomDependencies>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+					<target>
+						<artifact>
+							<groupId>org.eclipse.emf.emfstore</groupId>
+							<artifactId>emfstore</artifactId>
+							<version>${emfstore-version}</version>
+						</artifact>
+					</target>
+				</configuration>
+			</plugin>
 
-    <!-- EMF Client Platform 
-    <module>../../org.eclipse.emf.ecp.releng/org.eclipse.emf.ecp.validation.feature</module>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<format>'v'yyyyMMdd'-'HHmm</format>
+				</configuration>
+			</plugin>
 
-    <module>../../org.eclipse.emf.ecp.releng/org.eclipse.emf.ecp.navigator.feature</module>
-    <module>../../org.eclipse.emf.ecp.core/org.eclipse.emf.ecp.navigator</module>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
-    <module>../../org.eclipse.emf.ecp.releng/org.eclipse.emf.ecp.editor.feature</module>
-    <module>../../org.eclipse.emf.ecp.core/org.eclipse.emf.ecp.editor</module>
-
-    <module>../../org.eclipse.emf.ecp.releng/org.eclipse.emf.ecp.navigatoreditorbridge.feature</module>
-
-    <module>../../org.eclipse.emf.ecp.releng/org.eclipse.emf.ecp.common.feature</module>
-    <module>../../org.eclipse.emf.ecp.core/org.eclipse.emf.ecp.common</module>
-    <module>../../org.eclipse.emf.ecp.core/org.eclipse.emf.ecp.common.model</module>
-    <module>../../org.eclipse.emf.ecp.core/org.eclipse.emf.ecp.common.rcp</module>
-    <module>../../org.eclipse.emf.ecp.core/org.eclipse.emf.ecp.common.util</module>
-    -->
-
-    <!-- EMFStore Examples -->
-    <module>../../features/org.eclipse.emf.emfstore.example.feature</module>
-    
-    <module>../../bundles/org.eclipse.emf.emfstore.example.helloworld</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.example.installer</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.example.merging</module>
-    
-    <module>../../bundles/org.eclipse.emf.emfstore.examplemodel</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.examplemodel.edit</module>
-	
-	<!-- EMFStore MongoDB -->
-    <module>../../features/org.eclipse.emf.emfstore.mongodb.client.feature</module>
-	<module>../../features/org.eclipse.emf.emfstore.mongodb.server.feature</module>
-    
-    <module>../../bundles/org.eclipse.emf.emfstore.mongodb</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.mongodb.client</module>
-    <module>../../bundles/org.eclipse.emf.emfstore.mongodb.server</module>
-
-    <!-- Update site and products -->
-	<module>../../features/org.eclipse.emf.emfstore.sdk.feature</module>
-    <module>../org.eclipse.emf.emfstore.p2repository</module>
-	<module>../org.eclipse.emf.emfstore.products</module>
-
-    <!-- Plugins for test osgi runtime -->
-    <!-- 
-    <module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.examplemodel.ecp</module>
-    <module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.client.backchannel</module>
-    <module>../../org.eclipse.emf.emfstore.other/org.eclipse.emf.emfstore.server.backchannel</module>
-     -->
-     <!-- Model Mutator -->  
-    <module>../../bundles/org.eclipse.emf.emfstore.modelmutator</module>
-    <module>../../features/org.eclipse.emf.emfstore.modelmutator.feature</module>
-        
-    <!-- Fuzzy -->    
-    <module>../../features/org.eclipse.emf.emfstore.fuzzy.feature</module>
-    <module>../../features/org.eclipse.emf.emfstore.fuzzy.test.feature</module>
-	<module>../../bundles/org.eclipse.emf.emfstore.fuzzy</module>
-	<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf</module>
-	<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit</module>
-	<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor</module>
-	<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf.example</module>
-	<module>../../tests/org.eclipse.emf.emfstore.fuzzy.emf.test</module>
-	
-    <!-- Testing -->
-    <module>../../tests/org.eclipse.emf.emfstore.client.test</module>
-	<module>../../tests/org.eclipse.emf.emfstore.client.test.ui</module>
-	<module>../../tests/org.eclipse.emf.emfstore.client.test.alltests</module>
-    
-  </modules>
-<!-- 
-  <repositories>
-    <repository>
-      <id>eclipse</id>
-      <layout>p2</layout>
-      <url>${eclipse-site}</url>
-    </repository>
-    <repository>
-      <id>eclipse-platform</id>
-      <layout>p2</layout>
-      <url>${eclipse-platform}</url>
-    </repository>
-  </repositories>
-  -->
-
-  <build>
-    <!-- Use java/eclipse conventions for src and bin here, because of build.properties -->
-    <sourceDirectory>src</sourceDirectory>
-    <outputDirectory>bin</outputDirectory>
-
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <extensions>true</extensions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-          <pomDependencies>consider</pomDependencies>
-          <environments>
-            <environment>
-              <os>linux</os>
-              <ws>gtk</ws>
-              <arch>x86</arch>
-            </environment>
-            <environment>
-              <os>linux</os>
-              <ws>gtk</ws>
-              <arch>x86_64</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</ws>
-              <arch>x86</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</ws>
-              <arch>x86_64</arch>
-            </environment>
-            <environment>
-              <os>macosx</os>
-              <ws>cocoa</ws>
-              <arch>x86_64</arch>
-            </environment>
-          </environments>
-	   <!-- work around Equinox bug 348045 (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045) -->
-	   <!-- 
-	    <filters>
-            <filter>
-              <type>p2-installable-unit</type>
-              <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
-              <removeAll />
-            </filter>
-          </filters>
-           -->
-          <target>
-			<artifact>
-				<groupId>org.eclipse.emf.emfstore</groupId>
-  				<artifactId>emfstore</artifactId>
-				<version>${emfstore-version}</version>
-			</artifact>
-		</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <format>'v'yyyyMMdd'-'HHmm</format>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <executions>
-          <execution>
-            <id>plugin-source</id>
-            <goals>
-              <goal>plugin-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${maven-checkstyle-version}</version>
-        <executions>
-          <execution>
-            <id>checkstyle</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <phase>compile</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <!-- Checkstyle violations will not fail the whole build -->
-          <failOnViolation>false</failOnViolation>
-          <!-- <configLocation>${basedir}/../../EMFStoreDeveloper/coding/emfstoreStyle5.x.xml</configLocation>-->
-          <configLocation>http://download.eclipse.org/emfclient/config/esmCheckstyle.xml</configLocation>
-          <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>${maven-checkstyle-version}</version>
+				<executions>
+					<execution>
+						<id>checkstyle</id>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<phase>compile</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<failOnViolation>false</failOnViolation>
+					<configLocation>http://download.eclipse.org/emfclient/config/esmCheckstyle.xml</configLocation>
+					<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
 					<suppressionsLocation>http://download.eclipse.org/emfclient/config/suppressions.xml</suppressionsLocation>
-          <propertyExpansion>samedir=${basedir}/../../EMFStoreDeveloper/coding</propertyExpansion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+					<propertyExpansion>samedir=${basedir}/../../EMFStoreDeveloper/coding</propertyExpansion>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit-version}</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit-version}</version>
+				<scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 </project>
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/aggregateSite.properties b/releng/org.eclipse.emf.emfstore.p2repository/aggregateSite.properties
new file mode 100644
index 0000000..c99af84
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.p2repository/aggregateSite.properties
@@ -0,0 +1 @@
+associate.sites=http://bryanhunt.github.com/mongo-emf/releases/0.7.1/
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/ant-contrib-1.0b3.jar b/releng/org.eclipse.emf.emfstore.p2repository/ant-contrib-1.0b3.jar
new file mode 100644
index 0000000..0625376
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.p2repository/ant-contrib-1.0b3.jar
Binary files differ
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/build.xml b/releng/org.eclipse.emf.emfstore.p2repository/build.xml
new file mode 100644
index 0000000..9450f2a
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.p2repository/build.xml
@@ -0,0 +1,67 @@
+<project default="custom.build" name="EMFStore site to include updatessite">
+
+	<condition property="build.xml" value="build.xml">
+		<available file="build.xml" type="file" />
+	</condition>
+
+	<property name="update.site.source.dir" value="target/repository" />
+
+	<property name="aggregateSite.properties" value="aggregateSite.properties" />
+	<property file="${aggregateSite.properties}" />
+
+	<target name="init">
+		<taskdef resource="net/sf/antcontrib/antlib.xml">
+			<classpath>
+				<pathelement location="ant-contrib-1.0b3.jar" />
+			</classpath>
+		</taskdef>
+	</target>
+
+	<target name="custom.build" description="aggregate update site extras" depends="init,add.associate.sites" />
+
+	<target name="add.associate.sites" if="associate.sites">
+		<if>
+			<and>
+				<!-- Defined in aggregateSite.properties -->
+				<isset property="associate.sites" />
+				<not>
+					<equals arg1="${associate.sites}" arg2="" />
+				</not>
+			</and>
+			<then>
+				<if>
+					<available file="${update.site.source.dir}/content.jar" type="file" />
+					<then>
+						<unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" />
+						<delete file="${update.site.source.dir}/content.jar" />
+					</then>
+				</if>
+				<!-- counter variable -->
+				<var name="associate.sites.0" value="" />
+				<for param="associate.site" list="${associate.sites}" delimiter=", ">
+					<sequential>
+						<var name="associate.sites.0" value="${associate.sites.0}00" />
+					</sequential>
+				</for>
+				<length property="associate.sites.length" string="${associate.sites.0}" />
+
+				<loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml">
+					<filterchain>
+						<tailfilter lines="-1" skip="1" />
+					</filterchain>
+				</loadfile>
+				<echo file="${update.site.source.dir}/content.xml" message="${content.xml}" />
+				<echo file="${update.site.source.dir}/content.xml" append="true">  &lt;references size='${associate.sites.length}'></echo>
+				<for param="associate.site" list="${associate.sites}" delimiter=", ">
+					<sequential>
+						<!-- insert into content.xml -->
+						<echo file="${update.site.source.dir}/content.xml" append="true">    &lt;repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>&lt;repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/></echo>
+					</sequential>
+				</for>
+				<echo file="${update.site.source.dir}/content.xml" append="true">  &lt;/references>&lt;/repository></echo>
+				<zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" />
+				<delete file="${update.site.source.dir}/content.xml" />
+			</then>
+		</if>
+	</target>
+</project>
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/pom.xml b/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
index 7edd562..b708d97 100644
--- a/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
@@ -1,15 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../emfstore-parent/</relativePath>
-  </parent>
-  <groupId>org.eclipse.emf.emfstore</groupId>
-  <artifactId>org.eclipse.emf.emfstore.p2repository</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-repository</packaging>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.emf.emfstore</groupId>
+		<artifactId>emfstore-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../emfstore-parent/</relativePath>
+	</parent>
+	<groupId>org.eclipse.emf.emfstore</groupId>
+	<artifactId>org.eclipse.emf.emfstore.p2repository</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-repository</packaging>
+
+	<profiles>
+		<profile>
+			<id>aggregateSites</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>${maven.antrun.plugin.version}</version>
+						<executions>
+							<execution>
+								<id>install</id>
+								<phase>install</phase>
+								<configuration>
+									<quiet>true</quiet>
+									<tasks>
+										<ant antfile="build.xml"/>
+									</tasks>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>commons-net</groupId>
+								<artifactId>commons-net</artifactId>
+								<version>1.4.1</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant</artifactId>
+								<version>1.7.1</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-nodeps</artifactId>
+								<version>1.7.1</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-trax</artifactId>
+								<version>1.7.1</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-commons-net</artifactId>
+								<version>1.7.1</version>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-apache-regexp</artifactId>
+								<version>1.7.1</version>
+							</dependency>
+							<dependency>
+								<groupId>ant-contrib</groupId>
+								<artifactId>ant-contrib</artifactId>
+								<version>1.0b3</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/releng/org.eclipse.emf.emfstore.releng.bundles/.project b/releng/org.eclipse.emf.emfstore.releng.bundles/.project
new file mode 100644
index 0000000..2ae6636
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.releng.bundles/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.emfstore.releng.bundles</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml b/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
new file mode 100644
index 0000000..cf12a9d
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.emf.emfstore</groupId>
+		<artifactId>emfstore-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../emfstore-parent/</relativePath>
+	</parent>
+	<groupId>org.eclipse.emf.emfstore</groupId>
+	<artifactId>emfstore-bundles-parent</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>../../bundles/org.eclipse.emf.emfstore.common</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.common.model</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.migration</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.server</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.server.model</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.client.model.edit</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.client.ui</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.common.model.edit</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.server.model.edit</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.ecore</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.client</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.client.transaction</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.example.helloworld</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.example.installer</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.example.merging</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.examplemodel</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.examplemodel.edit</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.mongodb</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.mongodb.client</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.mongodb.server</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.modelmutator</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.fuzzy</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor</module>
+		<module>../../bundles/org.eclipse.emf.emfstore.fuzzy.emf.example</module>
+	</modules>
+
+	<build>
+		<plugins>
+			<!-- 1. -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<!-- 2. -->
+		<profile>
+			<id>build-server</id>
+			<build>
+				<plugins>
+					<!-- 3.a -->
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200a-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>pack200-normalize</id>
+								<goals>
+									<goal>normalize</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+						<version>${jarsigner-version}</version>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<!-- 3.b -->
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<!-- 4. -->
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+						<version>${tycho-version}</version>
+						<executions>
+							<execution>
+								<id>attach-p2-metadata</id>
+								<phase>package</phase>
+								<goals>
+									<goal>p2-metadata</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<defaultP2Metadata>false</defaultP2Metadata>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.emfstore.releng.features/.project b/releng/org.eclipse.emf.emfstore.releng.features/.project
new file mode 100644
index 0000000..c342de6
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.releng.features/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.emfstore.releng.features</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.emfstore.releng.features/pom.xml b/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
new file mode 100644
index 0000000..57b88b5
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.emf.emfstore</groupId>
+		<artifactId>emfstore-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../emfstore-parent/</relativePath>
+	</parent>
+	<groupId>org.eclipse.emf.emfstore</groupId>
+	<artifactId>emfstore-features-parent</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>../../features/org.eclipse.emf.emfstore.common.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.server.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.client.ui.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.ecore.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.client.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.client.transaction.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.example.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.mongodb.client.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.mongodb.server.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.sdk.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.modelmutator.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.fuzzy.feature</module>
+		<module>../../features/org.eclipse.emf.emfstore.fuzzy.test.feature</module>
+	</modules>
+
+	<!-- Parent used for features. This POM contains all build steps for code signing. -->
+	<build>
+		<plugins>
+			<!-- 1. -->
+			<!--<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>generate-source-feature</id>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>-->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<!-- 2. -->
+						<id>default-p2-metadata-default</id>
+						<configuration>
+							<attachP2Metadata>false</attachP2Metadata>
+						</configuration>
+					</execution>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<!-- 3. -->
+		<profile>
+			<id>build-server</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+						<version>${jarsigner-version}</version>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.emfstore.releng.tests/.project b/releng/org.eclipse.emf.emfstore.releng.tests/.project
new file mode 100644
index 0000000..b7805a9
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.releng.tests/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.emfstore.releng.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml b/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
new file mode 100644
index 0000000..6c4b171
--- /dev/null
+++ b/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.emf.emfstore</groupId>
+		<artifactId>emfstore-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../emfstore-parent/</relativePath>
+	</parent>
+	<groupId>org.eclipse.emf.emfstore</groupId>
+	<artifactId>emfstore-tests-parent</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>../../tests/org.eclipse.emf.emfstore.client.test</module>
+		<module>../../tests/org.eclipse.emf.emfstore.client.test.ui</module>
+		<module>../../tests/org.eclipse.emf.emfstore.client.test.alltests</module>
+		<module>../../tests/org.eclipse.emf.emfstore.fuzzy.emf.test</module>
+	</modules>
+</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/pom.xml b/tests/org.eclipse.emf.emfstore.client.test.alltests/pom.xml
index bb3c7be..9b5ad25 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.alltests/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/pom.xml
@@ -5,9 +5,9 @@
 
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-tests-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml b/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
index 4e1670f..dc1d2c2 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
@@ -1,18 +1,380 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
-  </parent>
+	<parent>
+		<groupId>org.eclipse.emf.emfstore</groupId>
+		<artifactId>emfstore-tests-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
+	</parent>
 
-  <groupId>org.eclipse.emf.emfstore</groupId>
-  <artifactId>org.eclipse.emf.emfstore.client.test.ui</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  
+	<groupId>org.eclipse.emf.emfstore</groupId>
+	<artifactId>org.eclipse.emf.emfstore.client.test.ui</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+
+				<goals>
+					<goal>test</goal>
+				</goals>
+				<configuration>
+					<testSuite>org.eclipse.emf.emfstore.client.test.ui</testSuite>
+					<testClass>org.eclipse.emf.emfstore.client.test.ui.AllUITests</testClass>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>false</useUIThread>
+					<argLine>-Dorg.eclipse.swtbot.search.timeout=30000 -Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m</argLine>
+					<testFailureIgnore>true</testFailureIgnore>
+					<!-- Plugins to be loaded to the osgi runtime -->
+					<dependencies>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.client.model.edit</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.client.test</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.client</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.client.ui</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.common.model.edit</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.common.model</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.common</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.modelmutator</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.examplemodel.edit</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.examplemodel</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.migration</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.server.model.edit</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.server.model</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+						<dependency>
+							<type>eclipse-plugin</type>
+							<artifactId>org.eclipse.emf.emfstore.server</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+					</dependencies>
+
+					<bundleStartLevel>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.client.model.edit</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.client.test</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.client</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.client.ui</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.common.model.edit</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.common.model</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.common</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.modelmutator</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.examplemodel.edit</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.examplemodel</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.migration</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.server.model.edit</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.server.model</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+						<bundle>
+							<id>org.eclipse.emf.emfstore.server</id>
+							<level>4</level>
+							<autoStart>false</autoStart>
+						</bundle>
+					</bundleStartLevel>
+				</configuration>
+
+				<!-- More suites can be added here -->
+				<executions>
+					<execution>
+						<id>TransactionalEditingDomainTests</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<testSuite>org.eclipse.emf.emfstore.client.test.ui</testSuite>
+							<testClass>org.eclipse.emf.emfstore.client.test.ui.AllUITests</testClass>
+							<useUIHarness>true</useUIHarness>
+							<useUIThread>false</useUIThread>
+							<argLine>-Dorg.eclipse.swtbot.search.timeout=30000 -Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m</argLine>
+							<testFailureIgnore>true</testFailureIgnore>
+
+							<dependencies>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.client.model.edit</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.client.test</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.client.transaction</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.client</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.client.ui</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.common.model.edit</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.common.model</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.common</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.modelmutator</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.examplemodel.edit</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.examplemodel</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.migration</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.server.model.edit</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.server.model</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+								<dependency>
+									<type>eclipse-plugin</type>
+									<artifactId>org.eclipse.emf.emfstore.server</artifactId>
+									<version>0.0.0</version>
+								</dependency>
+							</dependencies>
+
+							<bundleStartLevel>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.client.model.edit</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.client.test</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.client.transaction</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.client</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.client.ui</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.client.changetracking.test</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.common.model.edit</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.common.model</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.common</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.modelmutator</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.examplemodel.edit</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.examplemodel</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.migration</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.server.model.edit</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.server.model</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+								<bundle>
+									<id>org.eclipse.emf.emfstore.server</id>
+									<level>4</level>
+									<autoStart>false</autoStart>
+								</bundle>
+							</bundleStartLevel>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco-version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/tests/org.eclipse.emf.emfstore.client.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.test/pom.xml
index 051690b..11fb202 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.test/pom.xml
@@ -5,9 +5,9 @@
 
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-tests-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
index c5809bd..7a34a09 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
-    <artifactId>emfstore-parent</artifactId>
+    <artifactId>emfstore-tests-parent</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../releng/emfstore-parent/</relativePath>
+    <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.emf.test</artifactId>