#153 - Upgrade to Spring Boot 2.3.4.

Also, upgrade to Maven Invoker 3.0.1.
This commit is contained in:
Mark Paluch
2020-10-28 11:14:16 +01:00
parent d487333b78
commit de54dd4b10
3 changed files with 7 additions and 4 deletions

View File

@@ -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>

View File

@@ -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())));

View File

@@ -79,7 +79,7 @@ class IssueTrackerConfiguration {
@Bean
PluginRegistry<IssueTracker, Project> issueTrackers(List<? extends IssueTracker> plugins) {
return OrderAwarePluginRegistry.create(plugins);
return OrderAwarePluginRegistry.of(plugins);
}
/**