From 5039d0ec163af560363671e100b6c2ed75390e3f Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 26 Sep 2019 17:28:13 +0100
Subject: [PATCH] Fix version of Maven in a few places

This is kind of a tactical fix while we work out how to do it
better. The issue comes back to Spring Cloud Contract. They use Maven
3.6.2 (which isn't compatible with either the thin launcher or Spring
Boot CLI).
---
 spring-cloud-cli-integration-tests/pom.xml         | 11 +++++++++++
 .../spring-cloud-launcher-cli/pom.xml              | 14 ++++++++++++++
 .../spring-cloud-launcher-deployer/pom.xml         | 11 +++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml
index b24b148..4100ec7 100644
--- a/spring-cloud-cli-integration-tests/pom.xml
+++ b/spring-cloud-cli-integration-tests/pom.xml
@@ -16,6 +16,16 @@
 		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-settings-builder</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -46,6 +56,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
+		<maven.version>3.5.4</maven.version>
 	</properties>
 
 	<build>
diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml
index 5ad6f65..baef030 100644
--- a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml
@@ -16,6 +16,20 @@
 		<version>2.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
+	<properties>
+		<maven.version>3.5.4</maven.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-settings-builder</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
index a235d24..f4ad4c9 100644
--- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
+++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
@@ -1,5 +1,6 @@
 <?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"
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -20,6 +21,7 @@
 		<spring-cloud-deployer.version>2.0.4.RELEASE</spring-cloud-deployer.version>
 		<spring-cloud-deployer-resource-support.version>2.0.3.RELEASE</spring-cloud-deployer-resource-support.version>
 		<spring-cloud-deployer-thin.version>1.0.22.RELEASE</spring-cloud-deployer-thin.version>
+		<maven.version>3.3.9</maven.version>
 	</properties>
 
 	<dependencyManagement>
@@ -48,7 +50,12 @@
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-aether-provider</artifactId>
-				<version>3.3.9</version>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-settings-builder</artifactId>
+				<version>${maven.version}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>