Skip to content

Commit 08004a2

Browse files
authored
Merge pull request #760 from git-commit-id/754
#754: Fix an issue where empty git.properties had been generated in submodules when injectAllReactorProjects=true
2 parents 38b9b4e + 1238467 commit 08004a2

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,7 @@ public void error(String msg, Throwable t) {
11451145
|| PropertiesFileGenerator.craftPropertiesOutputFile(
11461146
project.getBasedir(), new File(generateGitPropertiesFilename))
11471147
.exists()) {
1148+
log.info("Skip mojo execution on incremental builds.");
11481149
return;
11491150
}
11501151
}
@@ -1237,7 +1238,8 @@ public void error(String msg, Throwable t) {
12371238
log.info(
12381239
"injectAllReactorProjects is enabled - attempting to use the already computed values");
12391240
// makes sure the existing context properties are not mutated
1240-
properties = new Properties(contextProperties);
1241+
properties = new Properties();
1242+
properties.putAll(contextProperties);
12411243
}
12421244

12431245
final GitCommitIdPlugin.Callback cb =
@@ -1484,14 +1486,18 @@ private void publishPropertiesInto(Properties propertiesToPublish, Properties pr
14841486

14851487
private void appendPropertiesToReactorProjects(LogInterface log, Properties propertiesToPublish) {
14861488
for (MavenProject mavenProject : reactorProjects) {
1487-
log.debug("Adding properties to project: '" + mavenProject.getName() + "'");
1489+
log.debug(
1490+
"Adding '" + propertiesToPublish.size() + "' properties "
1491+
+ "to project: '" + mavenProject.getName() + "'");
14881492
if (mavenProject.equals(project)) {
14891493
continue;
14901494
}
14911495
publishPropertiesInto(propertiesToPublish, mavenProject.getProperties());
14921496
mavenProject.setContextValue(CONTEXT_KEY, propertiesToPublish);
14931497
}
1494-
log.info("Added properties to '" + reactorProjects.size() + "' projects");
1498+
log.info(
1499+
"Added '" + propertiesToPublish.size() + "' properties "
1500+
+ "to '" + reactorProjects.size() + "' projects");
14951501
}
14961502

14971503
private void logProperties(LogInterface log, Properties propertiesToPublish) {

0 commit comments

Comments
 (0)