From 06c518f3aa6c6b646203e428e7c7524fb382cb6a Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Thu, 7 Nov 2019 17:24:53 -0500
Subject: [PATCH] [releng] Enforce Maven version to 3.6.0

See Bug 551674.

This commit also moves the enforcer plug-in into the correct place
to be activated

The enforcer plug-in needs to be done to allow the check maven versions
to not report erroneous/extra information too (see next commit)

Change-Id: I2da89b0a9ec0fc3dc27f0812fef53104dcaa7fd6
---
 pom.xml | 58 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9110af5c70..92b47d8a2af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,11 @@
 	<name>CDT Parent</name>
 
 	<properties>
-		<required-maven-version>3.3.1</required-maven-version>
+		<!-- Maven 3.6.1 and 3.6.2 do not work with Tycho, see Bug 551674
+		     CDT enforces a minimum of 3.6.0 because that is what CDT's CI
+			 runs with. It may work with older versions, but this is not
+			 tested or supported. -->
+		<required-maven-version>[3.6.0]</required-maven-version>
 		<tycho-version>1.4.0</tycho-version>
 		<tycho-extras-version>1.4.0</tycho-extras-version>
 		<cbi-plugins.version>1.1.7</cbi-plugins.version>
@@ -593,6 +597,32 @@
 	</profiles>
 	<build>
 		<plugins>
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.0.0-M2</version>
+				<executions>
+				<execution>
+					<id>enforce-maven-version</id>
+					<goals>
+						<goal>enforce</goal>
+					</goals>
+					<configuration>
+						<rules>
+							<requireMavenVersion>
+								<version>${required-maven-version}</version>
+							</requireMavenVersion>
+							<requireJavaVersion>
+								<version>1.8</version>
+							</requireJavaVersion>
+						</rules>
+						<fail>true</fail>
+						<failFast>true</failFast>
+					</configuration>
+				</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>sonar-maven-plugin</artifactId>
@@ -933,31 +963,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<inherited>true</inherited>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0-M2</version>
-				<executions>
-				<execution>
-					<id>enforce-maven-version</id>
-					<goals>
-					<goal>enforce</goal>
-					</goals>
-					<configuration>
-					<rules>
-						<requireMavenVersion>
-						<version>${required-maven-version}</version>
-						</requireMavenVersion>
-						<requireJavaVersion>
-						<version>1.8</version>
-						</requireJavaVersion>
-					</rules>
-					<fail>true</fail>
-					</configuration>
-				</execution>
-				</executions>
-			</plugin>
+
 			</plugins>
 		</pluginManagement>
 	</build>