From 3d39b589d6ae6a7d19e8d9356e12d3005ebf77bd Mon Sep 17 00:00:00 2001
From: Andrew Johnson <andrew_johnson@uk.ibm.com>
Date: Fri, 22 Jan 2021 20:47:50 +0000
Subject: [PATCH] 570485: CI Build failures due to OutOfMemoryError or SIGKILL

Fix some build warnings

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=570485
---
 parent/pom.xml                                | 25 ++++++++++++++++---
 .../org.eclipse.mat.ui.help/extrabuild.xml    |  4 +--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 54990ff0b..16d5649c2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -15,10 +15,6 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<prerequisites>
-		<maven>3.0</maven>
-	</prerequisites>
-
 	<groupId>org.eclipse.mat</groupId>
 	<artifactId>parent</artifactId>
 	<version>1.12.0-SNAPSHOT</version>
@@ -211,6 +207,7 @@
 					<!-- Disable the default deploy as we don't deploy Maven artifacts to download.eclipse.org -->
 					<plugin>
 						<artifactId>maven-deploy-plugin</artifactId>
+						<version>2.8.2</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -222,6 +219,26 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.0.0-M3</version>
+				<executions>
+					<execution>
+						<id>enforce-maven</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireMavenVersion>
+									<version>3.0</version>
+								</requireMavenVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
diff --git a/plugins/org.eclipse.mat.ui.help/extrabuild.xml b/plugins/org.eclipse.mat.ui.help/extrabuild.xml
index 3d1308fe7..6c33d71f2 100644
--- a/plugins/org.eclipse.mat.ui.help/extrabuild.xml
+++ b/plugins/org.eclipse.mat.ui.help/extrabuild.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2010,2018 IBM Corporation and SAP AG.
+    Copyright (c) 2010,2021 IBM Corporation and SAP AG.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -46,7 +46,7 @@
         	<!-- Change to the Java version with which we build MAT -->
             <link href="https://docs.oracle.com/javase/8/docs/api/" />
             <!-- Change to the version with which we build standalone MAT -->
-            <link href="https://help.eclipse.org/photon/topic/org.eclipse.platform.doc.isv/reference/api/" />
+            <link href="https://help.eclipse.org/2020-03/topic/org.eclipse.platform.doc.isv/reference/api/" />
             <link href="https://unicode-org.github.io/icu-docs/apidoc/released/icu4j/" />
             <link href="https://www.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.api.80.doc/com.ibm.dtfj/" />
             <packageset dir="../org.eclipse.mat.report/src" defaultexcludes="yes">