In ivy:makepom, if no description, use the one in the source ivy.xml Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/77868bf7 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/77868bf7 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/77868bf7
Branch: refs/heads/master Commit: 77868bf772a03d61701bc0d32dfafea63a0382c2 Parents: 4746531 Author: Nicolas LaleveÌe <[email protected]> Authored: Sun Jan 18 17:25:42 2015 +0100 Committer: Nicolas Lalevée <[email protected]> Committed: Sun Jan 18 21:14:41 2015 +0100 ---------------------------------------------------------------------- doc/use/makepom.html | 2 +- .../apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/77868bf7/doc/use/makepom.html ---------------------------------------------------------------------- diff --git a/doc/use/makepom.html b/doc/use/makepom.html index 2585734..a47d850 100644 --- a/doc/use/makepom.html +++ b/doc/use/makepom.html @@ -96,7 +96,7 @@ ${ivy.pom.header} <tr><td>headerFile</td><td>the header of the generated pom file</td> <td>No</td></tr> <tr><td>description</td><td>The description that will be added to the generated pom. <span class="since">(since 2.2)</span></td> - <td>No, defaults to no description.</td></tr> + <td>No, defaults to no description. Since 2.5, defaults to the description in the source ivy file.</td></tr> </tbody> </table> <h1>Child elements</h1> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/77868bf7/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java index 646d3b5..7dc318f 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java @@ -179,6 +179,8 @@ public final class PomModuleDescriptorWriter { } if (options.getDescription() != null) { variables.setVariable("ivy.pom.description", options.getDescription(), true); + } else if (md.getDescription() != null && md.getDescription().length() > 0) { + variables.setVariable("ivy.pom.description", md.getDescription(), true); } if (md.getHomePage() != null) { variables.setVariable("ivy.pom.url", md.getHomePage(), true);
