You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2015/01/18 21:15:01 UTC

[1/4] ant-ivy git commit: When fixing a module descriptor, copy all the useful info

Repository: ant-ivy
Updated Branches:
  refs/heads/master 1a7a15a60 -> 77868bf77


When fixing a module descriptor, copy all the useful info

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/05b14fd0
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/05b14fd0
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/05b14fd0

Branch: refs/heads/master
Commit: 05b14fd01e43ab8a385bcfb53102a270ef2d9375
Parents: 1a7a15a
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Jan 18 17:18:54 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Jan 18 17:18:54 2015 +0100

----------------------------------------------------------------------
 .../apache/ivy/core/report/ResolveReport.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/05b14fd0/src/java/org/apache/ivy/core/report/ResolveReport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/report/ResolveReport.java b/src/java/org/apache/ivy/core/report/ResolveReport.java
index 7fc1df8..70fa04b 100644
--- a/src/java/org/apache/ivy/core/report/ResolveReport.java
+++ b/src/java/org/apache/ivy/core/report/ResolveReport.java
@@ -27,6 +27,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.ivy.core.cache.ResolutionCacheManager;
@@ -361,6 +362,15 @@ public class ResolveReport {
     public ModuleDescriptor toFixedModuleDescriptor(IvySettings settings, List<ModuleId> midToKeep) {
         DefaultModuleDescriptor fixedmd = new DefaultModuleDescriptor(md.getModuleRevisionId(),
                 md.getStatus(), new Date());
+
+        // copy namespaces
+        for (Entry<String, String> ns : md.getExtraAttributesNamespaces().entrySet()) {
+            fixedmd.addExtraAttributeNamespace(ns.getKey(), ns.getValue());
+        }
+
+        // copy info
+        fixedmd.setDescription(md.getDescription());
+        fixedmd.setHomePage(md.getHomePage());
         fixedmd.getExtraInfos().addAll(md.getExtraInfos());
 
         // copy configurations
@@ -369,8 +379,15 @@ public class ResolveReport {
             fixedmd.addConfiguration(new Configuration(conf));
         }
 
+        // copy artifacts
+        for (String conf : resolvedConfs) {
+            for (Artifact a : md.getArtifacts(conf)) {
+                fixedmd.addArtifact(conf, a);
+            }
+        }
+
+        // add dependency we want to keep from the original module descriptor
         if (midToKeep != null && !midToKeep.isEmpty()) {
-            // add dependency we want to keep from the original module descriptor
             DependencyDescriptor[] deps = md.getDependencies();
             for (int i = 0; i < deps.length; i++) {
                 if (midToKeep.contains(deps[i].getDependencyId())) {


[2/4] ant-ivy git commit: use Java 5 constructs

Posted by hi...@apache.org.
use Java 5 constructs

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/89a0de6a
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/89a0de6a
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/89a0de6a

Branch: refs/heads/master
Commit: 89a0de6a8968ffaad64422377a1fc67da93b843c
Parents: 05b14fd
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Jan 18 17:19:20 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Jan 18 17:19:20 2015 +0100

----------------------------------------------------------------------
 src/java/org/apache/ivy/Ivy.java                |  6 ++--
 src/java/org/apache/ivy/ant/IvyPublish.java     | 29 +++++++--------
 src/java/org/apache/ivy/ant/IvyTask.java        |  2 ++
 .../apache/ivy/core/publish/PublishEngine.java  | 38 +++++++++-----------
 4 files changed, 36 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/src/java/org/apache/ivy/Ivy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/Ivy.java b/src/java/org/apache/ivy/Ivy.java
index 6cbd02c..fc190ed 100644
--- a/src/java/org/apache/ivy/Ivy.java
+++ b/src/java/org/apache/ivy/Ivy.java
@@ -37,6 +37,7 @@ import org.apache.ivy.core.deliver.DeliverOptions;
 import org.apache.ivy.core.event.EventManager;
 import org.apache.ivy.core.install.InstallEngine;
 import org.apache.ivy.core.install.InstallOptions;
+import org.apache.ivy.core.module.descriptor.Artifact;
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.core.module.id.ModuleId;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
@@ -614,8 +615,9 @@ public class Ivy {
     // PUBLISH
     // ///////////////////////////////////////////////////////////////////////
 
-    public Collection publish(ModuleRevisionId mrid, Collection srcArtifactPattern,
-            String resolverName, PublishOptions options) throws IOException {
+    public Collection<Artifact> publish(ModuleRevisionId mrid,
+            Collection<String> srcArtifactPattern, String resolverName, PublishOptions options)
+            throws IOException {
         pushContext();
         try {
             return publishEngine.publish(mrid, srcArtifactPattern, resolverName, options);

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/src/java/org/apache/ivy/ant/IvyPublish.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyPublish.java b/src/java/org/apache/ivy/ant/IvyPublish.java
index d46b701..04df76e 100644
--- a/src/java/org/apache/ivy/ant/IvyPublish.java
+++ b/src/java/org/apache/ivy/ant/IvyPublish.java
@@ -61,7 +61,7 @@ public class IvyPublish extends IvyTask {
 
     private String publishResolverName = null;
 
-    private List artifactspattern = new ArrayList();
+    private List<String> artifactspattern = new ArrayList<String>();
 
     private File deliveryList;
 
@@ -81,7 +81,7 @@ public class IvyPublish extends IvyTask {
 
     private boolean forcedeliver;
 
-    private Collection artifacts = new ArrayList();
+    private Collection<Artifact> artifacts = new ArrayList<Artifact>();
 
     private String pubBranch;
 
@@ -190,7 +190,7 @@ public class IvyPublish extends IvyTask {
     }
 
     public String getArtifactspattern() {
-        return (String) (artifactspattern.isEmpty() ? null : artifactspattern.get(0));
+        return artifactspattern.isEmpty() ? null : artifactspattern.get(0);
     }
 
     public void setArtifactspattern(String artifactsPattern) {
@@ -222,6 +222,7 @@ public class IvyPublish extends IvyTask {
         this.merge = merge;
     }
 
+    @Override
     public void doExecute() throws BuildException {
         Ivy ivy = getIvyInstance();
         IvySettings settings = ivy.getSettings();
@@ -312,14 +313,10 @@ public class IvyPublish extends IvyTask {
                 mrid,
                 artifactspattern,
                 publishResolverName,
-                new PublishOptions()
-                        .setPubrevision(getPubrevision())
-                        .setPubbranch(getPubbranch())
-                        .setSrcIvyPattern(publishivy ? srcivypattern : null)
-                        .setStatus(getStatus())
+                new PublishOptions().setPubrevision(getPubrevision()).setPubbranch(getPubbranch())
+                        .setSrcIvyPattern(publishivy ? srcivypattern : null).setStatus(getStatus())
                         .setPubdate(pubdate)
-                        .setExtraArtifacts(
-                            (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()]))
+                        .setExtraArtifacts(artifacts.toArray(new Artifact[artifacts.size()]))
                         .setValidate(doValidate(settings)).setOverwrite(overwrite)
                         .setUpdate(update).setMerge(merge).setWarnOnMissing(warnonmissing)
                         .setHaltOnMissing(haltonmissing).setConfs(splitConfs(conf)));
@@ -392,7 +389,7 @@ public class IvyPublish extends IvyTask {
 
         private String type;
 
-        private Map extra = new HashMap();
+        private Map<String, String> extra = new HashMap<String, String>();
 
         public String[] getConfigurations() {
             return null;
@@ -439,22 +436,22 @@ public class IvyPublish extends IvyTask {
         }
 
         public String getAttribute(String attName) {
-            return (String) extra.get(attName);
+            return extra.get(attName);
         }
 
-        public Map getAttributes() {
+        public Map<String, String> getAttributes() {
             return extra;
         }
 
         public String getExtraAttribute(String attName) {
-            return (String) extra.get(attName);
+            return extra.get(attName);
         }
 
-        public Map getExtraAttributes() {
+        public Map<String, String> getExtraAttributes() {
             return extra;
         }
 
-        public Map getQualifiedExtraAttributes() {
+        public Map<String, String> getQualifiedExtraAttributes() {
             return extra;
         }
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/src/java/org/apache/ivy/ant/IvyTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyTask.java b/src/java/org/apache/ivy/ant/IvyTask.java
index 3533480..6d65c34 100644
--- a/src/java/org/apache/ivy/ant/IvyTask.java
+++ b/src/java/org/apache/ivy/ant/IvyTask.java
@@ -265,6 +265,7 @@ public abstract class IvyTask extends Task {
     /**
      * Ant task execute. Calls prepareTask, doExecute, finalzeTask
      */
+    @Override
     public final void execute() throws BuildException {
         try {
             prepareTask();
@@ -282,6 +283,7 @@ public abstract class IvyTask extends Task {
      */
     public abstract void doExecute() throws BuildException;
 
+    @Override
     public String toString() {
         return getClass().getName() + ":" + getTaskName();
     }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/src/java/org/apache/ivy/core/publish/PublishEngine.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/publish/PublishEngine.java b/src/java/org/apache/ivy/core/publish/PublishEngine.java
index 4fa43a2..6b42a35 100644
--- a/src/java/org/apache/ivy/core/publish/PublishEngine.java
+++ b/src/java/org/apache/ivy/core/publish/PublishEngine.java
@@ -26,7 +26,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -75,8 +74,9 @@ public class PublishEngine {
      * the name, type, ext url and extra attributes of the artifacts are really used. Other methods
      * can return null safely.
      */
-    public Collection publish(ModuleRevisionId mrid, Collection srcArtifactPattern,
-            String resolverName, PublishOptions options) throws IOException {
+    public Collection<Artifact> publish(ModuleRevisionId mrid,
+            Collection<String> srcArtifactPattern, String resolverName, PublishOptions options)
+            throws IOException {
         Message.info(":: publishing :: " + mrid.getModuleId());
         Message.verbose("\tvalidate = " + options.isValidate());
         long start = System.currentTimeMillis();
@@ -111,7 +111,8 @@ public class PublishEngine {
                     tmp.deleteOnExit();
 
                     String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md);
-                    Set confsToRemove = new HashSet(Arrays.asList(md.getConfigurationsNames()));
+                    Set<String> confsToRemove = new HashSet<String>(Arrays.asList(md
+                            .getConfigurationsNames()));
                     confsToRemove.removeAll(Arrays.asList(confs));
 
                     try {
@@ -131,8 +132,7 @@ public class PublishEngine {
                                     .setMerge(options.isMerge())
                                     .setMergedDescriptor(md)
                                     .setConfsToExclude(
-                                        (String[]) confsToRemove.toArray(new String[confsToRemove
-                                                .size()])));
+                                        confsToRemove.toArray(new String[confsToRemove.size()])));
                         ivyFile = tmp;
                         // we parse the new file to get updated module descriptor
                         md = XmlModuleDescriptorParser.getInstance().parseDescriptor(settings,
@@ -169,15 +169,15 @@ public class PublishEngine {
         }
 
         // collect all declared artifacts of this module
-        Collection missing = publish(md, srcArtifactPattern, resolver, options);
+        Collection<Artifact> missing = publish(md, srcArtifactPattern, resolver, options);
         Message.verbose("\tpublish done (" + (System.currentTimeMillis() - start) + "ms)");
         return missing;
     }
 
-    public Collection publish(ModuleDescriptor md, Collection srcArtifactPattern,
+    public Collection<Artifact> publish(ModuleDescriptor md, Collection<String> srcArtifactPattern,
             DependencyResolver resolver, PublishOptions options) throws IOException {
-        Collection missing = new ArrayList();
-        Set artifactsSet = new LinkedHashSet();
+        Collection<Artifact> missing = new ArrayList<Artifact>();
+        Set<Artifact> artifactsSet = new LinkedHashSet<Artifact>();
         String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md);
 
         for (int i = 0; i < confs.length; i++) {
@@ -195,11 +195,9 @@ public class PublishEngine {
             }
         }
         // now collects artifacts files
-        Map/* <Artifact,File> */artifactsFiles = new LinkedHashMap();
-        for (Iterator iter = artifactsSet.iterator(); iter.hasNext();) {
-            Artifact artifact = (Artifact) iter.next();
-            for (Iterator iterator = srcArtifactPattern.iterator(); iterator.hasNext();) {
-                String pattern = (String) iterator.next();
+        Map<Artifact, File> artifactsFiles = new LinkedHashMap<Artifact, File>();
+        for (Artifact artifact : artifactsSet) {
+            for (String pattern : srcArtifactPattern) {
                 File artifactFile = settings.resolveFile(IvyPatternHelper.substitute(
                     settings.substitute(pattern), artifact));
                 if (artifactFile.exists()) {
@@ -210,8 +208,7 @@ public class PublishEngine {
             if (!artifactsFiles.containsKey(artifact)) {
                 StringBuffer sb = new StringBuffer();
                 sb.append("missing artifact " + artifact + ":\n");
-                for (Iterator iterator = srcArtifactPattern.iterator(); iterator.hasNext();) {
-                    String pattern = (String) iterator.next();
+                for (String pattern : srcArtifactPattern) {
                     sb.append("\t"
                             + settings.resolveFile(IvyPatternHelper.substitute(pattern, artifact))
                             + " file does not exist\n");
@@ -253,10 +250,9 @@ public class PublishEngine {
         try {
             resolver.beginPublishTransaction(md.getModuleRevisionId(), options.isOverwrite());
             // for each declared published artifact in this descriptor, do:
-            for (Iterator iter = artifactsFiles.entrySet().iterator(); iter.hasNext();) {
-                Map.Entry entry = (Entry) iter.next();
-                Artifact artifact = (Artifact) entry.getKey();
-                File artifactFile = (File) entry.getValue();
+            for (Entry<Artifact, File> entry : artifactsFiles.entrySet()) {
+                Artifact artifact = entry.getKey();
+                File artifactFile = entry.getValue();
                 publish(artifact, artifactFile, resolver, options.isOverwrite());
             }
             resolver.commitPublishTransaction();


[3/4] ant-ivy git commit: Get into account the order of the defined mapping for ivy:makepom

Posted by hi...@apache.org.
Get into account the order of the defined mapping for ivy:makepom


Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/47465314
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/47465314
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/47465314

Branch: refs/heads/master
Commit: 4746531428aaf9e3ae7d505b5a203350d138ea41
Parents: 89a0de6
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Jan 18 16:07:05 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Jan 18 17:21:10 2015 +0100

----------------------------------------------------------------------
 src/java/org/apache/ivy/ant/IvyMakePom.java     | 30 +++++++++-----------
 .../parser/m2/PomModuleDescriptorWriter.java    |  3 +-
 .../ivy/plugins/parser/m2/PomWriterOptions.java | 17 +++++------
 3 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/47465314/src/java/org/apache/ivy/ant/IvyMakePom.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyMakePom.java b/src/java/org/apache/ivy/ant/IvyMakePom.java
index 406b155..395a4ad 100644
--- a/src/java/org/apache/ivy/ant/IvyMakePom.java
+++ b/src/java/org/apache/ivy/ant/IvyMakePom.java
@@ -22,15 +22,14 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 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.PomWriterOptions.ExtraDependency;
 import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
 import org.apache.ivy.util.FileUtil;
 import org.apache.tools.ant.BuildException;
@@ -152,9 +151,9 @@ public class IvyMakePom extends IvyTask {
 
     private String description;
 
-    private Collection mappings = new ArrayList();
+    private List<Mapping> mappings = new ArrayList<Mapping>();
 
-    private Collection dependencies = new ArrayList();
+    private List<Dependency> dependencies = new ArrayList<Dependency>();
 
     public File getPomFile() {
         return pomFile;
@@ -240,6 +239,7 @@ public class IvyMakePom extends IvyTask {
         return dependency;
     }
 
+    @Override
     public void doExecute() throws BuildException {
         try {
             if (ivyFile == null) {
@@ -281,10 +281,9 @@ public class IvyMakePom extends IvyTask {
         return options;
     }
 
-    private Map getMappingsMap() {
-        Map mappingsMap = new HashMap();
-        for (Iterator iter = mappings.iterator(); iter.hasNext();) {
-            Mapping mapping = (Mapping) iter.next();
+    private Map<String, String> getMappingsMap() {
+        Map<String, String> mappingsMap = new LinkedHashMap<String, String>();
+        for (Mapping mapping : mappings) {
             String[] mappingConfs = splitConfs(mapping.getConf());
             for (int i = 0; i < mappingConfs.length; i++) {
                 if (!mappingsMap.containsKey(mappingConfs[i])) {
@@ -295,13 +294,12 @@ public class IvyMakePom extends IvyTask {
         return mappingsMap;
     }
 
-    private List getDependencies() {
-        List result = new ArrayList();
-        for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
-            Dependency dependency = (Dependency) iter.next();
-            result.add(new PomWriterOptions.ExtraDependency(dependency.getGroup(), dependency
-                    .getArtifact(), dependency.getVersion(), dependency.getScope(), dependency
-                    .getType(), dependency.getClassifier(), dependency.getOptional()));
+    private List<ExtraDependency> getDependencies() {
+        List<ExtraDependency> result = new ArrayList<ExtraDependency>();
+        for (Dependency dependency : dependencies) {
+            result.add(new ExtraDependency(dependency.getGroup(), dependency.getArtifact(),
+                    dependency.getVersion(), dependency.getScope(), dependency.getType(),
+                    dependency.getClassifier(), dependency.getOptional()));
         }
         return result;
     }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/47465314/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 5cd254a..646d3b5 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
@@ -28,6 +28,7 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,7 +52,7 @@ public final class PomModuleDescriptorWriter {
     private static final String SKIP_LINE = "SKIP_LINE";
 
     private static final ConfigurationScopeMapping DEFAULT_MAPPING = new ConfigurationScopeMapping(
-            new HashMap() {
+            new LinkedHashMap<String, String>() {
                 {
                     put("compile", "compile");
                     put("runtime", "runtime");

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/47465314/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java b/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
index 544d932..212ea1b 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
@@ -19,7 +19,7 @@ package org.apache.ivy.plugins.parser.m2;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,7 +37,7 @@ public class PomWriterOptions {
 
     private String artifactPackaging;
 
-    private List/* <ExtraDependency> */extraDependencies = new ArrayList();
+    private List<ExtraDependency> extraDependencies = new ArrayList<ExtraDependency>();
 
     private String description;
 
@@ -91,11 +91,11 @@ public class PomWriterOptions {
         return this;
     }
 
-    public List/* <ExtraDependency> */getExtraDependencies() {
+    public List<ExtraDependency> getExtraDependencies() {
         return extraDependencies;
     }
 
-    public PomWriterOptions setExtraDependencies(List/* <ExtraDependency> */extraDependencies) {
+    public PomWriterOptions setExtraDependencies(List<ExtraDependency> extraDependencies) {
         this.extraDependencies = extraDependencies;
         return this;
     }
@@ -128,10 +128,11 @@ public class PomWriterOptions {
     }
 
     public static class ConfigurationScopeMapping {
-        private Map/* <String,String> */scopes;
+        private Map<String, String> scopes;
 
-        public ConfigurationScopeMapping(Map/* <String,String> */scopesMapping) {
-            this.scopes = new HashMap(scopesMapping);
+        public ConfigurationScopeMapping(Map<String, String> scopesMapping) {
+            // preserve the order
+            this.scopes = new LinkedHashMap<String, String>(scopesMapping);
         }
 
         /**
@@ -144,7 +145,7 @@ public class PomWriterOptions {
         public String getScope(String[] confs) {
             for (int i = 0; i < confs.length; i++) {
                 if (scopes.containsKey(confs[i])) {
-                    return (String) scopes.get(confs[i]);
+                    return scopes.get(confs[i]);
                 }
             }
 


[4/4] ant-ivy git commit: In ivy:makepom, if no description, use the one in the source ivy.xml

Posted by hi...@apache.org.
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 Lalevée <ni...@hibnet.org>
Authored: Sun Jan 18 17:25:42 2015 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
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);