Skip to content

S
spring-boot
Commit 0b72b981 authored by Dave Syer's avatar Dave Syer
Browse files
Options

Merge 1.1.x and resolve minor conflict

parents 06fa2a9f 26a528ce
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
spring-boot-starters/spring-boot-starter-parent/pom.xml
View file @ 0b72b981
...@@ -127,8 +127,7 @@ ...@@ -127,8 +127,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat> <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile> <generateGitPropertiesFile>true</generateGitPropertiesFile>
<!-- Workaround until 2.1.11 is released; should be an absolute path --> <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
<generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
</configuration> </configuration>
</plugin> </plugin>
<!-- Support our own plugin --> <!-- Support our own plugin -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment