Bug 476200: [releng] refactoring of parent pom

Change-Id: Ib7e26b7cce68e35d2f6d633d8a72a2ab1ff97179
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=476200
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>

1 files changed, 213 insertions, 356 deletions

diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 028458e9b89..c4474bd635a 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -1,221 +1,83 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<modules>
-		<module>org.eclipse.papyrus.rcp</module>
-		<module>org.eclipse.papyrus.rcp.feature</module>
-		<module>org.eclipse.papyrus.rcp.product</module>
-	</modules>
-	<properties>
-		<tycho-version>0.23.1</tycho-version>
-		<tychoExtrasVersion>0.23.1</tychoExtrasVersion>
-		<jarSignerVersion>1.1.2</jarSignerVersion>
-		<findbugs.version>2.5.3</findbugs.version>
-		<xtext.version>2.7.3</xtext.version>
-		<java.source.version>1.7</java.source.version>
-		<java.target.version>1.7</java.target.version>
-		<papyrus.eclipse.target>neon</papyrus.eclipse.target>
-		<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
-		<skipAllTests>false</skipAllTests>
-		<skipInnerTests>true</skipInnerTests>
-		<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>
-		<maven.resources.version>2.6</maven.resources.version>
-		<!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->
-	    <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
-	    <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) -->
-	    <eclipse.simultaneous.release.name>Neon Milestone 1 (4.6.0M1)</eclipse.simultaneous.release.name>
-	</properties>
-	<repositories>
-
-		<!-- From Main Papyrus -->
-		<repository>
-			<id>emf-emf</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF (Core)",0) -->
-			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[0]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",0) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/R201508030321/mwe</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[1]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",1) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/R201508030411/mwe2lang/</url>
-		</repository>
-		<repository>
-			<id>emf-transaction</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF TRANSACTION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201506010221</url>
-		</repository>
-		<repository>
-			<id>emf-validation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF VALIDATION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/validation/updates/releases/R201505312255</url>
-		</repository>
-		<repository>
-			<id>ep</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Eclipse",0) -->
-			<url>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M1-201508052000/</url>
-		</repository>
-		<repository>
-			<id>gef</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GEF",0) -->
-			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-notation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Notation",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201505312221</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-runtime</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Runtime",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201506060219</url>
-		</repository>
-		<repository>
-			<id>gmf-tooling</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Tooling",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500</url>
-		</repository>
-		<repository>
-			<id>m2t-xpand</id>
-			<layout>p2</layout>
-			<!-- updateFrom("M2T XPAND",0) -->
-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201508180411/</url>
-		</repository>
-		<repository>
-			<id>mdt-ocl</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT OCL 6.0",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201508171259</url>
-		</repository>
-		<repository>
-			<id>mdt-uml2</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT UML2",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1</url>
-		</repository>
-		<repository>
-			<id>mmt-qvto</id>
-			<layout>p2</layout>
-			<!-- updateFrom("QVT Operational",0) -->
-			<url>http://download.eclipse.org/mmt/qvto/updates/releases/3.5.0</url>
-		</repository>
-		<repository>
-			<id>nattable</id>
-			<layout>p2</layout>
-			<!-- manualUpdate -->
-			<url>http://download.eclipse.org/nattable/releases/1.2.0/repository/</url>
-		</repository>
-		<!-- Bug 468668: Reinstate and update this when the TableCombo has a new release for Mars or later.
-        <repository>
-            <id>nebula-tablecombo</id>
-            <layout>p2</layout>
-            <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>
-        </repository>
-        -->
-		<repository>
-			<id>orbit</id>
-			<layout>p2</layout>
-			<!-- manualUpdate -->
-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository</url>
-		</repository>
-		<repository>
-			<id>tmf-xtext</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Xtext, Xtend",0) -->
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
-		</repository>
-		<repository>
-			<id>webtools</id>
-			<layout>p2</layout>
-			<!-- updateFrom("WebTools",0) -->
-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M1-20150818010140/repository/</url>
-		</repository>
-		<repository>
-			<id>XWT</id>
-			<layout>p2</layout>
-			<!-- updateFrom("XWT",0) -->
-			<url>http://download.eclipse.org/xwt/release-1.1.0</url>
-		</repository>
-		<repository>
-			<id>subversive</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Subversive",0) -->
-			<url>http://download.eclipse.org/technology/subversive/3.0/neon-site/</url>
-		</repository>	
-
-
-		<!-- Modeling features -->
-		<repository>
-			<id>mylyn-mars</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Mylyn Mars",0) -->
-			<url>http://download.eclipse.org/mylyn/snapshots/3.17</url>
-		</repository>
-		<repository>
-			<id>emf-query</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF Query",0) -->
-			<url>http://download.eclipse.org/modeling/emf/query/updates/releases/R201505312221</url>
-		</repository>
-		<repository>
-			<id>emf-compare</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF Compare",0) -->
-			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201508181443</url>
-		</repository>
-		<repository>
-			<id>emf-cdo</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF CDO",0) -->
-			<url>http://download.eclipse.org/modeling/emf/cdo/drops/S20150819-1258</url>
-		</repository>
-		<repository>
-			<id>egit</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EGIT",0) -->
-			<url>http://download.eclipse.org/egit/updates-4.0.1</url>
-		</repository>
-		<repository>
-			<id>eef</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EEF",0) -->
-			<url>http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201505291308/</url>
-		</repository>
-		<repository>
-			<id>acceleo</id>
-			<layout>p2</layout>
-			<!-- updateFrom("acceleo",0) -->
-			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201508181441</url>
-		</repository>
-		<repository>
-			<id>epp-log</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EPP Log",0) -->
-			<url>http://download.eclipse.org/technology/epp/logging/milestones/</url>
-		</repository>
-		<repository>
-			<id>oomph</id>
-			<layout>p2</layout>
-			<!-- updateFrom("oomph",0) -->
-			<url>http://download.eclipse.org/oomph/drops/milestone/S20150819-113829-1.2.0-M1</url>
-		</repository>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.all.releng</artifactId>

+	    <version>1.2.0-SNAPSHOT</version>

+	    <relativePath>../pom.xml</relativePath>

+    </parent>

+	<groupId>org.eclipse.papyrus</groupId>

+	<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>

+	<version>1.2.0-SNAPSHOT</version>

+	<packaging>pom</packaging>

+	<modules>

+		<module>org.eclipse.papyrus.rcp</module>

+		<module>org.eclipse.papyrus.rcp.feature</module>

+		<module>org.eclipse.papyrus.rcp.product</module>

+	</modules>

+	<properties>

+		<!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->

+	    <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>

+	    <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) -->

+	    <eclipse.simultaneous.release.name>Neon Milestone 1 (4.6.0M1)</eclipse.simultaneous.release.name>

+	</properties>

+	<repositories>

+		<!-- Modeling features -->

+		<repository>

+			<id>mylyn</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Mylyn",0) -->

+			<url>http://download.eclipse.org/mylyn/snapshots/3.17</url>

+		</repository>

+		<repository>

+			<id>emf-query</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF Query",0) -->

+			<url>http://download.eclipse.org/modeling/emf/query/updates/releases/R201505312221</url>

+		</repository>

+		<repository>

+			<id>emf-compare</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF Compare",0) -->

+			<url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201508181443</url>

+		</repository>

+		<repository>

+			<id>emf-cdo</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF CDO",0) -->

+			<url>http://download.eclipse.org/modeling/emf/cdo/drops/S20150819-1258</url>

+		</repository>

+		<repository>

+			<id>egit</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EGIT",0) -->

+			<url>http://download.eclipse.org/egit/updates-4.0.1</url>

+		</repository>

+		<repository>

+			<id>emft-eef</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Extended Editing Framework (EEF)",0) -->

+			<url>http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201505291308/</url>

+		</repository>

+		<repository>

+			<id>M2T ACCELEO</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T ACCELEO",0) -->

+			<url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201508181441</url>

+		</repository>

+		<repository>

+			<id>EPP Logging</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EPP Logging",0) -->

+			<url>http://download.eclipse.org/technology/epp/logging/milestones/</url>

+		</repository>

+		<repository>

+			<id>oomph</id>

+			<layout>p2</layout>

+			<!-- updateFrom("oomph",0) -->

+			<url>http://download.eclipse.org/oomph/drops/milestone/S20150819-113829-1.2.0-M1</url>

+		</repository>

 		<!--<repository>
 			<id>ecp</id>
 			<layout>p2</layout>
@@ -225,141 +87,136 @@
 			<id>emfstore</id>
 			<layout>p2</layout>
 			<url>http://download.eclipse.org/emfstore/rt/150</url>
-		</repository>  -->	
-
-		<!-- Papyrus repository -->
-		<repository>
-			<id>papyrus-main</id>
-			<layout>p2</layout>
-			<url>${papyrus.repo.main}</url>
-		</repository>
-	</repositories>
-	<build>
-		<plugins>
-			<plugin>
-				<!-- enable tycho build extension -->
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<extensions>true</extensions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-versions-plugin</artifactId>
-				<version>${tycho-version}</version>
-			</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_64</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
-				</configuration>
-			</plugin>
-			<!-- enable source bundle generation -->
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>update-branding-plugins-about.mappings</id>
-			<activation>
-				<file>
-					<exists>${basedir}/about.mappings</exists>
-				</file>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId>
-						<version>${maven.resources.version}</version>
-						<executions>
-							<execution>
-								<id>process-about.mappings</id>
-								<phase>prepare-package</phase>
-								<configuration>
-									<outputDirectory>${project.build.directory}</outputDirectory>
-									<overwrite>true</overwrite>
-									<resources>
-										<resource>
-											<directory>${basedir}</directory>
-											<includes>
-												<include>about.mappings</include>
-											</includes>
-											<filtering>true</filtering>
-										</resource>
-									</resources>
-								</configuration>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-packaging-plugin</artifactId>
-						<version>${tycho-version}</version>
-						<configuration>
-							<additionalFileSets>
-								<fileSet>
-									<directory>${project.build.directory}</directory>
-									<includes>
-										<include>about.mappings</include>
-									</includes>
-								</fileSet>
-							</additionalFileSets>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
+		</repository>  -->	

+

+		<!-- Papyrus repository -->

+		<repository>

+			<id>papyrus-main</id>

+			<layout>p2</layout>

+			<url>${papyrus.repo.main}</url>

+		</repository>

+	</repositories>

+	<build>

+		<plugins>

+			<plugin>

+				<!-- enable tycho build extension -->

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-maven-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<extensions>true</extensions>

+			</plugin>

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-versions-plugin</artifactId>

+				<version>${tycho-version}</version>

+			</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_64</arch>

+						</environment>

+						<environment>

+							<os>linux</os>

+							<ws>gtk</ws>

+							<arch>x86</arch>

+						</environment>

+						<environment>

+							<os>win32</os>

+							<ws>win32</ws>

+							<arch>x86_64</arch>

+						</environment>

+						<environment>

+							<os>win32</os>

+							<ws>win32</ws>

+							<arch>x86</arch>

+						</environment>

+						<environment>

+							<os>macosx</os>

+							<ws>cocoa</ws>

+							<arch>x86_64</arch>

+						</environment>

+					</environments>

+				</configuration>

+			</plugin>

+			<!-- enable source bundle generation -->

+			<plugin>

+				<groupId>org.eclipse.tycho</groupId>

+				<artifactId>tycho-source-plugin</artifactId>

+				<version>${tycho-version}</version>

+				<executions>

+					<execution>

+						<id>plugin-source</id>

+						<goals>

+							<goal>plugin-source</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-resources-plugin</artifactId>

+			</plugin>

+		</plugins>

+	</build>

+	<profiles>

+		<profile>

+			<id>update-branding-plugins-about.mappings</id>

+			<activation>

+				<file>

+					<exists>${basedir}/about.mappings</exists>

+				</file>

+			</activation>

+			<build>

+				<plugins>

+					<plugin>

+						<groupId>org.apache.maven.plugins</groupId>

+						<artifactId>maven-resources-plugin</artifactId>

+						<executions>

+							<execution>

+								<id>process-about.mappings</id>

+								<phase>prepare-package</phase>

+								<configuration>

+									<outputDirectory>${project.build.directory}</outputDirectory>

+									<overwrite>true</overwrite>

+									<resources>

+										<resource>

+											<directory>${basedir}</directory>

+											<includes>

+												<include>about.mappings</include>

+											</includes>

+											<filtering>true</filtering>

+										</resource>

+									</resources>

+								</configuration>

+								<goals>

+									<goal>copy-resources</goal>

+								</goals>

+							</execution>

+						</executions>

+					</plugin>

+					<plugin>

+						<groupId>org.eclipse.tycho</groupId>

+						<artifactId>tycho-packaging-plugin</artifactId>

+						<version>${tycho-version}</version>

+						<configuration>

+							<additionalFileSets>

+								<fileSet>

+									<directory>${project.build.directory}</directory>

+									<includes>

+										<include>about.mappings</include>

+									</includes>

+								</fileSet>

+							</additionalFileSets>

+						</configuration>

+					</plugin>

+				</plugins>

+			</build>

+		</profile>

+	</profiles>

+</project>