-
Notifications
You must be signed in to change notification settings - Fork 20
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.
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
apache:master
Choose a base branch
from
jbindel:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+7
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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() | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think a warning is appropriate here, at least some of the time. Possibly this can be a little pickier about when it warns but if it's warn or info, it should be warn. |
||
| + "' clashes with an existing Maven property value '" + mavenValue | ||
| + "', SKIPPING this Ant property propagation."); | ||
| } | ||
|
Comment on lines
+466
to
+470
|
||
| continue; | ||
| } | ||
|
Comment on lines
+464
to
472
|
||
| // it is safe to call toString directly since the value cannot be null in Hashtable | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This part, checking if the maven property value matches the ant property value, seems like a good idea.