Merge branch 'v1_3_0_BRANCH'

Conflicts:
	plugins/org.eclipse.emf.eef.mapping/model/mapping.ecore
	plugins/org.eclipse.emf.eef.modelingbot.edit/pom.xml
	plugins/org.eclipse.emf.eef.modelingbot.editor/pom.xml
	plugins/org.eclipse.emf.eef.modelingbot/META-INF/MANIFEST.MF
	plugins/org.eclipse.emf.eef.runtime.tests/META-INF/MANIFEST.MF
	plugins/org.eclipse.emf.eef.views/model/views.ecore
	plugins/org.eclipse.emf.modelingbot.xtext.ui/pom.xml
	plugins/org.eclipse.emf.modelingbot.xtext/pom.xml
	releng/org.eclipse.emf.eef.releng.parent/pom.xml
	releng/org.eclipse.emf.eef.update/category.xml
	releng/org.eclipse.emf.eef.update/pom.xml
	tests/org.eclipse.emf.eef.tests.nonreg.edit/pom.xml
	tests/org.eclipse.emf.eef.tests.nonreg.editor/pom.xml
	tests/org.eclipse.emf.eef.tests.nonreg.junit/pom.xml
	tests/org.eclipse.emf.eef.tests.nonreg/pom.xml
	tests/org.eclipse.emf.examples.eef.edit/pom.xml
	tests/org.eclipse.emf.examples.eef.editor/pom.xml
	tests/org.eclipse.emf.examples.eef.tests.junit/Conf AllTests.launch
	tests/org.eclipse.emf.examples.eef.tests.junit/pom.xml
	tests/org.eclipse.emf.examples.eef/pom.xml

1 files changed, 228 insertions, 48 deletions

diff --git a/releng/org.eclipse.emf.eef.releng.parent/pom.xml b/releng/org.eclipse.emf.eef.releng.parent/pom.xml
index f5e856bcf..786f9c789 100644
--- a/releng/org.eclipse.emf.eef.releng.parent/pom.xml
+++ b/releng/org.eclipse.emf.eef.releng.parent/pom.xml
@@ -13,7 +13,7 @@
 	</prerequisites>
 	<groupId>org.eclipse.emf</groupId>
 	<artifactId>org.eclipse.emf.eef.releng.parent</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>EEF Parent</name>
@@ -37,54 +37,234 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-	<repositories>
-		<repository>
-			<id>releasetrain</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/eclipse/updates/3.8</url>
-		</repository>
-		<repository>
-			<id>emf</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.8milestones</url>
-		</repository>
-		<repository>
-			<id>emf-tools</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/emf/updates/milestones</url>
-		</repository>
-		<repository>
-			<id>ocl</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.0.0</url>
-		</repository>
-		<repository>
-			<id>acceleo</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/m2t/acceleo/updates/milestones/3.3</url>
-		</repository>
-		<repository>
-			<id>orbit</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository</url>
-		</repository>
-		<repository>
-			<id>epf</id>
-			<layout>p2</layout>
-			<url>http://build.eclipse.org/modeling/emf/eef/epf/</url>
-		</repository>
-		<repository>
-			<id>cdo</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.0/</url>
-		</repository>
-		<repository>
-			<id>kepler</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/kepler</url>
-		</repository>
-	</repositories>
+	<profiles>
+		<profile>
+			<id>juno4.2</id>
+			<repositories>
+				<repository>
+					<id>releasetrain</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/eclipse/updates/4.2</url>
+				</repository>
+				<repository>
+					<id>swtbot</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
+				</repository>
+				<repository>
+					<id>emf</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/emf/updates/2.8</url>
+				</repository>
+				<repository>
+					<id>emf-tools</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/updates/milestones</url>
+				</repository>
+				<repository>
+					<id>ocl</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.0.0</url>
+				</repository>
+				<repository>
+					<id>acceleo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/m2t/acceleo/updates/milestones/3.3</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/</url>
+				</repository>
+				<repository>
+					<id>epf</id>
+					<layout>p2</layout>
+					<url>http://build.eclipse.org/modeling/emf/eef/epf/</url>
+				</repository>
+				<repository>
+					<id>cdo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.0/</url>
+				</repository>
+			</repositories>
+		</profile>
+		<profile>
+			<id>juno3.8</id>
+			<repositories>
+				<repository>
+					<id>releasetrain</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/eclipse/updates/3.8</url>
+				</repository>
+				<repository>
+					<id>swtbot</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
+				</repository>
+				<repository>
+					<id>emf</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/emf/updates/2.8</url>
+				</repository>
+				<repository>
+					<id>emf-tools</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/updates/milestones</url>
+				</repository>
+				<repository>
+					<id>ocl</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.0.0</url>
+				</repository>
+				<repository>
+					<id>acceleo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/m2t/acceleo/updates/milestones/3.3</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository</url>
+				</repository>
+				<repository>
+					<id>epf</id>
+					<layout>p2</layout>
+					<url>http://build.eclipse.org/modeling/emf/eef/epf/</url>
+				</repository>
+				<repository>
+					<id>cdo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.0/</url>
+				</repository>
+			</repositories>
+		</profile>
+		<profile>
+			<id>sign</id>
+			<activation>
+				<property>
+					<name>BUILD_SIGN</name>
+					<value>true</value>
+				</property>
+			</activation>
+	      <build>
+	        <plugins>
+         <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200a-plugin</artifactId>
+            <version>0.18.1</version>
+            <executions>
+              <execution>
+                <id>pack200-normalize</id>
+                <goals>
+                  <goal>normalize</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-jarsigner-plugin</artifactId>
+            <version>1.0.4</version>
+            <executions>
+              <execution>
+                <id>sign</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-pack200b-plugin</artifactId>
+            <version>0.18.1</version>
+            <executions>
+              <execution>
+                <id>pack200-pack</id>
+                <goals>
+                  <goal>pack</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
+          </plugins>
+	      </build>
+					
+		  <pluginRepositories>
+		    <pluginRepository>
+		      <id>cbi</id>
+		      <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+		      <releases>
+		        <enabled>true</enabled>
+		      </releases>
+		      <snapshots>
+		        <enabled>false</enabled>
+		      </snapshots>
+		    </pluginRepository>
+		  </pluginRepositories>
+		
+		</profile>
+	</profiles>
 
+	<modules>
+		<module>../../plugins/org.eclipse.emf.eef.runtime</module>
+		<module>../../plugins/org.eclipse.emf.eef.runtime.extended</module>
+		<module>../../plugins/org.eclipse.emf.eef.runtime.tests</module>
+		<module>../../plugins/org.eclipse.emf.eef.cdo.runtime</module>
+
+		<module>../../doc/org.eclipse.emf.eef.doc</module>
+
+		<module>../../plugins/org.eclipse.emf.eef.components</module>
+		<module>../../plugins/org.eclipse.emf.eef.components.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.components.editor</module>
+		<module>../../plugins/org.eclipse.emf.eef.eefgen</module>
+		<module>../../plugins/org.eclipse.emf.eef.eefgen.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.eefgen.editor</module>
+		<module>../../plugins/org.eclipse.emf.eef.mapping</module>
+		<module>../../plugins/org.eclipse.emf.eef.mapping.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.views</module>
+		<module>../../plugins/org.eclipse.emf.eef.views.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.views.editor</module>
+		<module>../../plugins/org.eclipse.emf.eef.editor.model</module>
+		<module>../../plugins/org.eclipse.emf.eef.extended.widgets.richtext</module>
+
+		<module>../../plugins/org.eclipse.emf.eef.modelingbot</module>
+		<module>../../plugins/org.eclipse.emf.eef.modelingbot.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.modelingbot.editor</module>
+
+		<module>../../plugins/org.eclipse.emf.eef.codegen</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.launcher</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.ecore</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.extended</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext</module>
+		<!-- <module>../../plugins/org.eclipse.emf.eef.tests.codegen</module> -->
+
+		<module>../../plugins/org.eclipse.emf.eef.branding</module>
+		<module>../../features/org.eclipse.emf.eef.runtime-feature</module>
+		<module>../../features/org.eclipse.emf.eef.collab.runtime-feature</module>
+		<module>../../features/org.eclipse.emf.eef.extended-feature</module>
+		<module>../../features/org.eclipse.emf.eef.edt-feature</module>
+		<module>../../features/org.eclipse.emf.eef.codegen.ecore-feature</module>
+		<module>../../features/org.eclipse.emf.eef.codegen.richtext-feature</module>
+		<module>../../features/org.eclipse.emf.eef.richtext-feature</module>
+		<module>../../features/org.eclipse.emf.eef.sdk-feature</module>
+		<!-- deprecated <module>../../features/org.eclipse.emf.eef.indigo-feature</module> -->
+
+		<module>../org.eclipse.emf.eef.update</module>
+
+		<module>../../tests/org.eclipse.emf.examples.eef</module>
+		<module>../../tests/org.eclipse.emf.examples.eef.edit</module>
+		<module>../../tests/org.eclipse.emf.examples.eef.editor</module>
+		<module>../../tests/org.eclipse.emf.examples.eef.tests.junit</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg.edit</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg.editor</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg.junit</module>
+
+	</modules>
 	<build>
 		<plugins>
 			<plugin>