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 @@ org.springframework.boot spring-boot-starter-parent - 2.2.1.RELEASE + 2.3.4.RELEASE @@ -51,6 +51,7 @@ joda-time joda-time + 2.10.8 @@ -108,7 +109,7 @@ org.apache.maven.shared maven-invoker - 2.2 + 3.0.1 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 issueTrackers(List plugins) { - return OrderAwarePluginRegistry.create(plugins); + return OrderAwarePluginRegistry.of(plugins); } /**