Skip to content

Commit

Permalink
Merge pull request #760 from git-commit-id/754
Browse files Browse the repository at this point in the history
#754: Fix an issue where empty git.properties had been generated in submodules when injectAllReactorProjects=true
  • Loading branch information
TheSnoozer authored Jul 2, 2024
2 parents 38b9b4e + 1238467 commit 08004a2
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,7 @@ public void error(String msg, Throwable t) {
|| PropertiesFileGenerator.craftPropertiesOutputFile(
project.getBasedir(), new File(generateGitPropertiesFilename))
.exists()) {
log.info("Skip mojo execution on incremental builds.");
return;
}
}
Expand Down Expand Up @@ -1237,7 +1238,8 @@ public void error(String msg, Throwable t) {
log.info(
"injectAllReactorProjects is enabled - attempting to use the already computed values");
// makes sure the existing context properties are not mutated
properties = new Properties(contextProperties);
properties = new Properties();
properties.putAll(contextProperties);
}

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

private void appendPropertiesToReactorProjects(LogInterface log, Properties propertiesToPublish) {
for (MavenProject mavenProject : reactorProjects) {
log.debug("Adding properties to project: '" + mavenProject.getName() + "'");
log.debug(
"Adding '" + propertiesToPublish.size() + "' properties "
+ "to project: '" + mavenProject.getName() + "'");
if (mavenProject.equals(project)) {
continue;
}
publishPropertiesInto(propertiesToPublish, mavenProject.getProperties());
mavenProject.setContextValue(CONTEXT_KEY, propertiesToPublish);
}
log.info("Added properties to '" + reactorProjects.size() + "' projects");
log.info(
"Added '" + propertiesToPublish.size() + "' properties "
+ "to '" + reactorProjects.size() + "' projects");
}

private void logProperties(LogInterface log, Properties propertiesToPublish) {
Expand Down

0 comments on commit 08004a2

Please sign in to comment.