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

Merge 1.1.x and resolve minor conflict

This commit is contained in:
Dave Syer 2014-10-01 15:47:41 +01:00
parent 06fa2a9f78 26a528ce95
commit 0b72b9814f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-starters/spring-boot-starter-parent/pom.xml
View File

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