Skip to content

Issue348 Log message only if trying to change maven property from ant… #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbindel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue348 Log message only if trying to change maven property from ant… #349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,13 @@ public void copyProperties(Project antProject, MavenProject mavenProject) {

for (Map.Entry<String, Object> entry : antProps.entrySet()) {
String key = entry.getKey();
if (mavenProperties.getProperty(key) != null) {
getLog().warn("Ant property '" + key + "=" + mavenProperties.getProperty(key)
+ "' clashes with an existing Maven property, SKIPPING this Ant property propagation.");
String mavenValue = mavenProperties.getProperty(key);
if (mavenValue != null) {
if (!mavenValue.equals(entry.getValue())) {
getLog().info("Ant property '" + key + "=" + entry.getValue()
+ "' clashes with an existing Maven property value '" + mavenValue
+ "', SKIPPING this Ant property propagation.");
}
continue;
}
// it is safe to call toString directly since the value cannot be null in Hashtable
Expand Down
Loading