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>

1 files changed, 37 insertions, 50 deletions

diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index 6dadee5b0a6..0961c03ccca 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
+<?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>
 		<groupId>org.eclipse.papyrus</groupId>
 		<artifactId>org.eclipse.papyrus.all.releng</artifactId>
@@ -10,6 +11,7 @@
 	<artifactId>org.eclipse.papyrus.tests.releng</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
+	
 	<properties>
 		<testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->
 		<testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass>
@@ -18,6 +20,7 @@
 		<test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine>
 		<target.platform>org.eclipse.papyrus.main.tests.${target.suffix}.target</target.platform>
 	</properties>
+	
 	<modules>
 		<!--  Features -->
 		<module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.feature</module>
@@ -43,41 +46,24 @@
 	
 		<module>targetPlatform</module>
 	</modules>
+	
 	<build>
 		<pluginManagement>
 			<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.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.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
 					<version>${jacoco-version}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
@@ -93,8 +79,24 @@
 			<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-surefire-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <failIfNoTests>false</failIfNoTests>
+                    <useUIHarness>true</useUIHarness>
+                    <useUIThread>true</useUIThread>
+                    <testFailureIgnore>true</testFailureIgnore>
+                    <!-- ${tycho.testArgLine} is populated by JaCoCo and is required to enable code coverage -->
+                    <argLine>${tycho.testArgLine} ${test.argLine}</argLine>
+                    <appArgLine>-testConfig=${testConfig}</appArgLine>
+                    <product>org.eclipse.sdk.ide</product>
+                    <skipTests>${skipInnerTests}</skipTests>
+                </configuration>
+            </plugin>
+			
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
@@ -122,27 +124,15 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<failIfNoTests>false</failIfNoTests>
-					<useUIHarness>true</useUIHarness>
-					<useUIThread>true</useUIThread>
-					<testFailureIgnore>true</testFailureIgnore>
-					<!-- ${tycho.testArgLine} is populated by JaCoCo and is required to enable code coverage -->
-					<argLine>${tycho.testArgLine} ${test.argLine}</argLine>
-					<appArgLine>-testConfig=${testConfig}</appArgLine>
-					<product>org.eclipse.sdk.ide</product>
-					<skipTests>${skipInnerTests}</skipTests>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
+	
 	<profiles>
 		<profile>
 			<id>defaultProfile</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
 			<repositories>
 				<repository>
 					<id>papyrus-main</id>
@@ -155,9 +145,6 @@
 					<url>${papyrus.repo.toolsmiths}</url>
 				</repository>
 			</repositories>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 		</profile>
 		
 		<profile>
@@ -171,8 +158,15 @@
 				<test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100 -XstartOnFirstThread</test.argLine>
 			</properties>
 		</profile>		
+		
 		<profile>
 			<id>buildAll</id>
+            <activation>
+                <property>
+                    <name>buildAll</name>
+                    <value>true</value>
+                </property>
+            </activation>
 			<!-- Papyrus Update sites not included (They are included in the same build) -->
 			
 			<build>
@@ -193,13 +187,6 @@
 					</plugin>
 				</plugins>
 			</build>
-			
-			<activation>
-				<property>
-					<name>buildAll</name>
-					<value>true</value>
-				</property>
-			</activation>
 		</profile>
 	</profiles>
 </project>