ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r983832 - in /ant/ivy/core/branches/2.2.x: ./ doc/use/ src/java/org/apache/ivy/ant/ src/java/org/apache/ivy/plugins/parser/m2/ src/java/org/apache/ivy/plugins/parser/xml/ test/java/org/apache/ivy/plugins/parser/m2/
Date Mon, 09 Aug 2010 21:42:37 GMT
Author: maartenc
Date: Mon Aug  9 21:42:37 2010
New Revision: 983832

URL: http://svn.apache.org/viewvc?rev=983832&view=rev
Log:
- IMPROVEMENT: Handle attributes in description subelements (IVY-1214) (thanks to Jean-Louis
Boudart) (merged from trunk)
- IMPROVEMENT: ivy:makepom now has an option to disable the generation of an extra Ivy comment
block in the POM (merged from trunk)

Added:
    ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
      - copied unchanged from r983820, ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
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/ant/IvyPublish.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/xml/XmlModuleDescriptorParser.java
    ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java
    ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
    ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
    ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
    ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
    ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
    ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml

Propchange: ant/ivy/core/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  9 21:42:37 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-981333
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820

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=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.2.x/CHANGES.txt Mon Aug  9 21:42:37 2010
@@ -110,7 +110,9 @@ for detailed view of each issue, please 
 	
    2.2.0
 =====================================
+- IMPROVEMENT: Handle attributes in description subelements (IVY-1214) (thanks to Jean-Louis
Boudart)
 - IMPROVEMENT: Use IvyAuthenticator only when it is really necessary (IVY-1211)
+- 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)
 
 - FIX: artifactreport ant task doesn't honor log attribute (IVY-1212)

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=983832&r1=983831&r2=983832&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 Mon Aug  9 21:42:37 2010
@@ -44,6 +44,8 @@ An example of use is to publish an Ivy m
         <td>Yes</td></tr>
     <tr><td>conf</td><td>a comma separated list of the configurations
to include in the generated pom. Wildcards are supported here. <span class="since">(since
2.2)</span></td><td>No, defaults to all configurations.</td></tr>
 <tr><td>settingsRef</td><td>A reference to the ivy settings that
must be used by this task</td><td>No, 'ivy.instance' is taken by default.</td></tr>
+    <tr><td>printIvyInfo</td><td>Add some information about Ivy to
the generated POM. <span class="since">(since 2.2)</span></td>
+        <td>No, defaults to 'true'.</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=983832&r1=983831&r2=983832&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 Mon Aug  9 21:42:37
2010
@@ -18,6 +18,7 @@
 package org.apache.ivy.ant;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -28,6 +29,7 @@ import java.util.Map;
 
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorWriter;
+import org.apache.ivy.plugins.parser.m2.PomWriterOptions;
 import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorWriter.ConfigurationScopeMapping;
 import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
 import org.apache.ivy.util.FileUtil;
@@ -58,6 +60,8 @@ public class IvyMakePom extends IvyTask 
     private File pomFile = null;
 
     private File headerFile = null;
+    
+    private boolean printIvyInfo = true;
 
     private String conf;
    
@@ -89,6 +93,14 @@ public class IvyMakePom extends IvyTask 
         this.headerFile = headerFile;
     }
     
+    public boolean isPrintIvyInfo() {
+        return printIvyInfo;
+    }
+
+    public void setPrintIvyInfo(boolean printIvyInfo) {
+        this.printIvyInfo = printIvyInfo;
+    }
+
     public String getConf() {
         return conf;
     }
@@ -113,11 +125,7 @@ public class IvyMakePom extends IvyTask 
             }
             ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
                 getSettings(), ivyFile.toURI().toURL(), false);
-            PomModuleDescriptorWriter.write(md, splitConfs(conf),
-                headerFile == null ? null : FileUtil.readEntirely(getHeaderFile()),
-                mappings.isEmpty() 
-                    ? PomModuleDescriptorWriter.DEFAULT_MAPPING
-                    : new ConfigurationScopeMapping(getMappingsMap()), pomFile);
+            PomModuleDescriptorWriter.write(md, pomFile, getPomWriterOptions());
         } catch (MalformedURLException e) {
             throw new BuildException("unable to convert given ivy file to url: " + ivyFile
+ ": "
                     + e, e);
@@ -129,6 +137,23 @@ public class IvyMakePom extends IvyTask 
                     + " from=" + ivyFile + " to=" + pomFile, e);
         }
     }
+    
+    private PomWriterOptions getPomWriterOptions() throws IOException {
+        PomWriterOptions options = new PomWriterOptions();
+        options.setConfs(splitConfs(conf)).setPrintIvyInfo(isPrintIvyInfo());
+        
+        if (mappings.isEmpty()) {
+            options.setMapping(PomModuleDescriptorWriter.DEFAULT_MAPPING);
+        } else {
+            options.setMapping(new ConfigurationScopeMapping(getMappingsMap()));
+        }
+        
+        if (headerFile != null) {
+            options.setLicenseHeader(FileUtil.readEntirely(getHeaderFile()));
+        }
+        
+        return options;
+    }
 
     private Map getMappingsMap() {
         Map mappingsMap = new HashMap();

Modified: ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyPublish.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyPublish.java?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyPublish.java (original)
+++ ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/ant/IvyPublish.java Mon Aug  9 21:42:37
2010
@@ -34,6 +34,7 @@ import org.apache.ivy.core.module.id.Mod
 import org.apache.ivy.core.publish.PublishOptions;
 import org.apache.ivy.core.settings.IvySettings;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DynamicAttribute;
 
 /**
  * This task allow to publish a module revision to an Ivy repository.
@@ -385,12 +386,14 @@ public class IvyPublish extends IvyTask 
         this.update = update;
     }
 
-    public class PublishArtifact implements Artifact {
+    public class PublishArtifact implements Artifact, DynamicAttribute {
         private String ext;
 
         private String name;
 
         private String type;
+        
+        private Map extra = new HashMap();
 
         public String[] getConfigurations() {
             return null;
@@ -437,23 +440,23 @@ public class IvyPublish extends IvyTask 
         }
 
         public String getAttribute(String attName) {
-            return null;
+            return (String) extra.get(attName);
         }
 
         public Map getAttributes() {
-            return new HashMap();
+            return extra;
         }
 
         public String getExtraAttribute(String attName) {
-            return null;
+            return (String) extra.get(attName);
         }
 
         public Map getExtraAttributes() {
-            return new HashMap();
+            return extra;
         }
         
         public Map getQualifiedExtraAttributes() {
-            return new HashMap();
+            return extra;
         }
 
         public String getStandardAttribute(String attName) {
@@ -467,6 +470,10 @@ public class IvyPublish extends IvyTask 
         public boolean isMetadata() {
             return false;
         }
+        
+        public void setDynamicAttribute(String name, String value) {
+            extra.put(name, value);
+        }
     }
 
     public static class ArtifactsPattern {

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=983832&r1=983831&r2=983832&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
Mon Aug  9 21:42:37 2010
@@ -23,12 +23,9 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.ivy.Ivy;
 import org.apache.ivy.core.module.descriptor.Artifact;
@@ -39,17 +36,11 @@ import org.apache.ivy.util.Configuration
 import org.apache.ivy.util.StringUtils;
 
 public final class PomModuleDescriptorWriter {
-    // used to ease tests only
-    private static boolean addIvyVersion = true;
-    static void setAddIvyVersion(boolean addIvyVersion) {
-        PomModuleDescriptorWriter.addIvyVersion = addIvyVersion;
-    }
 
     private PomModuleDescriptorWriter() {
     }
     
-    public static void write(ModuleDescriptor md, String[] confs,
-            String licenseHeader, ConfigurationScopeMapping mapping, File output)
+    public static void write(ModuleDescriptor md, File output, PomWriterOptions options)
             throws IOException {
         if (output.getParentFile() != null) {
             output.getParentFile().mkdirs();
@@ -58,24 +49,24 @@ public final class PomModuleDescriptorWr
                 "UTF-8"));
         try {
             out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            if (licenseHeader != null) {
-                out.print(licenseHeader);
+            if (options.getLicenseHeader() != null) {
+                out.print(options.getLicenseHeader());
             }
-            out.println("<!--"); 
-            out.println("   Apache Maven 2 POM generated by Apache Ivy"); 
-            out.println("   " + Ivy.getIvyHomeURL());
-            if (addIvyVersion) {
+            if (options.isPrintIvyInfo()) {
+                out.println("<!--"); 
+                out.println("   Apache Maven 2 POM generated by Apache Ivy"); 
+                out.println("   " + Ivy.getIvyHomeURL());
                 out.println("   Apache Ivy version: " + Ivy.getIvyVersion() 
                     + " " + Ivy.getIvyDate());
+                out.println("-->"); 
             }
-            out.println("-->"); 
             out.println("<project xmlns=\"http://maven.apache.org/POM/4.0.0\" "
                     + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
             out.println("    xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 "
                     + "http://maven.apache.org/maven-v4_0_0.xsd\">\n");
             out.println("  <modelVersion>4.0.0</modelVersion>");
             printModuleId(md, out);
-            printDependencies(md, confs, mapping, out);
+            printDependencies(md, out, options);
             out.println("</project>");
         } finally {
             out.close();
@@ -121,10 +112,11 @@ public final class PomModuleDescriptorWr
         return null;
     }
 
-    private static void printDependencies(
-            ModuleDescriptor md, String[] confs, ConfigurationScopeMapping mapping, PrintWriter
out) {
-        DependencyDescriptor[] dds = getDependencies(md, confs);
+    private static void printDependencies(ModuleDescriptor md, PrintWriter out, 
+            PomWriterOptions options) {
+        DependencyDescriptor[] dds = getDependencies(md, options);
         if (dds.length > 0) {
+            ConfigurationScopeMapping mapping = options.getMapping();
             out.println("  <dependencies>");
             for (int i = 0; i < dds.length; i++) {
                 ModuleRevisionId mrid = dds[i].getDependencyRevisionId();
@@ -145,8 +137,9 @@ public final class PomModuleDescriptorWr
         }
     }
     
-    private static DependencyDescriptor[] getDependencies(ModuleDescriptor md, String[] confs)
{
-        confs = ConfigurationUtils.replaceWildcards(confs, md);
+    private static DependencyDescriptor[] getDependencies(ModuleDescriptor md, 
+            PomWriterOptions options) {
+        String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md);
 
         List result = new ArrayList();
         DependencyDescriptor[] dds = md.getDependencies();

Modified: ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
(original)
+++ ant/ivy/core/branches/2.2.x/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
Mon Aug  9 21:42:37 2010
@@ -281,7 +281,15 @@ public class XmlModuleDescriptorParser e
             try {
                 if (state == State.DESCRIPTION) {
                     // make sure we don't interpret any tag while in description tag
-                    buffer.append("<" + qName + ">");
+                    getBuffer().append("<").append(qName);
+                    for (int i = 0; i < attributes.getLength(); i++) {
+                        getBuffer().append(" ");
+                        getBuffer().append(attributes.getQName(i));
+                        getBuffer().append("=\"");
+                        getBuffer().append(attributes.getValue(i));
+                        getBuffer().append("\"");
+                    }
+                    getBuffer().append(">");
                     return;
                 } else if ("ivy-module".equals(qName)) {
                     ivyModuleStarted(attributes);

Modified: ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java
(original)
+++ ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriterTest.java
Mon Aug  9 21:42:37 2010
@@ -44,7 +44,7 @@ public class PomModuleDescriptorWriterTe
     public void testSimple() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-simple.pom"), false);
-        PomModuleDescriptorWriter.write(md, null, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions());
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -57,7 +57,7 @@ public class PomModuleDescriptorWriterTe
     public void testSimpleDependencies() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-dependencies.pom"), false);
-        PomModuleDescriptorWriter.write(md, null, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions());
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -70,7 +70,7 @@ public class PomModuleDescriptorWriterTe
     public void testDependenciesWithScope() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"),
false);
-        PomModuleDescriptorWriter.write(md, null, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions());
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -83,7 +83,7 @@ public class PomModuleDescriptorWriterTe
     public void testOptional() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-optional.pom"), false);
-        PomModuleDescriptorWriter.write(md, null, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions());
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -96,7 +96,7 @@ public class PomModuleDescriptorWriterTe
     public void testPackaging() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-packaging.pom"), false);
-        PomModuleDescriptorWriter.write(md, null, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions());
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -109,7 +109,7 @@ public class PomModuleDescriptorWriterTe
     public void testWriteCompileConfigurationOnly() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"),
false);
-        PomModuleDescriptorWriter.write(md, new String[] {"compile"}, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions().setConfs(new String[]
{"compile"}));
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -122,7 +122,7 @@ public class PomModuleDescriptorWriterTe
     public void testWriteRuntimeConfigurationOnly() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"),
false);
-        PomModuleDescriptorWriter.write(md, new String[] {"runtime"}, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions().setConfs(new String[]
{"runtime"}));
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -135,7 +135,7 @@ public class PomModuleDescriptorWriterTe
     public void testWriteAllConfiguration() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"),
false);
-        PomModuleDescriptorWriter.write(md, new String[] {"*"}, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions().setConfs(new String[]
{"*"}));
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -148,7 +148,7 @@ public class PomModuleDescriptorWriterTe
     public void testWriteAllExceptRuntimeConfiguration() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
             new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"),
false);
-        PomModuleDescriptorWriter.write(md, new String[] {"*", "!runtime"}, LICENSE, PomModuleDescriptorWriter.DEFAULT_MAPPING,
_dest);
+        PomModuleDescriptorWriter.write(md, _dest, getWriterOptions().setConfs(new String[]
{"*", "!runtime"}));
         assertTrue(_dest.exists());
 
         String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
@@ -162,10 +162,12 @@ public class PomModuleDescriptorWriterTe
         return FileUtil.readEntirely(new BufferedReader(new InputStreamReader(
             PomModuleDescriptorWriterTest.class.getResource(resource).openStream())));
     }
+    
+    private PomWriterOptions getWriterOptions() {
+        return (new PomWriterOptions()).setLicenseHeader(LICENSE).setPrintIvyInfo(false);
+    }
 
     public void setUp() {
-        // don't add ivy version to se static files for comparison
-        PomModuleDescriptorWriter.setAddIvyVersion(false);
         if (_dest.exists()) {
             _dest.delete();
         }

Modified: ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
(original)
+++ ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-compile-dependencies.xml
Mon Aug  9 21:42:37 2010
@@ -17,10 +17,6 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<!--
-   Apache Maven 2 POM generated by Apache Ivy
-   http://ant.apache.org/ivy/
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 

Modified: ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
(original)
+++ ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-optional.xml
Mon Aug  9 21:42:37 2010
@@ -17,10 +17,6 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<!--
-   Apache Maven 2 POM generated by Apache Ivy
-   http://ant.apache.org/ivy/
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 

Modified: ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
(original)
+++ ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-dependencies-with-scope.xml
Mon Aug  9 21:42:37 2010
@@ -17,10 +17,6 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<!--
-   Apache Maven 2 POM generated by Apache Ivy
-   http://ant.apache.org/ivy/
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 

Modified: ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
(original)
+++ ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-packaging.xml
Mon Aug  9 21:42:37 2010
@@ -17,10 +17,6 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<!--
-   Apache Maven 2 POM generated by Apache Ivy
-   http://ant.apache.org/ivy/
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 

Modified: ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
(original)
+++ ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple-dependencies.xml
Mon Aug  9 21:42:37 2010
@@ -17,10 +17,6 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<!--
-   Apache Maven 2 POM generated by Apache Ivy
-   http://ant.apache.org/ivy/
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 

Modified: ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml?rev=983832&r1=983831&r2=983832&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml
(original)
+++ ant/ivy/core/branches/2.2.x/test/java/org/apache/ivy/plugins/parser/m2/test-write-simple.xml
Mon Aug  9 21:42:37 2010
@@ -17,10 +17,6 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<!--
-   Apache Maven 2 POM generated by Apache Ivy
-   http://ant.apache.org/ivy/
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 



Mime
View raw message