From de54dd4b10c0841b788bb18a0ba271ae9c0f9be1 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Wed, 28 Oct 2020 11:14:16 +0100
Subject: [PATCH] #153 - Upgrade to Spring Boot 2.3.4.

Also, upgrade to Maven Invoker 3.0.1.
---
 release-tools/pom.xml                                        | 5 +++--
 .../org/springframework/data/release/build/MavenRuntime.java | 4 +++-
 .../data/release/issues/IssueTrackerConfiguration.java       | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/release-tools/pom.xml b/release-tools/pom.xml
index 824a56b..42b3776 100644
--- a/release-tools/pom.xml
+++ b/release-tools/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.3.4.RELEASE</version>
 	</parent>
 
 	<properties>
@@ -51,6 +51,7 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
+			<version>2.10.8</version>
 		</dependency>
 
 		<dependency>
@@ -108,7 +109,7 @@
 		<dependency>
 			<groupId>org.apache.maven.shared</groupId>
 			<artifactId>maven-invoker</artifactId>
-			<version>2.2</version>
+			<version>3.0.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java b/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java
index ccb717b..a7d233a 100644
--- a/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java
+++ b/release-tools/src/main/java/org/springframework/data/release/build/MavenRuntime.java
@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
 
 import org.apache.maven.shared.invoker.DefaultInvocationRequest;
 import org.apache.maven.shared.invoker.DefaultInvoker;
+import org.apache.maven.shared.invoker.InvocationRequest;
 import org.apache.maven.shared.invoker.InvocationResult;
 import org.apache.maven.shared.invoker.Invoker;
 
@@ -84,10 +85,11 @@ class MavenRuntime {
 				invoker.setLocalRepositoryDirectory(localRepository);
 			}
 
-			DefaultInvocationRequest request = new DefaultInvocationRequest();
+			InvocationRequest request = new DefaultInvocationRequest();
 			request.setJavaHome(os.getJavaHome());
 			request.setShellEnvironmentInherited(true);
 			request.setBaseDirectory(workspace.getProjectDirectory(project));
+			request.setBatchMode(true);
 
 			request.setGoals(arguments.toCommandLine(it -> properties.getFullyQualifiedPlugin(it.getGoal())));
 
diff --git a/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerConfiguration.java b/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerConfiguration.java
index c60d364..897318a 100644
--- a/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerConfiguration.java
+++ b/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerConfiguration.java
@@ -79,7 +79,7 @@ class IssueTrackerConfiguration {
 
 	@Bean
 	PluginRegistry<IssueTracker, Project> issueTrackers(List<? extends IssueTracker> plugins) {
-		return OrderAwarePluginRegistry.create(plugins);
+		return OrderAwarePluginRegistry.of(plugins);
 	}
 
 	/**