Bug 535709 - [Releng] The maven dependencies and related poms need to be updated

- Update plugin versions
- Remove duplicate dependencies and clean unneeded ones
- Amended the p2 repository references - jboss.tools.tycho - to remove the webContent generation

Change-Id: I5b0a2235dad2fc85e866384baf7749d57f04bdbf
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

2 files changed, 51 insertions, 94 deletions

diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 26fbb81c4ba..4711fe3c359 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 	<artifactId>org.eclipse.papyrus.releng</artifactId>
 	<packaging>pom</packaging>
 	<parent>
@@ -8,6 +9,7 @@
 		<artifactId>org.eclipse.papyrus.all.releng</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
+	
 	<modules>
 		<module>../../plugins</module>
 		<module>../../examples</module>
@@ -16,71 +18,29 @@
 		<module>targetPlatform</module>
 		<module>site</module>
 	</modules>
-
-	<repositories>
-		<!-- 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> -->
-	</repositories>
 	
 	<properties>
+        <mojo.buildhelper.version>3.0.0</mojo.buildhelper.version>
+        <mylyn.wikitext.version>3.0.24</mylyn.wikitext.version>
+	
 		<target.platform>org.eclipse.papyrus.main.${target.suffix}.target</target.platform>
 	</properties>
 	
 	<build>
 		<pluginManagement>
+		<!-- redistributed plugins -->
 			<plugins>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.2</version>
-					<configuration>
-						<source>${java.source.version}</source>
-						<target>${java.target.version}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>1.9.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.xtend</groupId>
-					<artifactId>xtend-maven-plugin</artifactId>
-					<version>${xtext.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-compiler-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<optimize>true</optimize>
-						<showWarnings>true</showWarnings>
-						<!-- Tycho build using the project's JDT settings. -->
-						<useProjectSettings>true</useProjectSettings>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-maven-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<extensions>true</extensions>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>target-platform-configuration</artifactId>
+					<version>${mojo.buildhelper.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.mylyn.docs</groupId>
-					<artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+					<artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
 					<version>${mylyn.wikitext.version}</version>
 				</plugin>
+				
 				<!--This plugin's configuration is used to store Eclipse m2e settings 
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
@@ -96,7 +56,7 @@
 											org.eclipse.mylyn.docs
 										</groupId>
 										<artifactId>
-											org.eclipse.mylyn.wikitext.core.maven
+											org.eclipse.mylyn.wikitext.maven
 										</artifactId>
 										<versionRange>
 											[2.4.0-SNAPSHOT,)
@@ -115,7 +75,9 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		
 		<plugins>
+            <!-- local plugins -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -131,8 +93,8 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
 			</plugin>
+			
 			<!-- Sources -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
@@ -187,9 +149,11 @@
 		only. Activation: SIGN=true pack: produce a simple update site (Packed). 
 		Used for nightly or feature branch builds. Activation: SIGN=false -->
 	<profiles>
-
 		<profile>
 			<id>defaultProfile</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -208,14 +172,16 @@
 					</plugin>
 				</plugins>
 			</build>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 		</profile>
 
 		<profile>
 			<id>buildAll</id>
-
+            <activation>
+                <property>
+                    <name>buildAll</name>
+                    <value>true</value>
+                </property>
+            </activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -234,20 +200,18 @@
 					</plugin>
 				</plugins>
 			</build>
-
-			<activation>
-				<property>
-					<name>buildAll</name>
-					<value>true</value>
-				</property>
-			</activation>
 		</profile>
 
-
-
 		<!-- nightly profile is useful for developers that want to link to nightly build -->
 		<profile>
 			<id>nightly</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>devnightly</value>
+                </property>
+                <activeByDefault>false</activeByDefault>
+            </activation>
 			<repositories>
 				<repository>
 					<id>papyrus-nightly</id>
@@ -266,19 +230,18 @@
 					</snapshots>
 				</repository>
 			</repositories>
-			<activation>
-				<property>
-					<name>env</name>
-					<value>devnightly</value>
-				</property>
-				<activeByDefault>false</activeByDefault>
-			</activation>
 		</profile>
 		
 		
 		<!-- Stable release profile. Takes +30min. Eclipse servers only -->
 		<profile>
 			<id>packAndSign</id> 
+            <activation>
+                <property>
+                    <name>SIGN</name>
+                    <value>true</value>
+                </property>
+            </activation>
 			<!-- Pack200 -->
 			<build>
 				<plugins>
@@ -340,18 +303,18 @@
 					</plugin>
 				</plugins>
 			</build>
-			<activation>
-				<property>
-					<name>SIGN</name>
-					<value>true</value>
-				</property>
-			</activation>
 		</profile>
 		
 
 		<!-- Nightly profile. Artifacts can be consumed, but are not signed -->
 		<profile>
 			<id>pack</id> 
+            <activation>
+                <property>
+                    <name>SIGN</name>
+                    <value>false</value>
+                </property>
+            </activation>
 			<build>
 				<plugins>
 					<!-- Pack200 -->
@@ -387,12 +350,6 @@
 					</plugin>
 				</plugins>
 			</build>
-			<activation>
-				<property>
-					<name>SIGN</name>
-					<value>false</value>
-				</property>
-			</activation>
 		</profile>
 	
 		
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index f261dcd2b64..5892a9de3db 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<artifactId>org.eclipse.papyrus.releng</artifactId>
@@ -34,13 +35,12 @@
 							<goal>generate-repository-facade</goal>
 						</goals>
 						<configuration>
-						
-						<!-- p2 update site transitive dependencies repositories -->
+						    <!-- do not generate the pesky web folder and index.html -->
+                            <skipWebContentGeneration>true</skipWebContentGeneration>
+                            <!-- p2 update site transitive dependencies repositories -->
 							<associateSites>
 								<!-- Oxygen orbit bundles for batik 1.6.0-->
 								<site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/</site>
-								<!-- Provide the latest runtime update until its in the releases aggregation -->
-								<site>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809</site>
 							</associateSites>
 						</configuration>
 					</execution>