Merge branch 'newbuild'

Change-Id: Ieac59f3f505510f11482b70352b891b72461e6df

7 files changed, 461 insertions, 375 deletions

diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 8b1646af9..088c469c5 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -3,187 +3,64 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-
-	<prerequisites>
-		<maven>3.0</maven>
-	</prerequisites>
-
 	<groupId>org.eclipse.etrice</groupId>
-	<artifactId>java-generator</artifactId>
+	<artifactId>org.eclipse.etrice.parent</artifactId>
 	<version>1.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
-
-	<name>eTrice Java generator</name>
-
-	<description>code generator from ROOM (Real-Time Object Oriented Modeling)
-  models to the Java target language</description>
-	<url>http://eclipse.org/etrice</url>
-	<inceptionYear>2010</inceptionYear>
-
+	
 	<properties>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
-
-		<etrice.version>${project.version}</etrice.version>
-
-		<tycho.version>0.19.0</tycho.version>
-		<tycho-extras.version>${tycho.version}</tycho-extras.version>
-
-		<!-- eclipse version etrice is built against -->
-		<eclipse-repo.url>http://download.eclipse.org/releases/luna</eclipse-repo.url>
-
-		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</orbit-site>
+	
+		<xtext.version>2.12.0</xtext.version>
+		<tycho.version>1.0.0</tycho.version>
+		<cbi.version>1.1.4</cbi.version>
+		
+		<eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url>
+		<license.url>http://download.eclipse.org/cbi/updates/license</license.url>
+		<orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url>
+		<cbi.url>https://repo.eclipse.org/content/repositories/cbi-releases</cbi.url>
 	</properties>
-
-	<organization>
-		<name>Protos Software GmbH</name>
-		<url>http://www.protos.de</url>
-	</organization>
-
-	<licenses>
-		<license>
-			<name>Eclipse Public License - v 1.0</name>
-			<url>http://www.eclipse.org/legal/epl-v10.html</url>
-		</license>
-	</licenses>
-
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=eTrice</url>
-	</issueManagement>
 	
-	<ciManagement>
-		<system>Hudson</system>
-		<url>https://hudson.eclipse.org/etrice/job/etrice-maven3/</url>
-	</ciManagement>
-
-	<scm>
-		<url>http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/</url>
-		<connection>http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</connection>
-		<developerConnection>ssh://userid@git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</developerConnection>
-	</scm>
-
-	<developers>
-		<developer>
-			<name>Thomas Schuetz</name>
-		</developer>
-		<developer>
-			<name>Henrik Rentz-Reichert</name>
-		</developer>
-		<developer>
-			<name>Thomas Jung</name>
-		</developer>
-		<developer>
-			<name>Juergen Haug</name>
-		</developer>
-		<developer>
-			<name>Eyrak Paen</name>
-		</developer>
-		<developer>
-			<name>Peter Karlitschek</name>
-		</developer>
-	</developers>
-
 	<repositories>
 		<repository>
 			<id>eclipse</id>
+			<url>${eclipse.url}</url>
 			<layout>p2</layout>
-			<url>${eclipse-repo.url}</url>
 		</repository>
 		<repository>
-			<id>orbit</id>
+			<id>license</id>
+			<url>${license.url}</url>
 			<layout>p2</layout>
-			<url>${orbit-site}</url>
 		</repository>
 		<repository>
-			<id>repository.jboss.org-public</id>
-			<name>JBoss.org Maven repository</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public</url>
+			<id>orbit</id>
+			<url>${orbit.url}</url>
+			<layout>p2</layout>
 		</repository>
 	</repositories>
-
+	
 	<pluginRepositories>
 		<pluginRepository>
-			<id>repo.eclipse.org.cbi-releases</id>
-			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+			<id>cbi</id>
+			<url>${cbi.url}</url>
 		</pluginRepository>
 	</pluginRepositories>
-
-	<modules>
-		<module>../../plugins/org.eclipse.etrice.core.common</module>
-		<module>../../plugins/org.eclipse.etrice.core.fsm</module>
-		<module>../../plugins/org.eclipse.etrice.core.room</module>
-		<module>../../plugins/org.eclipse.etrice.core.config</module>
-		<module>../../plugins/org.eclipse.etrice.core.etphys</module>
-		<module>../../plugins/org.eclipse.etrice.core.etmap</module>
-		<module>../../plugins/org.eclipse.etrice.core.genmodel.fsm</module>
-		<module>../../plugins/org.eclipse.etrice.core.genmodel</module>
-		<module>../../plugins/org.eclipse.etrice.generator.fsm</module>
-		<module>../../plugins/org.eclipse.etrice.generator</module>
-		<module>../../plugins/org.eclipse.etrice.generator.config</module>
-		<module>../../plugins/org.eclipse.etrice.generator.doc</module>
-		<module>../../plugins/org.eclipse.etrice.generator.java</module>
-		<module>../../plugins/org.eclipse.etrice.generator.java.mvn</module>
-		<module>../../runtime/org.eclipse.etrice.modellib.java</module>
-		<module>../../runtime/org.eclipse.etrice.runtime.java</module>
-	</modules>
-
+	
 	<profiles>
 		<profile>
-			<id>fast</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>
-		<profile>
-			<id>full</id>
+			<id>sign</id>
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<version>2.2.1</version>
-						<executions>
-							<execution>
-								<id>attach-sources</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.9.1</version>
-						<configuration>
-							<tags>
-								<tag>
-									<name>generated</name>
-									<placement>a</placement>
-									<head>Generated:</head>
-								</tag>
-								<tag>
-									<name>ordered</name>
-									<placement>X</placement>
-									<head>Ordered:</head>
-								</tag>
-								<tag>
-									<name>model</name>
-									<placement>X</placement>
-									<head>Model:</head>
-								</tag>
-								<tag>
-									<name>parameter</name>
-									<placement>X</placement>
-									<head>Parameter:</head>
-								</tag>
-							</tags>
-						</configuration>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+						<version>${cbi.version}</version>
 						<executions>
 							<execution>
-								<id>attach-javadocs</id>
+								<id>sign</id>
+								<phase>verify</phase>
 								<goals>
-									<goal>jar</goal>
+									<goal>sign</goal>
 								</goals>
 							</execution>
 						</executions>
@@ -192,7 +69,7 @@
 			</build>
 		</profile>
 	</profiles>
-
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -201,148 +78,60 @@
 				<version>${tycho.version}</version>
 				<extensions>true</extensions>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+				<version>${xtext.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>xtend-install-debug-info</goal>
+						</goals>
+						<configuration>
+							<xtendAsPrimaryDebugSource>true</xtendAsPrimaryDebugSource>
+							<writeTraceFiles>true</writeTraceFiles>
+						</configuration>
+					</execution>
+				</executions>
+				<configuration>
+					<outputDirectory>xtend-gen</outputDirectory>
+				</configuration>
+			</plugin>
+			<!-- plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin -->
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>target-platform-configuration</artifactId>
-					<version>${tycho.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-compiler-plugin</artifactId>
-					<version>${tycho.version}</version>
-					<configuration>
-						<excludeResources>
-							<!-- avoid error markers in the target folder by excluding ecore models -->
-							<excludeResource>**/*.ecore</excludeResource>
-						</excludeResources>
-						<compilerArguments>
-							<enableJavadoc />
-							<encoding>ISO-8859-1</encoding>
-						</compilerArguments>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-packaging-plugin</artifactId>
-					<version>${tycho.version}</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.eclipse.tycho.extras</groupId>
-							<artifactId>tycho-buildtimestamp-jgit</artifactId>
-							<version>${tycho-extras.version}</version>
-						</dependency>
-					</dependencies>
-					<configuration>
-						<strictBinIncludes>false</strictBinIncludes>
-						<format>'v'yyyyMMdd-HHmm</format>
-						<timestampProvider>jgit</timestampProvider>
-						<jgit.ignore>
-						</jgit.ignore>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-p2-director-plugin</artifactId>
-					<version>${tycho.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-p2-repository-plugin</artifactId>
-					<version>${tycho.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-p2-plugin</artifactId>
-					<version>${tycho.version}</version>
-					<configuration>
-						<baselineMode>warn</baselineMode>
-						<baselineReplace>none</baselineReplace>
-						<baselineRepositories>
-							<repository>
-								<url>http://download.eclipse.org/eclipse/updates/4.2</url>
-							</repository>
-						</baselineRepositories>
-					</configuration>
-				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.eclipse.tycho
-										</groupId>
-										<artifactId>
-											tycho-packaging-plugin
-										</artifactId>
-										<versionRange>
-											[0.19.0,)
-										</versionRange>
-										<goals>
-											<goal>validate-id</goal>
-											<goal>validate-version</goal>
-											<goal>build-qualifier</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.eclipse.tycho
-										</groupId>
-										<artifactId>
-											tycho-compiler-plugin
-										</artifactId>
-										<versionRange>
-											[0.19.0,)
-										</versionRange>
-										<goals>
-											<goal>compile</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
-	<distributionManagement>
-		<repository>
-			<id>repo.eclipse.org</id>
-			<name>eTrice Repository - Releases</name>
-			<url>https://repo.eclipse.org/content/repositories/etrice-releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>repo.eclipse.org</id>
-			<name>eTrice Repository - Snapshots</name>
-			<url>https://repo.eclipse.org/content/repositories/etrice-snapshots/</url>
-			<uniqueVersion>true</uniqueVersion>
-		</snapshotRepository>
-	</distributionManagement>
+	</build>	
 </project>
diff --git a/releng/org.eclipse.etrice.parent/pom_old.xml b/releng/org.eclipse.etrice.parent/pom_old.xml
new file mode 100644
index 000000000..1eb825362
--- /dev/null
+++ b/releng/org.eclipse.etrice.parent/pom_old.xml
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.etrice</groupId>
+	<artifactId>java-generator</artifactId>
+	<version>1.1.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<name>eTrice Java generator</name>
+
+	<description>code generator from ROOM (Real-Time Object Oriented Modeling)
+  models to the Java target language</description>
+	<url>http://eclipse.org/etrice</url>
+	<inceptionYear>2010</inceptionYear>
+
+	<properties>
+		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
+
+		<etrice.version>${project.version}</etrice.version>
+
+		<tycho.version>0.19.0</tycho.version>
+		<tycho-extras.version>${tycho.version}</tycho-extras.version>
+
+		<!-- eclipse version etrice is built against -->
+		<eclipse-repo.url>http://download.eclipse.org/releases/luna</eclipse-repo.url>
+
+		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</orbit-site>
+	</properties>
+
+	<organization>
+		<name>Protos Software GmbH</name>
+		<url>http://www.protos.de</url>
+	</organization>
+
+	<licenses>
+		<license>
+			<name>Eclipse Public License - v 1.0</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
+		</license>
+	</licenses>
+
+	<issueManagement>
+		<system>Bugzilla</system>
+		<url>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=eTrice</url>
+	</issueManagement>
+	
+	<ciManagement>
+		<system>Hudson</system>
+		<url>https://hudson.eclipse.org/etrice/job/etrice-maven3/</url>
+	</ciManagement>
+
+	<scm>
+		<url>http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/</url>
+		<connection>http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</connection>
+		<developerConnection>ssh://userid@git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</developerConnection>
+	</scm>
+
+	<developers>
+		<developer>
+			<name>Thomas Schuetz</name>
+		</developer>
+		<developer>
+			<name>Henrik Rentz-Reichert</name>
+		</developer>
+		<developer>
+			<name>Thomas Jung</name>
+		</developer>
+		<developer>
+			<name>Juergen Haug</name>
+		</developer>
+		<developer>
+			<name>Eyrak Paen</name>
+		</developer>
+		<developer>
+			<name>Peter Karlitschek</name>
+		</developer>
+	</developers>
+
+	<repositories>
+		<repository>
+			<id>eclipse</id>
+			<layout>p2</layout>
+			<url>${eclipse-repo.url}</url>
+		</repository>
+		<repository>
+			<id>orbit</id>
+			<layout>p2</layout>
+			<url>${orbit-site}</url>
+		</repository>
+		<repository>
+			<id>repository.jboss.org-public</id>
+			<name>JBoss.org Maven repository</name>
+			<url>https://repository.jboss.org/nexus/content/groups/public</url>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>repo.eclipse.org.cbi-releases</id>
+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<modules>
+		<module>../../plugins/org.eclipse.etrice.core.common</module>
+		<module>../../plugins/org.eclipse.etrice.core.fsm</module>
+		<module>../../plugins/org.eclipse.etrice.core.room</module>
+		<module>../../plugins/org.eclipse.etrice.core.config</module>
+		<module>../../plugins/org.eclipse.etrice.core.etphys</module>
+		<module>../../plugins/org.eclipse.etrice.core.etmap</module>
+		<module>../../plugins/org.eclipse.etrice.core.genmodel.fsm</module>
+		<module>../../plugins/org.eclipse.etrice.core.genmodel</module>
+		<module>../../plugins/org.eclipse.etrice.generator.fsm</module>
+		<module>../../plugins/org.eclipse.etrice.generator</module>
+		<module>../../plugins/org.eclipse.etrice.generator.config</module>
+		<module>../../plugins/org.eclipse.etrice.generator.doc</module>
+		<module>../../plugins/org.eclipse.etrice.generator.java</module>
+		<module>../../plugins/org.eclipse.etrice.generator.java.mvn</module>
+		<module>../../runtime/org.eclipse.etrice.modellib.java</module>
+		<module>../../runtime/org.eclipse.etrice.runtime.java</module>
+	</modules>
+
+	<profiles>
+		<profile>
+			<id>fast</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<id>full</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>2.2.1</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.9.1</version>
+						<configuration>
+							<tags>
+								<tag>
+									<name>generated</name>
+									<placement>a</placement>
+									<head>Generated:</head>
+								</tag>
+								<tag>
+									<name>ordered</name>
+									<placement>X</placement>
+									<head>Ordered:</head>
+								</tag>
+								<tag>
+									<name>model</name>
+									<placement>X</placement>
+									<head>Model:</head>
+								</tag>
+								<tag>
+									<name>parameter</name>
+									<placement>X</placement>
+									<head>Parameter:</head>
+								</tag>
+							</tags>
+						</configuration>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.1</version>
+					<configuration>
+						<source>1.6</source>
+						<target>1.6</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>target-platform-configuration</artifactId>
+					<version>${tycho.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho.version}</version>
+					<configuration>
+						<excludeResources>
+							<!-- avoid error markers in the target folder by excluding ecore models -->
+							<excludeResource>**/*.ecore</excludeResource>
+						</excludeResources>
+						<compilerArguments>
+							<enableJavadoc />
+							<encoding>ISO-8859-1</encoding>
+						</compilerArguments>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-packaging-plugin</artifactId>
+					<version>${tycho.version}</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.tycho.extras</groupId>
+							<artifactId>tycho-buildtimestamp-jgit</artifactId>
+							<version>${tycho-extras.version}</version>
+						</dependency>
+					</dependencies>
+					<configuration>
+						<strictBinIncludes>false</strictBinIncludes>
+						<format>'v'yyyyMMdd-HHmm</format>
+						<timestampProvider>jgit</timestampProvider>
+						<jgit.ignore>
+						</jgit.ignore>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-director-plugin</artifactId>
+					<version>${tycho.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-repository-plugin</artifactId>
+					<version>${tycho.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-plugin</artifactId>
+					<version>${tycho.version}</version>
+					<configuration>
+						<baselineMode>warn</baselineMode>
+						<baselineReplace>none</baselineReplace>
+						<baselineRepositories>
+							<repository>
+								<url>http://download.eclipse.org/eclipse/updates/4.2</url>
+							</repository>
+						</baselineRepositories>
+					</configuration>
+				</plugin>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-packaging-plugin
+										</artifactId>
+										<versionRange>
+											[0.19.0,)
+										</versionRange>
+										<goals>
+											<goal>validate-id</goal>
+											<goal>validate-version</goal>
+											<goal>build-qualifier</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-compiler-plugin
+										</artifactId>
+										<versionRange>
+											[0.19.0,)
+										</versionRange>
+										<goals>
+											<goal>compile</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<distributionManagement>
+		<repository>
+			<id>repo.eclipse.org</id>
+			<name>eTrice Repository - Releases</name>
+			<url>https://repo.eclipse.org/content/repositories/etrice-releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>repo.eclipse.org</id>
+			<name>eTrice Repository - Snapshots</name>
+			<url>https://repo.eclipse.org/content/repositories/etrice-snapshots/</url>
+			<uniqueVersion>true</uniqueVersion>
+		</snapshotRepository>
+	</distributionManagement>
+</project>
diff --git a/releng/org.eclipse.etrice.releng/promote_newbuild.sh b/releng/org.eclipse.etrice.releng/promote_newbuild.sh
new file mode 100644
index 000000000..3f68957e2
--- /dev/null
+++ b/releng/org.eclipse.etrice.releng/promote_newbuild.sh
@@ -0,0 +1,17 @@
+echo 'promoting to download area...'
+downloadDir=/home/data/httpd/download.eclipse.org/etrice
+
+echo 'deleting directories'
+rm -Rf $downloadDir/updates/nightly/*
+rm -Rf $downloadDir/archives/nightly/zips/*
+rm -Rf $downloadDir/archives/nightly/generators/*
+
+echo 'copy update site'
+cp -R ${WORKSPACE}/releng/org.eclipse.etrice.site/target/repository/* $downloadDir/updates/nightly/
+
+echo 'copy zips'
+cp ${WORKSPACE}/releng/org.eclipse.etrice.site/target/org.eclipse.etrice.site*.zip $downloadDir/archives/nightly/zips
+cp ${WORKSPACE}/plugins/org.eclipse.etrice.generator.c/build/distributions/org.eclipse.etrice.generator.c*.zip $downloadDire/archives/nightly/generators/eTrice-C-generator.zip
+cp ${WORKSPACE}/plugins/org.eclipse.etrice.generator.cpp/build/distributions/org.eclipse.etrice.generator.cpp*.zip $downloadDir/archives/nightly/generators/eTrice-CPP-generator.zip
+cp ${WORKSPACE}/plugins/org.eclipse.etrice.generator.java/build/distributions/org.eclipse.etrice.generator.java*.zip $downloadDir/archives/nightly/generators/eTrice-Java-generator.zip
+echo 'done'
diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml
index 54ec264e2..134e911aa 100644
--- a/releng/org.eclipse.etrice.site/category.xml
+++ b/releng/org.eclipse.etrice.site/category.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.eclipse.etrice.core" version="0.0.0">
+   <feature id="org.eclipse.etrice.feature" version="1.1.1.qualifier">
       <category name="org.eclipse.etrice"/>
    </feature>
-   <feature id="org.eclipse.etrice.examples" version="0.0.0">
-      <category name="org.eclipse.etrice"/>
-   </feature>
-   <feature id="org.eclipse.etrice.tests" version="0.0.0">
+   <feature id="org.eclipse.etrice.cdt-integration.feature" version="1.1.1.qualifier">
       <category name="org.eclipse.etrice"/>
    </feature>
    <category-def name="org.eclipse.etrice" label="eTrice">
diff --git a/releng/org.eclipse.etrice.site/feature.properties b/releng/org.eclipse.etrice.site/feature.properties
deleted file mode 100644
index fcf39670f..000000000
--- a/releng/org.eclipse.etrice.site/feature.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2010 - 2011 Protos Software GmbH.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-providerName = Eclipse eTrice
-featureName = eTrice Site
-description = eTrice modeling tools for event driven real-time systems based on the modeling language ROOM
-
-# Label for the update site (on download1.eclipse.org)
-updateSiteName=Eclipse Modeling Project Updates
-
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
deleted file mode 100644
index 1d2897daf..000000000
--- a/releng/org.eclipse.etrice.site/feature.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2010 - 2011 Protos Software GmbH.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-
-	Contributors:
-	  Thomas Schuetz and Henrik Rentz-Reichert - initial API and implementation
--->
-<feature
-      id="org.eclipse.etrice.site"
-      label="eTrice 1.1.1 Update Site"
-      version="1.1.1.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      (c) 2010 - 2011 Protos Software GmbH.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <url>
-      <update url="http://www.eclipse.org/downloads/download.php?file=/etrice/updates/0.4.0"/>
-      <discovery label="KIELER provided by eTrice" url="http://download.eclipse.org/etrice/KIELER/kieler-0.7.1"/>
-   </url>
-
-   <includes
-         id="org.eclipse.etrice.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.etrice.cdt-integration.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
new file mode 100644
index 000000000..078dc6cb5
--- /dev/null
+++ b/releng/org.eclipse.etrice.site/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.etrice</groupId>
+		<artifactId>org.eclipse.etrice.parent</artifactId>
+		<version>1.1.1-SNAPSHOT</version>
+		<relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
+	</parent>
+	<groupId>org.eclipse.etrice</groupId>
+	<artifactId>org.eclipse.etrice.site</artifactId>
+	<packaging>eclipse-repository</packaging>
+</project>