Skip to content

Commit 993f265

Browse files
author
cbuschka
committed
#310: Only properties created by maven-git-commit-id-plugin filtered now.
1 parent 765c358 commit 993f265

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public void execute() throws MojoExecutionException {
384384
}
385385

386386
if (injectAllReactorProjects) {
387-
appendPropertiesToReactorProjects(properties, prefixDot);
387+
appendPropertiesToReactorProjects(properties);
388388
}
389389
} catch (Exception e) {
390390
handlePluginFailure(e);
@@ -463,7 +463,7 @@ public Predicate<CharSequence> apply(String exclude) {
463463
}
464464

465465
for (String key : properties.stringPropertyNames()) {
466-
if (shouldExclude.apply(key)) {
466+
if (isOurProperty(key) && shouldExclude.apply(key)) {
467467
log.debug("shouldExclude.apply({}) = {}", key, shouldExclude.apply(key));
468468
properties.remove(key);
469469
}
@@ -488,7 +488,7 @@ public Predicate<CharSequence> apply(String exclude) {
488488
}
489489

490490
for (String key : properties.stringPropertyNames()) {
491-
if (!shouldInclude.apply(key)) {
491+
if (isOurProperty(key) && !shouldInclude.apply(key)) {
492492
log.debug("!shouldInclude.apply({}) = {}", key, shouldInclude.apply(key));
493493
properties.remove(key);
494494
}
@@ -510,15 +510,15 @@ private void handlePluginFailure(Exception e) throws GitCommitIdExecutionExcepti
510510
}
511511
}
512512

513-
private void appendPropertiesToReactorProjects(@NotNull Properties properties, @NotNull String trimmedPrefixWithDot) {
513+
private void appendPropertiesToReactorProjects(@NotNull Properties properties) {
514514
for (MavenProject mavenProject : reactorProjects) {
515515
Properties mavenProperties = mavenProject.getProperties();
516516

517517
// TODO check message
518518
log.info("{}] project {}", mavenProject.getName(), mavenProject.getName());
519519

520520
for (Object key : properties.keySet()) {
521-
if (key.toString().startsWith(trimmedPrefixWithDot)) {
521+
if (isOurProperty(key.toString())) {
522522
mavenProperties.put(key, properties.get(key));
523523
}
524524
}

0 commit comments

Comments
 (0)