root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x 

Closes gh-25385
This commit is contained in:
Stephane Nicoll 2021-02-22 10:45:55 +01:00
parent 9e6302ee6a e41f7fec23
commit 7c5a5c6663
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/test/resources/plugin.xml
View File

@ -14,7 +14,7 @@
<mojos> <mojos>
<mojo> <mojo>
<goal>build-info</goal> <goal>build-info</goal>
<description>Generate a {@code build-info.properties} file based the content of the current <description>Generate a {@code build-info.properties} file based on the content of the current
{@link MavenProject}.</description> {@link MavenProject}.</description>
<requiresDirectInvocation>false</requiresDirectInvocation> <requiresDirectInvocation>false</requiresDirectInvocation>
<requiresProject>true</requiresProject> <requiresProject>true</requiresProject>

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildInfoMojo.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,7 +37,7 @@ import org.springframework.boot.loader.tools.BuildPropertiesWriter.NullAdditiona
import org.springframework.boot.loader.tools.BuildPropertiesWriter.ProjectDetails; import org.springframework.boot.loader.tools.BuildPropertiesWriter.ProjectDetails;
/** /**
* Generate a {@code build-info.properties} file based the content of the current * Generate a {@code build-info.properties} file based on the content of the current
* {@link MavenProject}. * {@link MavenProject}.
* *
* @author Stephane Nicoll * @author Stephane Nicoll