mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge 1.1.x and resolve minor conflict
This commit is contained in:
commit
0b72b9814f
@ -127,8 +127,7 @@
|
||||
<verbose>true</verbose>
|
||||
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
|
||||
<generateGitPropertiesFile>true</generateGitPropertiesFile>
|
||||
<!-- Workaround until 2.1.11 is released; should be an absolute path -->
|
||||
<generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
|
||||
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- Support our own plugin -->
|
||||
|
Loading…
Reference in New Issue
Block a user