diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
index a6ceca0..23f1cd0 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -299,8 +299,6 @@
           name="org.eclipse.oomph.setup.workbench.feature.group"/>
       <requirement
           name="org.eclipse.oomph.setup.workingsets.feature.group"/>
-      <repository
-          url="http://download.eclipse.org/oomph/updates/"/>
     </setupTask>
     <setupTask
         xsi:type="setup.p2:P2Task"
diff --git a/devtools/org.eclipse.emf.parsley.rap.workspace/feature.xml b/devtools/org.eclipse.emf.parsley.rap.workspace/feature.xml
index ae1da45..17ef0d3 100644
--- a/devtools/org.eclipse.emf.parsley.rap.workspace/feature.xml
+++ b/devtools/org.eclipse.emf.parsley.rap.workspace/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.rap.workspace"
       label="EMF Parsley RAP Workspace"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/emfparsley">
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging-rap.target
new file mode 100644
index 0000000..4900ebd
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging-rap.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="photon-staging-rap" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.examples.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="javax.inject" version="0.0.0"/>
+<unit id="org.apache.log4j" version="0.0.0"/>
+<unit id="com.google.inject" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.edit.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.util.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/staging/photon/"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging.target
new file mode 100644
index 0000000..b1ae2f5
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/photon-staging.target
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="photon-staging" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="de.itemis.xtext.antlr.feature.feature.group" version="2.1.1.v201405091103"/>
+<repository location="http://download.itemis.com/updates/releases/2.1.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
+<unit id="org.hamcrest.library" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/staging/photon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.mockito" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/pom.xml b/devtools/org.eclipse.emf.parsley.targetplatform/pom.xml
index 6d64519..61170f6 100644
--- a/devtools/org.eclipse.emf.parsley.targetplatform/pom.xml
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.targetplatform</artifactId>
diff --git a/devtools/org.eclipse.emf.parsley.workspace/feature.xml b/devtools/org.eclipse.emf.parsley.workspace/feature.xml
index 36c775d..dcfe228 100644
--- a/devtools/org.eclipse.emf.parsley.workspace/feature.xml
+++ b/devtools/org.eclipse.emf.parsley.workspace/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.workspace"
       label="EMF Parsley Workspace"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/emfparsley">
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.xtext.sdk" version="2.12.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.sdk" version="2.13.0" match="equivalent"/>
       <import feature="org.eclipse.swtbot.eclipse" version="2.5.0.201609021837"/>
       <import feature="org.eclipse.swtbot.ide" version="2.5.0.201609021837"/>
       <import plugin="org.mockito"/>
diff --git a/doc/org.eclipse.emf.parsley.dev.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.parsley.dev.doc/META-INF/MANIFEST.MF
index 84496fd..f855e11 100644
--- a/doc/org.eclipse.emf.parsley.dev.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.parsley.dev.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.dev.doc
 Bundle-SymbolicName: org.eclipse.emf.parsley.dev.doc;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.help;bundle-version="3.5.0",
  org.eclipse.xtext.xdoc.generator;bundle-version="0.1.0";resolution:=optional,
diff --git a/doc/org.eclipse.emf.parsley.doc.websitegen/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.parsley.doc.websitegen/META-INF/MANIFEST.MF
index e9fc032..adc26ee 100644
--- a/doc/org.eclipse.emf.parsley.doc.websitegen/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.parsley.doc.websitegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator
 Bundle-SymbolicName: org.eclipse.emf.parsley.doc.website.generator
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.6.0",
  com.google.guava;bundle-version="21.0.0",
  org.eclipse.xtext.xbase.lib,
diff --git a/doc/org.eclipse.emf.parsley.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.parsley.doc/META-INF/MANIFEST.MF
index edb331d..4eab3be 100644
--- a/doc/org.eclipse.emf.parsley.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.parsley.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.doc
 Bundle-SymbolicName: org.eclipse.emf.parsley.doc;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.help;bundle-version="3.5.0",
  org.eclipse.emf.parsley;resolution:=optional,
diff --git a/doc/org.eclipse.emf.parsley.doc/pom.xml b/doc/org.eclipse.emf.parsley.doc/pom.xml
index 8a20fae..97858bd 100644
--- a/doc/org.eclipse.emf.parsley.doc/pom.xml
+++ b/doc/org.eclipse.emf.parsley.doc/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.doc</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.additional.builder/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.additional.builder/META-INF/MANIFEST.MF
index 5b44e05..fc8605f 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.additional.builder/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.additional.builder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley DSL Additional Builder
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.additional.builder;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.dsl.additional.builder.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -20,4 +20,5 @@
  org.eclipse.emf.parsley.dsl.additional.builder.builder,
  org.eclipse.emf.parsley.dsl.pluginxml
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl.additional.builder
 
diff --git a/dsl/org.eclipse.emf.parsley.dsl.additional.builder/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.additional.builder/pom.xml
index 9d9ea5c..9dae8e7 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.additional.builder/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.additional.builder/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.additional.builder</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF
index 6f5a044..e6c19ad 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.dsl.ide
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.emf.parsley.dsl,
@@ -12,4 +12,5 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.dsl.ide.contentassist.antlr.internal,
  org.eclipse.emf.parsley.dsl.ide.contentassist.antlr
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl.ide
 
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ide/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.ide/pom.xml
index a41cf58..371e841 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ide/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ide/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.ide</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/META-INF/MANIFEST.MF
index 0d61043..a744730 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley DSL Standalone Lib
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.standalone.lib
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl.standalone.lib
diff --git a/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/pom.xml
index a8b60bf..9c830b4 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.standalone.lib/pom.xml
@@ -18,7 +18,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.standalone.lib</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.standalone/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.standalone/META-INF/MANIFEST.MF
index 0d66840..dde880a 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.standalone/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.standalone/META-INF/MANIFEST.MF
@@ -2,6 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley DSL Standalone
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.standalone
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl.standalone
diff --git a/dsl/org.eclipse.emf.parsley.dsl.standalone/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.standalone/pom.xml
index 3c31b93..2a7e720 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.standalone/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.standalone/pom.xml
@@ -18,7 +18,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.standalone</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF
index e15cf0b..60e46e6 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.dsl.tests
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.emf.parsley.dsl,
  org.eclipse.emf.parsley.dsl.ui,
  org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
  org.eclipse.jdt.core;bundle-version="3.7.3",
  org.eclipse.emf.parsley.examples.library,
  org.eclipse.emf.parsley.tests.models,
@@ -32,3 +32,4 @@
  org.junit.runners.model;version="4.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.dsl.tests;x-internal=true
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl.tests
diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
index 8ec31c3..3697157 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.tests</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF
index 0c0549c..6926942 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.dsl.ui.tests
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.emf.parsley.dsl.ui,
@@ -32,3 +32,4 @@
  org.junit.runners;version="4.5.0",
  org.junit.runner.manipulation;version="4.5.0",
  org.junit.runner.notification;version="4.5.0"
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl.ui.tests
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
index 4cc1374..c097e4a 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.ui.tests</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF
index aee3604..1ab4777 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.dsl.ui
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.emf.parsley.dsl;visibility:=reexport,
@@ -21,7 +21,7 @@
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.xtend,
  org.eclipse.xpand,
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
  org.eclipse.emf.parsley.views,
  org.eclipse.emf.parsley.generator.common,
  org.eclipse.emf.parsley.wizards,
@@ -40,3 +40,4 @@
  org.eclipse.emf.parsley.dsl.ui.wizard,
  org.eclipse.emf.parsley.dsl.ui.wizard.template
 Bundle-Activator: org.eclipse.emf.parsley.dsl.ui.internal.DslActivator
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl.ui
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
index ed57a62..661f4e6 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml
@@ -205,6 +205,15 @@
 			</activeWhen>
 		</handler>
 	</extension>
+	<extension point="org.eclipse.core.contenttype.contentTypes">
+		<content-type
+			base-type="org.eclipse.core.runtime.text"
+			file-extensions="parsley"
+			id="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.contenttype"
+			name="EmfParsleyDsl File"
+			priority="normal">
+		</content-type>
+	</extension>
 	<!-- adding resource factories -->
 	<extension
 		point="org.eclipse.emf.ecore.extension_parser">
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
index b66646d..436571a 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/plugin.xml_gen
@@ -205,6 +205,15 @@
 			</activeWhen>
 		</handler>
 	</extension>
+	<extension point="org.eclipse.core.contenttype.contentTypes">
+		<content-type
+			base-type="org.eclipse.core.runtime.text"
+			file-extensions="parsley"
+			id="org.eclipse.emf.parsley.dsl.EmfParsleyDsl.contenttype"
+			name="EmfParsleyDsl File"
+			priority="normal">
+		</content-type>
+	</extension>
 	<!-- adding resource factories -->
 	<extension
 		point="org.eclipse.emf.ecore.extension_parser">
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.ui/pom.xml
index d50752c..1e99073 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.ui</artifactId>
diff --git a/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
index 187368d..d04e25f 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley DSL
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.dsl;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
@@ -17,11 +17,11 @@
  org.eclipse.emf.common;bundle-version="2.7.0",
  org.antlr.runtime,
  org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
  org.eclipse.emf.parsley;visibility:=reexport,
  org.eclipse.emf.parsley.generator.common,
  org.objectweb.asm;bundle-version="5.0.1";visibility:=reexport,
- org.eclipse.xtend.lib
+ org.eclipse.xtend.lib;bundle-version="2.13.0"
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -40,4 +40,5 @@
  org.eclipse.emf.parsley.dsl.util,
  org.eclipse.emf.parsley.dsl.validation,
  org.eclipse.emf.parsley.dsl.formatting2
+Automatic-Module-Name: org.eclipse.emf.parsley.dsl
 
diff --git a/dsl/org.eclipse.emf.parsley.dsl/pom.xml b/dsl/org.eclipse.emf.parsley.dsl/pom.xml
index 0ac6302..08bfcb2 100644
--- a/dsl/org.eclipse.emf.parsley.dsl/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl</artifactId>
diff --git a/examples/org.eclipse.emf.examples.library.edit/.project b/examples/org.eclipse.emf.examples.library.edit/.project
index 3b69244..bf5b081 100644
--- a/examples/org.eclipse.emf.examples.library.edit/.project
+++ b/examples/org.eclipse.emf.examples.library.edit/.project
@@ -20,27 +20,9 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>ignore.missing.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.schema.builder</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.emf.java/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
index a8e0b9b..30aff7b 100644
--- a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.emf.edit;bundle-version="2.7.0";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.examples.library.edit
diff --git a/examples/org.eclipse.emf.examples.library/.project b/examples/org.eclipse.emf.examples.library/.project
index 8f5017d..2cd9f60 100644
--- a/examples/org.eclipse.emf.examples.library/.project
+++ b/examples/org.eclipse.emf.examples.library/.project
@@ -20,27 +20,9 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>ignore.missing.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.schema.builder</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.emf.java/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature>
 	</natures>
 </projectDescription>
diff --git a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
index 5c67230..79beefb 100644
--- a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.emf.ecore.xmi;bundle-version="2.7.0";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.examples.library
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.company.app/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.company.app/META-INF/MANIFEST.MF
index 0e46a9f..c02b6ea 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.company.app/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.company.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: App
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.company.app;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.examples.cdo.company.app.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -12,3 +12,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.parsley.examples.cdo.company
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.company.app
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.company.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.company.model/META-INF/MANIFEST.MF
index 30015dd..b02147b 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.company.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.company.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.company.model;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,3 +14,4 @@
  org.eclipse.emf.ecore,
  org.eclipse.emf.cdo;visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.company.model
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.customers/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.customers/META-INF/MANIFEST.MF
index 3d9ffaa..39ae58d 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.customers/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.customers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.cdo.company.ui.customers
 Bundle-Vendor: My Company
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.company.ui.customers; singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.cdo.company.ui.customers.CustomersActivator
 Bundle-ActivationPolicy: lazy
@@ -16,3 +16,4 @@
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.company.ui.customers
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.orders/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.orders/META-INF/MANIFEST.MF
index 6b96894..5e5d9d7 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.orders/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.orders/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.cdo.company.ui.orders
 Bundle-Vendor: My Company
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.company.ui.orders;singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.cdo.company.ui.orders.OrdersActivator
 Bundle-ActivationPolicy: lazy
@@ -16,3 +16,4 @@
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.company.ui.orders
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.products/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.products/META-INF/MANIFEST.MF
index 83d71dd..ada39ad 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.products/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.company.ui.products/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.cdo.company.ui.products
 Bundle-Vendor: My Company
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.company.ui.products; singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.cdo.company.ui.products.ProductsActivator
 Bundle-ActivationPolicy: lazy
@@ -16,3 +16,4 @@
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.company.ui.products
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.model/META-INF/MANIFEST.MF
index caa8166..34e658f 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.model;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
@@ -16,3 +16,4 @@
  org.eclipse.net4j.tcp;bundle-version="3.0.1",
  org.eclipse.emf.cdo.net4j;bundle-version="4.1.100"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.model
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.model/pom.xml b/examples/org.eclipse.emf.parsley.examples.cdo.model/pom.xml
index e230da3..508e965 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.model/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.model/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.cdo.model</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.product.feature/feature.xml b/examples/org.eclipse.emf.parsley.examples.cdo.product.feature/feature.xml
index 7eff142..50969b5 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.product.feature/feature.xml
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.product.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.examples.cdo.product.feature"
       label="EMF Parsley CDO Example Product Feature"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description url="http://www.eclipse.org/emfparsley">
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.rap/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.rap/META-INF/MANIFEST.MF
index ae06e44..297ce4d 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.rap/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Library RAP
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.rap;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.rap.ui
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.rap/pom.xml b/examples/org.eclipse.emf.parsley.examples.cdo.rap/pom.xml
index ec36e80..68c6ab8 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.rap/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.rap/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.cdo.rap</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.rcp/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.rcp/META-INF/MANIFEST.MF
index 210512e..84bcce1 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.rcp/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.rcp/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Rcp
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.rcp;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.examples.cdo.rcp.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.emf.parsley.examples.cdo.treeform
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.rcp
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.server/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.server/META-INF/MANIFEST.MF
index 5c02146..67a3721 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.server/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Example CDO Server
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.server
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.emf.cdo,
@@ -13,3 +13,4 @@
  org.eclipse.emf.cdo.server.net4j,
  org.eclipse.net4j.tcp
 Export-Package: org.eclipse.emf.parsley.examples.cdo.server
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.server
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.server/pom.xml b/examples/org.eclipse.emf.parsley.examples.cdo.server/pom.xml
index 4e71d65..91474fa 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.server/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.server/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.cdo.server</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.treeform/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.cdo.treeform/META-INF/MANIFEST.MF
index 44de187..2ff9162 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.treeform/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.treeform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.cdo.treeform
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.cdo.treeform; singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.cdo.treeform.TreeformCDOActivator
 Bundle-ActivationPolicy: lazy
@@ -57,3 +57,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.examples.cdo.treeform,
  org.eclipse.emf.parsley.examples.cdo.view
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.cdo.treeform
diff --git a/examples/org.eclipse.emf.parsley.examples.cdo.treeform/pom.xml b/examples/org.eclipse.emf.parsley.examples.cdo.treeform/pom.xml
index 0bd04e3..8ff4a93 100644
--- a/examples/org.eclipse.emf.parsley.examples.cdo.treeform/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.cdo.treeform/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.cdo.treeform</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF
index 3d406de..ea85df3 100644
--- a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.eclipse4.parsleypart
 Bundle-Vendor: My Company
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.eclipse4.parsleypart; singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.eclipse4.parsleypart.ParsleypartActivator
 Require-Bundle: org.eclipse.core.runtime,
@@ -19,3 +19,4 @@
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.eclipse4.parsleypart
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/pom.xml b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/pom.xml
index fcaaf9d..11b1a2e 100644
--- a/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.eclipse4.parsleypart</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/feature.xml b/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/feature.xml
index aaa1d3e..fc43133 100644
--- a/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/feature.xml
+++ b/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.examples.eclipse4.product.feature"
       label="EMF Parsley Eclipse4 Example Product Feature"
-      version="1.2.1.qualifier">
+      version="1.3.0.qualifier">
 
    <description url="http://www.eclipse.org/emfparsley">
       EMF Parsley Eclipse4 Example Product Feature
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/pom.xml b/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/pom.xml
index e4c50cf..fd5f436 100644
--- a/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.eclipse4.product.feature</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF
index 615f65d..f45a9ab 100644
--- a/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.eclipse4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Eclipse4
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.eclipse4;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Require-Bundle: javax.inject,
  org.eclipse.core.runtime,
  org.eclipse.swt,
@@ -21,3 +21,4 @@
  org.eclipse.emf.parsley
 Import-Package: javax.annotation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.eclipse4
diff --git a/examples/org.eclipse.emf.parsley.examples.eclipse4/pom.xml b/examples/org.eclipse.emf.parsley.examples.eclipse4/pom.xml
index 078afa0..e6dc0ce 100644
--- a/examples/org.eclipse.emf.parsley.examples.eclipse4/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.eclipse4/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.eclipse4</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.editors/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.editors/META-INF/MANIFEST.MF
index bdd1ddd..929af4e 100644
--- a/examples/org.eclipse.emf.parsley.examples.editors/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.editors/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Editors Examples
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.editors;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.examples.editors.EmfParsleyExamplesEditorsActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui,
@@ -11,3 +11,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.parsley.examples.editors
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.editors
diff --git a/examples/org.eclipse.emf.parsley.examples.editors/pom.xml b/examples/org.eclipse.emf.parsley.examples.editors/pom.xml
index eb9638b..d4131c9 100644
--- a/examples/org.eclipse.emf.parsley.examples.editors/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.editors/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.editors</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.firstexample/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.firstexample/META-INF/MANIFEST.MF
index e8c74ff..6699474 100644
--- a/examples/org.eclipse.emf.parsley.examples.firstexample/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.firstexample/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.firstexample
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.firstexample; singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.firstexample.FirstexampleActivator
 Bundle-ActivationPolicy: lazy
@@ -14,3 +14,4 @@
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.firstexample
diff --git a/examples/org.eclipse.emf.parsley.examples.library.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.library.edit/META-INF/MANIFEST.MF
index d6b281b..82db2b0 100644
--- a/examples/org.eclipse.emf.parsley.examples.library.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.library.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.library.edit;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.parsley.examples.library.provider.EXTLibraryEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
@@ -14,3 +14,4 @@
  org.eclipse.emf.edit;bundle-version="2.7.0";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.library.edit
diff --git a/examples/org.eclipse.emf.parsley.examples.library.edit/pom.xml b/examples/org.eclipse.emf.parsley.examples.library.edit/pom.xml
index c8c5e9a..7d707dc 100644
--- a/examples/org.eclipse.emf.parsley.examples.library.edit/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.library.edit/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.library.edit</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.library.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.library.editor/META-INF/MANIFEST.MF
index 2e58deb..1b45bcc 100644
--- a/examples/org.eclipse.emf.parsley.examples.library.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.library.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.library.editor;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.parsley.examples.library.presentation.EXTLibraryEditorPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
@@ -19,3 +19,4 @@
  org.eclipse.ui.ide;bundle-version="3.5.0";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.library.editor
diff --git a/examples/org.eclipse.emf.parsley.examples.library.editor/pom.xml b/examples/org.eclipse.emf.parsley.examples.library.editor/pom.xml
index 5cd5d72..2414af8 100644
--- a/examples/org.eclipse.emf.parsley.examples.library.editor/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.library.editor/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.library.editor</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.library.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.library.ui/META-INF/MANIFEST.MF
index 394497c..fd1df96 100644
--- a/examples/org.eclipse.emf.parsley.examples.library.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.library.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.library
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.library.ui;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.examples.library.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -12,3 +12,4 @@
  org.eclipse.emf.parsley.editors
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.library.ui
diff --git a/examples/org.eclipse.emf.parsley.examples.library/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.library/META-INF/MANIFEST.MF
index a75e44e..79f51a0 100644
--- a/examples/org.eclipse.emf.parsley.examples.library/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.library/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.library;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
@@ -15,3 +15,4 @@
  org.eclipse.emf.ecore.xmi;bundle-version="2.7.0";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.library
diff --git a/examples/org.eclipse.emf.parsley.examples.library/pom.xml b/examples/org.eclipse.emf.parsley.examples.library/pom.xml
index 946484f..2d50d39 100644
--- a/examples/org.eclipse.emf.parsley.examples.library/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.library/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.library</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.accountsview/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.mail.accountsview/META-INF/MANIFEST.MF
index 2b8743d..455d50a 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.accountsview/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.mail.accountsview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.mail.accountsview
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.mail.accountsview;singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.mail.accountsview.AccountsviewActivator
 Bundle-ActivationPolicy: lazy
@@ -18,3 +18,4 @@
  org.eclipse.emf.parsley.examples.mail.accountsview.ui.provider,
  org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders,
  org.eclipse.emf.parsley.examples.mail.accountsview.views
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.mail.accountsview
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.accountsview/pom.xml b/examples/org.eclipse.emf.parsley.examples.mail.accountsview/pom.xml
index 0debd3d..f67ed95 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.accountsview/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.mail.accountsview/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.mail.accountsview</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.mailsview/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.mail.mailsview/META-INF/MANIFEST.MF
index ae4b99c..d82eda0 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.mailsview/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.mail.mailsview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.mail.mailsview
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.mail.mailsview;singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.mail.mailsview.MailsviewActivator
 Bundle-ActivationPolicy: lazy
@@ -15,3 +15,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.examples.mail.mailsview,
  org.eclipse.emf.parsley.examples.mail.mailsview.views
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.mail.mailsview
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.mailsview/pom.xml b/examples/org.eclipse.emf.parsley.examples.mail.mailsview/pom.xml
index a8dafe5..6cb1389 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.mailsview/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.mail.mailsview/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.mail.mailsview</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.messageview/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.mail.messageview/META-INF/MANIFEST.MF
index cf8c6ac..b475415 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.messageview/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.mail.messageview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.mail.messageview
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.mail.messageview;singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.mail.messageview.MessageviewActivator
 Bundle-ActivationPolicy: lazy
@@ -15,3 +15,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.examples.mail.messageview,
  org.eclipse.emf.parsley.examples.mail.messageview.views
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.mail.messageview
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.messageview/pom.xml b/examples/org.eclipse.emf.parsley.examples.mail.messageview/pom.xml
index e3292bd..e337498 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.messageview/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.mail.messageview/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.mail.messageview</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.mail.model/META-INF/MANIFEST.MF
index 26a208e..025b8c9 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.mail.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.mail.model;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
@@ -13,3 +13,4 @@
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.mail.model
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.model/pom.xml b/examples/org.eclipse.emf.parsley.examples.mail.model/pom.xml
index 73fdcff..1a2b6ff 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.model/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.mail.model/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.mail.model</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.product.feature/feature.xml b/examples/org.eclipse.emf.parsley.examples.mail.product.feature/feature.xml
index 9f8aa89..355ca08 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.product.feature/feature.xml
+++ b/examples/org.eclipse.emf.parsley.examples.mail.product.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.examples.mail.product.feature"
       label="EMF Parsley Mail Product Feature"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="Rcp-Vision">
 
    <description url="http://www.eclipse.org/emfparsley">
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.product.feature/pom.xml b/examples/org.eclipse.emf.parsley.examples.mail.product.feature/pom.xml
index 9dbc923..a5ed6c4 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.product.feature/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.mail.product.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.mail.product.feature</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.rcp/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.mail.rcp/META-INF/MANIFEST.MF
index a5d70b1..0119a34 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.rcp/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.mail.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Mail Example Rcp
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.mail.rcp;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.examples.mail.rcp.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
@@ -11,3 +11,4 @@
  org.eclipse.emf.parsley.examples.mail.model
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.mail.rcp
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.rcp/pom.xml b/examples/org.eclipse.emf.parsley.examples.mail.rcp/pom.xml
index 0cb3c86..34ec6c5 100644
--- a/examples/org.eclipse.emf.parsley.examples.mail.rcp/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.mail.rcp/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.mail.rcp</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.maven/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.maven/META-INF/MANIFEST.MF
index 0d200bb..38c3a5d 100644
--- a/examples/org.eclipse.emf.parsley.examples.maven/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.maven/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.examples.maven
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.maven; singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.examples.maven.MavenActivator
 Bundle-ActivationPolicy: lazy
@@ -15,3 +15,4 @@
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.maven
diff --git a/examples/org.eclipse.emf.parsley.examples.maven/pom.xml b/examples/org.eclipse.emf.parsley.examples.maven/pom.xml
index f193399..fad55a7 100644
--- a/examples/org.eclipse.emf.parsley.examples.maven/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.maven/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.parsley</groupId>
 	<artifactId>org.eclipse.emf.parsley.examples.maven</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 	<packaging>eclipse-test-plugin</packaging>
 
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.rap.model/META-INF/MANIFEST.MF
index caf0938..82afcf3 100644
--- a/examples/org.eclipse.emf.parsley.examples.rap.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.rap.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.rap.model;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.model/pom.xml b/examples/org.eclipse.emf.parsley.examples.rap.model/pom.xml
index 485a5f0..508dbe4 100644
--- a/examples/org.eclipse.emf.parsley.examples.rap.model/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.rap.model/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.rap.model</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/META-INF/MANIFEST.MF
index 328fe9a..33971b8 100644
--- a/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.rap.targetplatform/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Targetplatform for EMF Parsley RAP Examples
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.rap.targetplatform
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: EMF Modeling Project
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.rap.ui/META-INF/MANIFEST.MF
index 36aa5f9..8967d04 100644
--- a/examples/org.eclipse.emf.parsley.examples.rap.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.rap.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley RAP Example Ui
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.rap.ui;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.examples.rap.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.emf.parsley.examples.rap.model,
diff --git a/examples/org.eclipse.emf.parsley.examples.rap.ui/pom.xml b/examples/org.eclipse.emf.parsley.examples.rap.ui/pom.xml
index dfdc82c..68e0207 100644
--- a/examples/org.eclipse.emf.parsley.examples.rap.ui/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.rap.ui/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.rap.ui</artifactId>
diff --git a/examples/org.eclipse.emf.parsley.examples.views/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.parsley.examples.views/META-INF/MANIFEST.MF
index 35d4c9b..42f805e 100644
--- a/examples/org.eclipse.emf.parsley.examples.views/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.parsley.examples.views/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Views Examples
 Bundle-SymbolicName: org.eclipse.emf.parsley.examples.views;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.examples.views.EmfParsleyExamplesViewsActivator
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -12,3 +12,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.examples.views
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.examples.views
diff --git a/examples/org.eclipse.emf.parsley.examples.views/pom.xml b/examples/org.eclipse.emf.parsley.examples.views/pom.xml
index e9f9107..826ea4c 100644
--- a/examples/org.eclipse.emf.parsley.examples.views/pom.xml
+++ b/examples/org.eclipse.emf.parsley.examples.views/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.views</artifactId>
diff --git a/features/org.eclipse.emf.parsley.cdo.feature/feature.xml b/features/org.eclipse.emf.parsley.cdo.feature/feature.xml
index 5c74af4..f77203e 100644
--- a/features/org.eclipse.emf.parsley.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.cdo.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.cdo.feature"
       label="EMF Parsley CDO"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.cdo.common">
 
diff --git a/features/org.eclipse.emf.parsley.cdo.feature/pom.xml b/features/org.eclipse.emf.parsley.cdo.feature/pom.xml
index 8bd6327..2966540 100644
--- a/features/org.eclipse.emf.parsley.cdo.feature/pom.xml
+++ b/features/org.eclipse.emf.parsley.cdo.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.cdo.feature</artifactId>
diff --git a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
index 2076120..29d5960 100644
--- a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.dsl.feature"
       label="EMF Parsley DSL"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.dsl">
 
@@ -23,8 +23,8 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.xtext.xbase" version="2.12.0" match="equivalent"/>
-      <import feature="org.eclipse.xtext.ui" version="2.12.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.xbase" version="2.13.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.ui" version="2.13.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.emf.parsley.dsl.feature/pom.xml b/features/org.eclipse.emf.parsley.dsl.feature/pom.xml
index f76674e..9ec1176 100644
--- a/features/org.eclipse.emf.parsley.dsl.feature/pom.xml
+++ b/features/org.eclipse.emf.parsley.dsl.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.dsl.feature</artifactId>
diff --git a/features/org.eclipse.emf.parsley.examples.feature/feature.xml b/features/org.eclipse.emf.parsley.examples.feature/feature.xml
index e591070..803b308 100644
--- a/features/org.eclipse.emf.parsley.examples.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.examples.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.examples.feature"
       label="EMF Parsley Examples"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.ui.examples">
 
diff --git a/features/org.eclipse.emf.parsley.examples.feature/pom.xml b/features/org.eclipse.emf.parsley.examples.feature/pom.xml
index 06b14bd..22b8590 100644
--- a/features/org.eclipse.emf.parsley.examples.feature/pom.xml
+++ b/features/org.eclipse.emf.parsley.examples.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.examples.feature</artifactId>
diff --git a/features/org.eclipse.emf.parsley.examples.rap.feature/feature.xml b/features/org.eclipse.emf.parsley.examples.rap.feature/feature.xml
index 7bff64c..de0ef9e 100644
--- a/features/org.eclipse.emf.parsley.examples.rap.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.examples.rap.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.examples.rap.feature"
       label="EMF Parsley RAP Example Feature"
-      version="1.2.1.qualifier">
+      version="1.3.0.qualifier">
 
    <description url="http://www.eclipse.org/emf-parsley">
       EMF Parsley RAP Example Feature
diff --git a/features/org.eclipse.emf.parsley.feature/feature.xml b/features/org.eclipse.emf.parsley.feature/feature.xml
index a5bb041..9b99037 100644
--- a/features/org.eclipse.emf.parsley.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.feature"
       label="EMF Parsley"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.common">
 
diff --git a/features/org.eclipse.emf.parsley.feature/pom.xml b/features/org.eclipse.emf.parsley.feature/pom.xml
index b5346e8..4daa0cd 100644
--- a/features/org.eclipse.emf.parsley.feature/pom.xml
+++ b/features/org.eclipse.emf.parsley.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.feature</artifactId>
diff --git a/features/org.eclipse.emf.parsley.junit4.feature/feature.xml b/features/org.eclipse.emf.parsley.junit4.feature/feature.xml
index 6994b6e..5252e5d 100644
--- a/features/org.eclipse.emf.parsley.junit4.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.junit4.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.junit4.feature"
       label="EMF Parsley Junit4 Support"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/emfparsley">
diff --git a/features/org.eclipse.emf.parsley.junit4.feature/pom.xml b/features/org.eclipse.emf.parsley.junit4.feature/pom.xml
index 05bae95..08a662d 100644
--- a/features/org.eclipse.emf.parsley.junit4.feature/pom.xml
+++ b/features/org.eclipse.emf.parsley.junit4.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.junit4.feature</artifactId>
diff --git a/features/org.eclipse.emf.parsley.rap.cdo.sdk/feature.xml b/features/org.eclipse.emf.parsley.rap.cdo.sdk/feature.xml
index b412889..dfc40b4 100644
--- a/features/org.eclipse.emf.parsley.rap.cdo.sdk/feature.xml
+++ b/features/org.eclipse.emf.parsley.rap.cdo.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.rap.cdo.sdk"
       label="EMF Parsley CDO RAP SDK"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.cdo.common">
 
diff --git a/features/org.eclipse.emf.parsley.rap.cdo.sdk/pom.xml b/features/org.eclipse.emf.parsley.rap.cdo.sdk/pom.xml
index 15a9983..0fc7e81 100644
--- a/features/org.eclipse.emf.parsley.rap.cdo.sdk/pom.xml
+++ b/features/org.eclipse.emf.parsley.rap.cdo.sdk/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.rap.cdo.sdk</artifactId>
diff --git a/features/org.eclipse.emf.parsley.rap.sdk/feature.xml b/features/org.eclipse.emf.parsley.rap.sdk/feature.xml
index bdeb3bc..b299d2c 100644
--- a/features/org.eclipse.emf.parsley.rap.sdk/feature.xml
+++ b/features/org.eclipse.emf.parsley.rap.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.rap.sdk"
       label="EMF Parsley RAP SDK"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.common">
 
diff --git a/features/org.eclipse.emf.parsley.rap.sdk/pom.xml b/features/org.eclipse.emf.parsley.rap.sdk/pom.xml
index a66c2b1..5312ed7 100644
--- a/features/org.eclipse.emf.parsley.rap.sdk/pom.xml
+++ b/features/org.eclipse.emf.parsley.rap.sdk/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.rap.sdk</artifactId>
diff --git a/features/org.eclipse.emf.parsley.sdk/feature.xml b/features/org.eclipse.emf.parsley.sdk/feature.xml
index 9a5ef16..f541091 100644
--- a/features/org.eclipse.emf.parsley.sdk/feature.xml
+++ b/features/org.eclipse.emf.parsley.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.sdk"
       label="EMF Parsley SDK"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.common">
 
diff --git a/features/org.eclipse.emf.parsley.sdk/pom.xml b/features/org.eclipse.emf.parsley.sdk/pom.xml
index 354c7c8..519388c 100644
--- a/features/org.eclipse.emf.parsley.sdk/pom.xml
+++ b/features/org.eclipse.emf.parsley.sdk/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.sdk</artifactId>
diff --git a/features/org.eclipse.emf.parsley.web.feature/feature.xml b/features/org.eclipse.emf.parsley.web.feature/feature.xml
index 8b408f3..785bf21 100644
--- a/features/org.eclipse.emf.parsley.web.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.web.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.web.feature"
       label="EMF Parsley Web Feature"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.parsley.common">
 
diff --git a/features/org.eclipse.emf.parsley.web.feature/pom.xml b/features/org.eclipse.emf.parsley.web.feature/pom.xml
index 0db468e..bf42af3 100644
--- a/features/org.eclipse.emf.parsley.web.feature/pom.xml
+++ b/features/org.eclipse.emf.parsley.web.feature/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.web.feature</artifactId>
diff --git a/old/org.eclipse.emf.parsley.examples.mail.product.site/feature.xml b/old/org.eclipse.emf.parsley.examples.mail.product.site/feature.xml
index d70752c..ab7b479 100644
--- a/old/org.eclipse.emf.parsley.examples.mail.product.site/feature.xml
+++ b/old/org.eclipse.emf.parsley.examples.mail.product.site/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.examples.mail.product.site"
       label="Emf Parsley Mail Example Product Site"
-      version="1.2.1.qualifier">
+      version="1.3.0.qualifier">
 
    <description url="http://www.eclipse.org/emfparsley">
       Emf Parsley Mail Example Product Site
diff --git a/old/org.eclipse.emf.parsley.rap.site/feature.xml b/old/org.eclipse.emf.parsley.rap.site/feature.xml
index 90805ec..2806f4b 100644
--- a/old/org.eclipse.emf.parsley.rap.site/feature.xml
+++ b/old/org.eclipse.emf.parsley.rap.site/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.rap.site"
       label="Emf Parsley RAP Site"
-      version="1.2.1.qualifier">
+      version="1.3.0.qualifier">
 
    <description url="http://code.google.com/a/eclipselabs.org/p/emf-components/">
       Working with EMF a developer realizes that all the information are available for building basic UI.
diff --git a/old/org.eclipse.emf.parsley.site/feature.xml b/old/org.eclipse.emf.parsley.site/feature.xml
index ccda4dc..6ca4c2b 100644
--- a/old/org.eclipse.emf.parsley.site/feature.xml
+++ b/old/org.eclipse.emf.parsley.site/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.site"
       label="Emf Parsley Site"
-      version="1.2.1.qualifier"
+      version="1.3.0.qualifier"
       provider-name="RCP Vision">
 
    <description url="http://www.eclipse.org/emfparsley">
diff --git a/plugins/org.eclipse.emf.parsley.cdo.common/.settings/.api_filters b/plugins/org.eclipse.emf.parsley.cdo.common/.settings/.api_filters
index 567e8f8..8bb1d46 100644
--- a/plugins/org.eclipse.emf.parsley.cdo.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.parsley.cdo.common/.settings/.api_filters
@@ -3,7 +3,7 @@
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
             <message_arguments>
-                <message_argument value="1.2.1"/>
+                <message_argument value="1.3.0"/>
                 <message_argument value="1.1.0"/>
             </message_arguments>
         </filter>
diff --git a/plugins/org.eclipse.emf.parsley.cdo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.cdo.common/META-INF/MANIFEST.MF
index a9f8661..62001d2 100644
--- a/plugins/org.eclipse.emf.parsley.cdo.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.cdo.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley CDO Common
 Bundle-SymbolicName: org.eclipse.emf.parsley.cdo.common
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.cdo.EmfParsleyCDOActivator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.emf.cdo.net4j;bundle-version="3.0.1",
@@ -19,3 +19,4 @@
 Export-Package: org.eclipse.emf.parsley.cdo,
  org.eclipse.emf.parsley.cdo.util
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.cdo.common
diff --git a/plugins/org.eclipse.emf.parsley.cdo.common/pom.xml b/plugins/org.eclipse.emf.parsley.cdo.common/pom.xml
index f52606c..f1a34c9 100644
--- a/plugins/org.eclipse.emf.parsley.cdo.common/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.cdo.common/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.cdo.common</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.cdo/META-INF/MANIFEST.MF
index 459ce49..3b9f750 100644
--- a/plugins/org.eclipse.emf.parsley.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.cdo/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley CDO
 Bundle-SymbolicName: org.eclipse.emf.parsley.cdo;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.cdo.EmfParsleyCDOActivator
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.emf.parsley.cdo.common;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.cdo
diff --git a/plugins/org.eclipse.emf.parsley.cdo/pom.xml b/plugins/org.eclipse.emf.parsley.cdo/pom.xml
index 3eb314c..1d1df69 100644
--- a/plugins/org.eclipse.emf.parsley.cdo/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.cdo/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.cdo</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.common/.settings/.api_filters b/plugins/org.eclipse.emf.parsley.common/.settings/.api_filters
index f2bd372..4c9024c 100644
--- a/plugins/org.eclipse.emf.parsley.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.parsley.common/.settings/.api_filters
@@ -3,7 +3,7 @@
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
             <message_arguments>
-                <message_argument value="1.2.1"/>
+                <message_argument value="1.3.0"/>
                 <message_argument value="1.1.0"/>
             </message_arguments>
         </filter>
diff --git a/plugins/org.eclipse.emf.parsley.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.common/META-INF/MANIFEST.MF
index c65aab6..36316e7 100644
--- a/plugins/org.eclipse.emf.parsley.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Common
 Bundle-SymbolicName: org.eclipse.emf.parsley.common;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.EmfParsleyActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.emf.databinding.edit;bundle-version="1.2.0";visibility:=reexport,
@@ -84,3 +84,4 @@
  org.eclipse.ui.views,
  org.eclipse.ui.views.contentoutline,
  org.eclipse.ui.views.properties;ui.views=split
+Automatic-Module-Name: org.eclipse.emf.parsley.common
diff --git a/plugins/org.eclipse.emf.parsley.common/pom.xml b/plugins/org.eclipse.emf.parsley.common/pom.xml
index a2398ba..4723c85 100644
--- a/plugins/org.eclipse.emf.parsley.common/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.common/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.common</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.editors.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.editors.common/META-INF/MANIFEST.MF
index e8bce1a..123c0d9 100644
--- a/plugins/org.eclipse.emf.parsley.editors.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.editors.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Components Editors Common
 Bundle-SymbolicName: org.eclipse.emf.parsley.editors.common;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.editors.EmfParsleyEditorsActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -55,3 +55,4 @@
  org.eclipse.ui.views,
  org.eclipse.ui.views.contentoutline,
  org.eclipse.ui.views.properties;ui.views=split
+Automatic-Module-Name: org.eclipse.emf.parsley.editors.common
diff --git a/plugins/org.eclipse.emf.parsley.editors.common/pom.xml b/plugins/org.eclipse.emf.parsley.editors.common/pom.xml
index f2441fb..31aedc7 100644
--- a/plugins/org.eclipse.emf.parsley.editors.common/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.editors.common/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.editors.common</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.editors/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.editors/META-INF/MANIFEST.MF
index 6828cd6..4d5c8f1 100644
--- a/plugins/org.eclipse.emf.parsley.editors/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.editors/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Editors
 Bundle-SymbolicName: org.eclipse.emf.parsley.editors;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.editors.EmfParsleyEditorsActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
@@ -14,3 +14,4 @@
  org.eclipse.emf.parsley.editors.common;visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.editors
diff --git a/plugins/org.eclipse.emf.parsley.editors/pom.xml b/plugins/org.eclipse.emf.parsley.editors/pom.xml
index f88d3911..dbc14f9 100644
--- a/plugins/org.eclipse.emf.parsley.editors/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.editors/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.editors</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.generator.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.generator.common/META-INF/MANIFEST.MF
index 505919b..11dc869 100644
--- a/plugins/org.eclipse.emf.parsley.generator.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.generator.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Generator Common Utilities
 Bundle-SymbolicName: org.eclipse.emf.parsley.generator.common;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.xtext.xbase.lib,
  org.objectweb.asm;bundle-version="5.0.1"
@@ -10,4 +10,5 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.generator.common
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.generator.common
 
diff --git a/plugins/org.eclipse.emf.parsley.generator.common/pom.xml b/plugins/org.eclipse.emf.parsley.generator.common/pom.xml
index 38880bf..b762abb 100644
--- a/plugins/org.eclipse.emf.parsley.generator.common/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.generator.common/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.generator.common</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.junit4/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.junit4/META-INF/MANIFEST.MF
index 8e9ee62..abe9c40 100644
--- a/plugins/org.eclipse.emf.parsley.junit4/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.junit4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Junit4 Support
 Bundle-SymbolicName: org.eclipse.emf.parsley.junit4
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.emf.parsley.junit4,
@@ -21,3 +21,4 @@
  org.eclipse.core.databinding.property;visibility:=reexport,
  org.eclipse.xtext.xbase.lib;visibility:=reexport,
  org.apache.log4j;bundle-version="1.2.15"
+Automatic-Module-Name: org.eclipse.emf.parsley.junit4
diff --git a/plugins/org.eclipse.emf.parsley.junit4/pom.xml b/plugins/org.eclipse.emf.parsley.junit4/pom.xml
index 31e9848..2a201cc 100644
--- a/plugins/org.eclipse.emf.parsley.junit4/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.junit4/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.junit4</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.rap.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.rap.cdo/META-INF/MANIFEST.MF
index cbe1abd..72a743f 100644
--- a/plugins/org.eclipse.emf.parsley.rap.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.rap.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley RAP CDO
 Bundle-SymbolicName: org.eclipse.emf.parsley.rap.cdo;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.cdo.EmfParsleyCDOActivator
 Require-Bundle: org.eclipse.emf.parsley.cdo.common;visibility:=reexport,
  org.eclipse.rap.ui
diff --git a/plugins/org.eclipse.emf.parsley.rap.cdo/pom.xml b/plugins/org.eclipse.emf.parsley.rap.cdo/pom.xml
index 14c74f2..f20b228 100644
--- a/plugins/org.eclipse.emf.parsley.rap.cdo/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.rap.cdo/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.rap.cdo</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.rap.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.rap.runtime/META-INF/MANIFEST.MF
index d9f6ec0..9aaa5c4 100644
--- a/plugins/org.eclipse.emf.parsley.rap.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.rap.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley RAP Runtime Functionalities
 Bundle-SymbolicName: org.eclipse.emf.parsley.rap.runtime
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.emf.parsley.runtime.common;visibility:=reexport,
  org.eclipse.rap.ui
diff --git a/plugins/org.eclipse.emf.parsley.rap.runtime/pom.xml b/plugins/org.eclipse.emf.parsley.rap.runtime/pom.xml
index 374f751..5ae13c1 100644
--- a/plugins/org.eclipse.emf.parsley.rap.runtime/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.rap.runtime/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.rap.runtime</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.rap.views/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.rap.views/META-INF/MANIFEST.MF
index 86f1d3d..3550eac 100644
--- a/plugins/org.eclipse.emf.parsley.rap.views/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.rap.views/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley RAP Views
 Bundle-SymbolicName: org.eclipse.emf.parsley.rap.views;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.views.EmfParsleyViewsActivator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0";visibility:=reexport,
  org.eclipse.emf.parsley.views.common;visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.parsley.rap.views/pom.xml b/plugins/org.eclipse.emf.parsley.rap.views/pom.xml
index 332e282..68185f0 100644
--- a/plugins/org.eclipse.emf.parsley.rap.views/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.rap.views/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.rap.views</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.rap/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.rap/META-INF/MANIFEST.MF
index fd6e3c0..61f2297 100644
--- a/plugins/org.eclipse.emf.parsley.rap/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley
 Bundle-SymbolicName: org.eclipse.emf.parsley.rap
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.EmfParsleyActivator
 Require-Bundle: org.eclipse.emf.databinding.edit;bundle-version="1.2.0";visibility:=reexport,
  org.eclipse.core.databinding.property;bundle-version="1.4.0",
diff --git a/plugins/org.eclipse.emf.parsley.rap/pom.xml b/plugins/org.eclipse.emf.parsley.rap/pom.xml
index 3be1ab1..a9ebd56 100644
--- a/plugins/org.eclipse.emf.parsley.rap/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.rap/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.rap</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.runtime.common/.settings/.api_filters b/plugins/org.eclipse.emf.parsley.runtime.common/.settings/.api_filters
index b852bfc..406d200 100644
--- a/plugins/org.eclipse.emf.parsley.runtime.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.parsley.runtime.common/.settings/.api_filters
@@ -3,7 +3,7 @@
     <resource path="META-INF/MANIFEST.MF">
         <filter id="927989779">
             <message_arguments>
-                <message_argument value="1.2.1"/>
+                <message_argument value="1.3.0"/>
                 <message_argument value="com.google.guava"/>
             </message_arguments>
         </filter>
diff --git a/plugins/org.eclipse.emf.parsley.runtime.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.runtime.common/META-INF/MANIFEST.MF
index 03771ed..52d7cd4 100644
--- a/plugins/org.eclipse.emf.parsley.runtime.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.runtime.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Runtime Functionalities
 Bundle-SymbolicName: org.eclipse.emf.parsley.runtime.common
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.google.inject;visibility:=reexport,
@@ -21,3 +21,4 @@
  org.eclipse.emf.parsley.runtime.service,
  org.eclipse.emf.parsley.runtime.ui,
  org.eclipse.emf.parsley.runtime.util
+Automatic-Module-Name: org.eclipse.emf.parsley.runtime.common
diff --git a/plugins/org.eclipse.emf.parsley.runtime.common/pom.xml b/plugins/org.eclipse.emf.parsley.runtime.common/pom.xml
index 4de7298..ab9b8b6 100644
--- a/plugins/org.eclipse.emf.parsley.runtime.common/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.runtime.common/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.runtime.common</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.runtime/META-INF/MANIFEST.MF
index 3a11712..eb3a9e8 100644
--- a/plugins/org.eclipse.emf.parsley.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Runtime Functionalities
 Bundle-SymbolicName: org.eclipse.emf.parsley.runtime
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.google.inject;visibility:=reexport,
@@ -12,3 +12,4 @@
  org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.emf.parsley.runtime.common;visibility:=reexport
 Import-Package: org.apache.log4j;version="1.2.13"
+Automatic-Module-Name: org.eclipse.emf.parsley.runtime
diff --git a/plugins/org.eclipse.emf.parsley.runtime/pom.xml b/plugins/org.eclipse.emf.parsley.runtime/pom.xml
index 31e340c..9d56f51 100644
--- a/plugins/org.eclipse.emf.parsley.runtime/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.runtime/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.runtime</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.ui.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.ui.examples/META-INF/MANIFEST.MF
index c0c34d1..27e4964 100644
--- a/plugins/org.eclipse.emf.parsley.ui.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.ui.examples/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Examples
 Bundle-SymbolicName: org.eclipse.emf.parsley.ui.examples;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.emf.common.ui;bundle-version="2.7.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
  org.eclipse.xtext.junit4
+Automatic-Module-Name: org.eclipse.emf.parsley.ui.examples
diff --git a/plugins/org.eclipse.emf.parsley.ui.examples/pom.xml b/plugins/org.eclipse.emf.parsley.ui.examples/pom.xml
index 87e4fa8..e2586d5 100644
--- a/plugins/org.eclipse.emf.parsley.ui.examples/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.ui.examples/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.ui.examples</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.views.common/.settings/.api_filters b/plugins/org.eclipse.emf.parsley.views.common/.settings/.api_filters
index e0b8ac1..9c5edd7 100644
--- a/plugins/org.eclipse.emf.parsley.views.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.parsley.views.common/.settings/.api_filters
@@ -3,7 +3,7 @@
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
             <message_arguments>
-                <message_argument value="1.2.1"/>
+                <message_argument value="1.3.0"/>
                 <message_argument value="1.1.0"/>
             </message_arguments>
         </filter>
diff --git a/plugins/org.eclipse.emf.parsley.views.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.views.common/META-INF/MANIFEST.MF
index f5a4694..44aa2bd 100644
--- a/plugins/org.eclipse.emf.parsley.views.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.views.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Views Common
 Bundle-SymbolicName: org.eclipse.emf.parsley.views.common
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.views.EmfParsleyViewsActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -53,3 +53,4 @@
  org.eclipse.ui.views,
  org.eclipse.ui.views.contentoutline,
  org.eclipse.ui.views.properties;ui.views=split
+Automatic-Module-Name: org.eclipse.emf.parsley.views.common
diff --git a/plugins/org.eclipse.emf.parsley.views.common/pom.xml b/plugins/org.eclipse.emf.parsley.views.common/pom.xml
index d5c7fa4..6b942af 100644
--- a/plugins/org.eclipse.emf.parsley.views.common/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.views.common/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.views.common</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.views/.settings/.api_filters b/plugins/org.eclipse.emf.parsley.views/.settings/.api_filters
index cdf5e50..53c21a9 100644
--- a/plugins/org.eclipse.emf.parsley.views/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.parsley.views/.settings/.api_filters
@@ -3,7 +3,7 @@
     <resource path="META-INF/MANIFEST.MF">
         <filter id="926941240">
             <message_arguments>
-                <message_argument value="1.2.1"/>
+                <message_argument value="1.3.0"/>
                 <message_argument value="1.1.0"/>
             </message_arguments>
         </filter>
diff --git a/plugins/org.eclipse.emf.parsley.views/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.views/META-INF/MANIFEST.MF
index 0d8ba04..dbfa74e 100644
--- a/plugins/org.eclipse.emf.parsley.views/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.views/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Views
 Bundle-SymbolicName: org.eclipse.emf.parsley.views;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.views.EmfParsleyViewsActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -15,3 +15,4 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.parsley.views.resource
 Import-Package: org.apache.log4j;version="1.2.15"
+Automatic-Module-Name: org.eclipse.emf.parsley.views
diff --git a/plugins/org.eclipse.emf.parsley.views/pom.xml b/plugins/org.eclipse.emf.parsley.views/pom.xml
index 4b56343..1fac71f 100644
--- a/plugins/org.eclipse.emf.parsley.views/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.views/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.views</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.web.servlets/META-INF/MANIFEST.MF
index 377c012..8d3bfc7 100644
--- a/plugins/org.eclipse.emf.parsley.web.servlets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.web.servlets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Servlets
 Bundle-SymbolicName: org.eclipse.emf.parsley.web.servlets;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Export-Package: org.eclipse.emf.parsley.web.servlets
 Require-Bundle:  com.google.inject,
  org.eclipse.emf.parsley.runtime,
@@ -15,3 +15,4 @@
 Bundle-Activator: org.eclipse.emf.parsley.web.servlets.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.web.servlets
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml b/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml
index bfb3766..45e8f7b 100644
--- a/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml
@@ -5,7 +5,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	
   <artifactId>org.eclipse.emf.parsley.web.servlets</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF
index 83a1b74..612160c 100644
--- a/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.web.tools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Web
 Bundle-SymbolicName: org.eclipse.emf.parsley.web.tools;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.web.tools.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
@@ -34,3 +34,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j
+Automatic-Module-Name: org.eclipse.emf.parsley.web.tools
diff --git a/plugins/org.eclipse.emf.parsley.web.tools/pom.xml b/plugins/org.eclipse.emf.parsley.web.tools/pom.xml
index aa2fafe..22f0f90 100644
--- a/plugins/org.eclipse.emf.parsley.web.tools/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.web.tools/pom.xml
@@ -5,7 +5,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 	
   <artifactId>org.eclipse.emf.parsley.web.tools</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml b/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml
index 8035cbc..5b48b0e 100644
--- a/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.eclipse.emf.parsley</groupId>
 	<artifactId>org.eclipse.emf.parsley.web.servlets.dependencies</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
diff --git a/plugins/org.eclipse.emf.parsley.wizards/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley.wizards/META-INF/MANIFEST.MF
index ae6455e..0f293dc 100644
--- a/plugins/org.eclipse.emf.parsley.wizards/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley.wizards/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Wizards
 Bundle-SymbolicName: org.eclipse.emf.parsley.wizards;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.wizards.EmfParsleyWizardsActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.7.1",
@@ -18,3 +18,4 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.parsley.wizards
 Import-Package: org.apache.log4j
+Automatic-Module-Name: org.eclipse.emf.parsley.wizards
diff --git a/plugins/org.eclipse.emf.parsley.wizards/pom.xml b/plugins/org.eclipse.emf.parsley.wizards/pom.xml
index 7467682..73454d5 100644
--- a/plugins/org.eclipse.emf.parsley.wizards/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.wizards/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.wizards</artifactId>
diff --git a/plugins/org.eclipse.emf.parsley/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.parsley/META-INF/MANIFEST.MF
index bc6ad62..32fe9b9 100644
--- a/plugins/org.eclipse.emf.parsley/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.parsley/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley
 Bundle-SymbolicName: org.eclipse.emf.parsley;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.EmfParsleyActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.emf.databinding.edit;bundle-version="1.2.0";visibility:=reexport,
@@ -18,3 +18,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j;version="1.2.13"
+Automatic-Module-Name: org.eclipse.emf.parsley
diff --git a/plugins/org.eclipse.emf.parsley/pom.xml b/plugins/org.eclipse.emf.parsley/pom.xml
index 663e3cf..b0e8645 100644
--- a/plugins/org.eclipse.emf.parsley/pom.xml
+++ b/plugins/org.eclipse.emf.parsley/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley</artifactId>
diff --git a/releng/org.eclipse.emf.parsley.parent/ant/release.properties b/releng/org.eclipse.emf.parsley.parent/ant/release.properties
index 2dfd07b..360e624 100644
--- a/releng/org.eclipse.emf.parsley.parent/ant/release.properties
+++ b/releng/org.eclipse.emf.parsley.parent/ant/release.properties
@@ -1,8 +1,8 @@
 #Build version
-#Sun, 25 Jun 2017 14:50:01 +0200
+#Tue, 26 Sep 2017 10:14:44 +0200
 
-version_main=1.2.1
-version_osgi=1.2.1.qualifier
-version_mvn=1.2.1-SNAPSHOT
+version_main=1.3.0
+version_osgi=1.3.0.qualifier
+version_mvn=1.3.0-SNAPSHOT
 
-majorMinorVersion=1.2
+majorMinorVersion=1.3
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index a5ac767..5dfb6c2 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.parsley</groupId>
 	<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>EMF Parsley</name>
@@ -66,9 +66,9 @@
 		<findbugs-version>3.0.5</findbugs-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<xtext-version>2.12.0</xtext-version>
+		<xtext-version>2.13.0-SNAPSHOT</xtext-version>
 		<xtextVersion>${xtext-version}</xtextVersion>
-		<mwe2Version>2.9.0.201605261059</mwe2Version>
+		<mwe2Version>2.9.1.201705291010</mwe2Version>
 		<emf.version>(2.8,3.0)</emf.version>
 		<guava.version>[10.0.1,)</guava.version>
 		<google-inject.version>3.0</google-inject.version>
@@ -167,7 +167,7 @@
 		<swtbot.tests.skip>false</swtbot.tests.skip>
 		<swtbot.cdo.tests.skip>false</swtbot.cdo.tests.skip>
 
-		<target-file-name>oxygen</target-file-name>
+		<target-file-name>photon-staging</target-file-name>
 
 		<ant-files-path>${basedir}/../../releng/org.eclipse.emf.parsley.parent/ant</ant-files-path>
 	</properties>
@@ -258,7 +258,7 @@
 		</profile>
 
 		<profile>
-			<id>rcp-build-oxygen</id>
+			<id>rcp-build-photon</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -280,6 +280,28 @@
 		</profile>
 
 		<profile>
+			<id>rcp-build-oxygen</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+
+			<modules>
+				<module>../../tests/org.eclipse.emf.parsley.tests.pde.utils.luna</module>
+				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4</module>
+				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart</module>
+				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature</module>
+				<module>../../tests/org.eclipse.emf.parsley.tests.swtbot.e4</module>
+			</modules>
+
+			<!--
+			Take the default one
+			<properties>
+				<target-file-name>oxygen-staging</target-file-name>
+			</properties>
+			-->
+		</profile>
+
+		<profile>
 			<id>rcp-build-neon</id>
 			<activation>
 				<activeByDefault>false</activeByDefault>
@@ -407,7 +429,7 @@
 			</modules>
 			<properties>
 				<findbugs.skip>true</findbugs.skip>
-				<target-file-name>oxygen-rap</target-file-name>
+				<target-file-name>photon-staging-rap</target-file-name>
 			</properties>
 
 		</profile>
@@ -736,62 +758,6 @@
 		</profile>
 	</profiles>
 
-	<!-- 
-	<repositories>
-		<repository>
-			<id>kepler</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/kepler</url>
-		</repository>
-		<repository>
-			<id>Xtext Update Site</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/</url>
-		</repository>
-	</repositories>
-	-->
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>codehaus-snapshots</id>
-			<name>disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478</name>
-			<url>http://nexus.codehaus.org/snapshots/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>sonatype_releases</id>
-			<url>https://oss.sonatype.org/content/repositories/releases/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>sonatype_snapshots</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>cbi-release</id>
-			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 	<build>
 		<pluginManagement>
 			<plugins>
@@ -1057,7 +1023,63 @@
 
 		</plugins>
 	</build>
-	
+
+	<repositories>
+		<repository>
+			<id>codehaus-snapshots</id>
+			<name>disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478</name>
+			<url>http://nexus.codehaus.org/snapshots/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>sonatype-snapshots</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases><enabled>false</enabled></releases>
+			<snapshots><enabled>true</enabled></snapshots>
+		</repository>
+		<repository>
+			<id>sonatype-releases</id>
+			<url>https://oss.sonatype.org/content/repositories/releases</url>
+			<releases><enabled>true</enabled></releases>
+			<snapshots><enabled>false</enabled></snapshots>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>codehaus-snapshots</id>
+			<name>disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478</name>
+			<url>http://nexus.codehaus.org/snapshots/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>sonatype-snapshots</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases><enabled>false</enabled></releases>
+			<snapshots><enabled>true</enabled></snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>sonatype-releases</id>
+			<url>https://oss.sonatype.org/content/repositories/releases</url>
+			<releases><enabled>true</enabled></releases>
+			<snapshots><enabled>false</enabled></snapshots>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>cbi-release</id>
+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
 	<distributionManagement>
 		<snapshotRepository>
 			<id>ossrh</id>
diff --git a/releng/org.eclipse.emf.parsley.rap.repository/pom.xml b/releng/org.eclipse.emf.parsley.rap.repository/pom.xml
index 6b4ea72..60f6e86 100644
--- a/releng/org.eclipse.emf.parsley.rap.repository/pom.xml
+++ b/releng/org.eclipse.emf.parsley.rap.repository/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.rap.repository</artifactId>
@@ -15,7 +15,7 @@
 
 	<properties>
 		<p2.mirrorsPrefix>/emf-parsley/${parsley.rap.updates.dir}</p2.mirrorsPrefix>
-		<p2.versionMajorMinor>1.2</p2.versionMajorMinor>
+		<p2.versionMajorMinor>1.3</p2.versionMajorMinor>
 		<p2.statsURL>http://download.eclipse.org/stats</p2.statsURL>
 		<p2.mirrorsURL>http://www.eclipse.org/downloads/download.php?format=xml&amp;file=${p2.mirrorsPrefix}/${p2.versionMajorMinor}/${qualifiedVersion}/</p2.mirrorsURL>
 		<p2.statsTrackedArtifacts>org.eclipse.emf.parsley.rap.sdk,org.eclipse.emf.parsley.rap.cdo.sdk</p2.statsTrackedArtifacts>
diff --git a/releng/org.eclipse.emf.parsley.repository/pom.xml b/releng/org.eclipse.emf.parsley.repository/pom.xml
index 1297595..45a8aff 100644
--- a/releng/org.eclipse.emf.parsley.repository/pom.xml
+++ b/releng/org.eclipse.emf.parsley.repository/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.repository</artifactId>
@@ -15,7 +15,7 @@
 
 	<properties>
 		<p2.mirrorsPrefix>/emf-parsley/${parsley.updates.dir}</p2.mirrorsPrefix>
-		<p2.versionMajorMinor>1.2</p2.versionMajorMinor>
+		<p2.versionMajorMinor>1.3</p2.versionMajorMinor>
 		<p2.statsURL>http://download.eclipse.org/stats</p2.statsURL>
 		<p2.mirrorsURL>http://www.eclipse.org/downloads/download.php?format=xml&amp;file=${p2.mirrorsPrefix}/${p2.versionMajorMinor}/${qualifiedVersion}/</p2.mirrorsURL>
 		<p2.statsTrackedArtifacts>org.eclipse.emf.parsley.sdk,org.eclipse.emf.parsley.feature,org.eclipse.emf.parsley.dsl.feature,org.eclipse.emf.parsley.cdo.feature,org.eclipse.emf.examples.feature,org.eclipse.emf.web.feature,org.eclipse.emf.junit4.feature</p2.statsTrackedArtifacts>
diff --git a/tests/org.eclipse.emf.parsley.cdo.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.cdo.tests/META-INF/MANIFEST.MF
index f3b3367..3b2431b 100644
--- a/tests/org.eclipse.emf.parsley.cdo.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.cdo.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Tree Editor CDO Tests
 Bundle-SymbolicName: org.eclipse.emf.parsley.cdo.tests
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.cdo.tests.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -11,3 +11,4 @@
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.emf.parsley.cdo.tests
diff --git a/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml b/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
index bc3695e..c818180 100644
--- a/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
+++ b/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.cdo.tests</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.models/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.models/META-INF/MANIFEST.MF
index d539b9c..97af3e6 100644
--- a/tests/org.eclipse.emf.parsley.tests.models/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.models/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.models;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,3 +13,4 @@
 Export-Package: org.eclipse.emf.parsley.tests.models.testmodels,
  org.eclipse.emf.parsley.tests.models.testmodels.impl,
  org.eclipse.emf.parsley.tests.models.testmodels.util
+Automatic-Module-Name: org.eclipse.emf.parsley.tests.models
diff --git a/tests/org.eclipse.emf.parsley.tests.models/pom.xml b/tests/org.eclipse.emf.parsley.tests.models/pom.xml
index 4fa4505..7ae7079 100644
--- a/tests/org.eclipse.emf.parsley.tests.models/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.models/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.models</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF
index 4b889fc..6b54254 100644
--- a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Emf Parsley Tests PDE Utils
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.pde.utils
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.pde.core;bundle-version="3.7.1";visibility:=reexport,
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml b/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml
index 81f3d4d..7f6a498 100644
--- a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.pde.utils</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF
index 6f2866b..d7edeaa 100644
--- a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Emf Parsley Tests PDE Utils
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.pde.utils
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.pde.core;bundle-version="3.9.1";visibility:=reexport,
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml b/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml
index 81f3d4d..7f6a498 100644
--- a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.pde.utils</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF
index 024a974..98d5594 100644
--- a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Tests PDE Utils
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.pde.utils
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.pde.core;bundle-version="3.10.0";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.9.100",
  org.eclipse.core.resources;bundle-version="3.8.101"
 Export-Package: org.eclipse.emf.parsley.tests.pde.utils
+Automatic-Module-Name: org.eclipse.emf.parsley.tests.pde.utils
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml b/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml
index d756bd4..ec5d781 100644
--- a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.pde.utils</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/feature.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/feature.xml
index cddef4f..8ba2bbb 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/feature.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.tests.swtbot.cdo.feature"
       label="EMF Parsley CDO SWTBOT Tests Feature"
-      version="1.2.1.qualifier">
+      version="1.3.0.qualifier">
 
    <description url="http://www.example.com/description">
       EMF Parsley CDO SWTBOT Tests Feature
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/pom.xml
index ab54c01..1a8ed40 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.cdo.feature</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/META-INF/MANIFEST.MF
index e90e06b..d6a7bd8 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.swtbot.cdo
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.tests.swtbot.cdo.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -26,3 +26,4 @@
  org.eclipse.swtbot.junit4_x;bundle-version="2.2.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.emf.parsley.tests.swtbot.cdo
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
index 2897337..f96df76 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.cdo</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/META-INF/MANIFEST.MF
index 0810c2e..def6705 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley SWTBOT e4 Tests
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.swtbot.e4;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.swtbot.go;bundle-version="2.3.0",
@@ -11,3 +11,4 @@
  org.eclipse.emf.parsley.views,
  org.eclipse.emf.parsley.examples.eclipse4,
  org.eclipse.emf.parsley.examples.eclipse4.parsleypart
+Automatic-Module-Name: org.eclipse.emf.parsley.tests.swtbot.e4
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
index 5c26f7f..67e668e 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.e4</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/META-INF/MANIFEST.MF
index 22901df..eb93ce8 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley SWTBOT Examples Tests
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.swtbot.examples;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.swtbot.go;bundle-version="2.3.0",
@@ -15,3 +15,4 @@
  org.eclipse.emf.parsley.examples.mail.model;bundle-version="0.7.0",
  org.eclipse.emf.parsley.examples.mail.rcp;bundle-version="0.7.0",
  org.eclipse.swtbot.forms.finder;bundle-version="2.3.0"
+Automatic-Module-Name: org.eclipse.emf.parsley.tests.swtbot.examples
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
index eabec09..ba67056 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.examples</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml
index 52b5a7a..1e82906 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.parsley.tests.swtbot.feature"
       label="EMF Parsley SWTBOT Tests Feature"
-      version="1.2.1.qualifier">
+      version="1.3.0.qualifier">
 
    <description url="http://www.example.com/description">
       EMF Parsley SWTBOT Tests Feature
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.feature/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.feature/pom.xml
index 3d63707..e9bb214 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.feature/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.feature/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.feature</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF
index 65f6771..291b574 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley SWTBOT Tests
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.swtbot;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -31,3 +31,4 @@
 Export-Package: org.eclipse.emf.parsley.tests.swtbot,
  org.eclipse.emf.parsley.tests.swtbot.editors,
  org.eclipse.emf.parsley.tests.swtbot.views
+Automatic-Module-Name: org.eclipse.emf.parsley.tests.swtbot
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
index 012f8b9..8a6e866 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
index 69be417..4973e46 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
@@ -1085,6 +1085,12 @@
 		List<IMarker> errorMarkers = new LinkedList<IMarker>();
 		for (int i = 0; i < markers.length; i++) {
 			IMarker iMarker = markers[i];
+			// for the moment we ignore warnings for MANIFEST of the shape
+			// 'Automatic-Module-Name' header is required for Java 9 compatibility
+			if (iMarker.getAttribute(IMarker.SEVERITY).equals(IMarker.SEVERITY_WARNING) &&
+				iMarker.getAttribute(IMarker.MESSAGE).toString().contains("'Automatic-Module-Name'")) {
+				continue;
+			}
 			errorMarkers.add(iMarker);
 		}
 		assertEquals(
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySaveableViewTests.java b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySaveableViewTests.java
index a936000..2532ece 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySaveableViewTests.java
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySaveableViewTests.java
@@ -16,6 +16,7 @@
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -207,7 +208,7 @@
 	public void hasColumnsOnSaveableTreeWithColumnsView()
 			throws Exception {
 		SWTBotTree tree = prepareSaveableTreeWithColumnsView();
-		tree.expandNode("Library My Library");
+		expandTreeWithColumnsNode(tree);
 		assertEquals(tree.columns().size(), 6);
 	}
 
@@ -215,10 +216,19 @@
 	public void hasColumnsOnSaveableTreeWithSpecificColumnsView()
 			throws Exception {
 		SWTBotTree tree = prepareSaveableTreeWithSpecificColumnsView();
-		tree.expandNode("Library My Library");
+		expandTreeWithColumnsNode(tree);
 		assertEquals(tree.columns().size(), 3);
 	}
 
+	private void expandTreeWithColumnsNode(SWTBotTree tree) {
+		try {
+			tree.expandNode("Library My Library");
+		} catch (WidgetNotFoundException e) {
+			// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=530506
+			tree.expandNode("");
+		}
+	}
+
 	@Test
 	public void undoRedoDeleteActionUpdatesDirtyStateCorrectly() throws Exception {
 		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=479700
diff --git a/tests/org.eclipse.emf.parsley.tests.views/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.views/META-INF/MANIFEST.MF
index c009fb5..d72c868 100644
--- a/tests/org.eclipse.emf.parsley.tests.views/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.views/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.parsley.tests.views
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests.views; singleton:=true
 Bundle-Activator: org.eclipse.emf.parsley.tests.views.ViewsActivator
 Bundle-ActivationPolicy: lazy
@@ -17,3 +17,4 @@
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Automatic-Module-Name: org.eclipse.emf.parsley.tests.views
diff --git a/tests/org.eclipse.emf.parsley.tests.views/pom.xml b/tests/org.eclipse.emf.parsley.tests.views/pom.xml
index 09b321c..8ec6c47 100644
--- a/tests/org.eclipse.emf.parsley.tests.views/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.views/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests.views</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF
index 49b91cf..cf51e59 100644
--- a/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Parsley Tests
 Bundle-SymbolicName: org.eclipse.emf.parsley.tests;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.parsley.tests.EmfParsleyTestsActivator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -22,3 +22,4 @@
  org.junit.runners.model;version="4.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.parsley.tests
diff --git a/tests/org.eclipse.emf.parsley.tests/pom.xml b/tests/org.eclipse.emf.parsley.tests/pom.xml
index 4e23b91..1a38d03 100644
--- a/tests/org.eclipse.emf.parsley.tests/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
 		<groupId>org.eclipse.emf.parsley</groupId>
 		<artifactId>org.eclipse.emf.parsley.parent</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.parsley.tests</artifactId>