Merge branch '1.1.x'

Author: wilkinsona

spring-boot-starters/spring-boot-starter-parent/pom.xml

@@ -106,7 +106,7 @@
 				<plugin>
 					<groupId>pl.project13.maven</groupId>
 					<artifactId>git-commit-id-plugin</artifactId>
-					<version>2.1.10</version>
+					<version>2.1.11</version>
 					<executions>
 						<execution>
 							<goals>
@@ -118,8 +118,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 -->