You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2010/08/24 21:24:16 UTC
svn commit: r988679 - in /ant/ivy/core/branches/2.2.x: ./ doc/use/
src/java/org/apache/ivy/ant/ src/java/org/apache/ivy/plugins/parser/m2/
Author: maartenc
Date: Tue Aug 24 19:24:16 2010
New Revision: 988679
URL: http://svn.apache.org/viewvc?rev=988679&view=rev
Log:
Merged revision 988678 from trunk into 2.2.x branch.
Modified:
ant/ivy/core/branches/2.2.x/ (props changed)
ant/ivy/core/branches/2.2.x/CHANGES.txt
ant/ivy/core/branches/2.2.x/doc/use/makepom.html
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyMakePom.java
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
Propchange: ant/ivy/core/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 24 19:24:16 2010
@@ -1,4 +1,4 @@
/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
-/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678
Modified: ant/ivy/core/branches/2.2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/CHANGES.txt?rev=988679&r1=988678&r2=988679&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.2.x/CHANGES.txt Tue Aug 24 19:24:16 2010
@@ -118,6 +118,7 @@ for detailed view of each issue, please
- IMPROVEMENT: MakePom task handling of mulitple artifacts for Maven2 (IVY-707) (thanks to Jesper Pedersen)
- IMPROVEMENT: ivy:makepom now has an option to disable the generation of an extra Ivy comment block in the POM
- IMPROVEMENT: ivy:makepom now accepts a list of configurations to include (IVY-1005) (thanks to Jesper Pedersen)
+- IMPROVEMENT: ivy:makepom can generate a <description> element in the pom (IVY-1215) (thanks to Jesper Pedersen)
- FIX: artifactreport ant task doesn't honor log attribute (IVY-1212)
- FIX: XmlModuleDescriptorWriter does not write the transitive attribute (IVY-1207) (thanks to Abel Muino)
Modified: ant/ivy/core/branches/2.2.x/doc/use/makepom.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/doc/use/makepom.html?rev=988679&r1=988678&r2=988679&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/doc/use/makepom.html (original)
+++ ant/ivy/core/branches/2.2.x/doc/use/makepom.html Tue Aug 24 19:24:16 2010
@@ -54,6 +54,8 @@ An example of use is to publish an Ivy m
<td>No, defaults to 'true'.</td></tr>
<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>
</tbody>
</table>
<h1>Child elements</h1>
Modified: ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyMakePom.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyMakePom.java?rev=988679&r1=988678&r2=988679&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyMakePom.java (original)
+++ ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyMakePom.java Tue Aug 24 19:24:16 2010
@@ -110,6 +110,8 @@ public class IvyMakePom extends IvyTask
private String conf;
private File ivyFile = null;
+
+ private String description;
private Collection mappings = new ArrayList();
@@ -139,6 +141,14 @@ public class IvyMakePom extends IvyTask
this.headerFile = headerFile;
}
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
public boolean isPrintIvyInfo() {
return printIvyInfo;
}
@@ -212,6 +222,7 @@ public class IvyMakePom extends IvyTask
.setArtifactName(getArtifactName())
.setArtifactPackaging(getArtifactPackaging())
.setPrintIvyInfo(isPrintIvyInfo())
+ .setDescription(getDescription())
.setExtraDependencies(getDependencies());
if (!mappings.isEmpty()) {
Modified: ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java?rev=988679&r1=988678&r2=988679&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java (original)
+++ ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java Tue Aug 24 19:24:16 2010
@@ -112,6 +112,9 @@ public final class PomModuleDescriptorWr
if (mrid.getRevision() != null) {
out.println(" <version>" + mrid.getRevision() + "</version>");
}
+ if (options.getDescription() != null) {
+ out.println(" <description>" + options.getDescription() + "</description>");
+ }
if (md.getHomePage() != null) {
out.println(" <url>" + md.getHomePage() + "</url>");
}
Modified: ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java?rev=988679&r1=988678&r2=988679&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java (original)
+++ ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java Tue Aug 24 19:24:16 2010
@@ -38,6 +38,8 @@ public class PomWriterOptions {
private List/*<ExtraDependency>*/ extraDependencies = new ArrayList();
+ private String description;
+
public String[] getConfs() {
return confs;
}
@@ -101,6 +103,15 @@ public class PomWriterOptions {
return this;
}
+ public String getDescription() {
+ return description;
+ }
+
+ public PomWriterOptions setDescription(String description) {
+ this.description = description;
+ return this;
+ }
+
public static class ConfigurationScopeMapping {
private Map/*<String,String>*/ scopes;