Merge branch '1.1.x'
This commit is contained in:
commit
74f5b9b6a9
|
|
@ -106,6 +106,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>pl.project13.maven</groupId>
|
<groupId>pl.project13.maven</groupId>
|
||||||
<artifactId>git-commit-id-plugin</artifactId>
|
<artifactId>git-commit-id-plugin</artifactId>
|
||||||
|
<version>2.1.10</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
|
|
@ -117,7 +118,8 @@
|
||||||
<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>
|
||||||
<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>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- Support our own plugin -->
|
<!-- Support our own plugin -->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue