Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-14 14:57:52 +01:00
commit 74f5b9b6a9

View File

@ -106,6 +106,7 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.1.10</version>
<executions>
<execution>
<goals>
@ -117,7 +118,8 @@
<verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
<!-- Workaround until 2.1.11 is released; should be an absolute path -->
<generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename>
</configuration>
</plugin>
<!-- Support our own plugin -->