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 <[email protected]> Authored: Sun Jan 18 17:18:54 2015 +0100 Committer: Nicolas Lalevée <[email protected]> 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())) {
