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/12 22:39:32 UTC
svn commit: r984952 - in /ant/ivy/core/trunk/src/java/org/apache/ivy:
ant/IvyMakePom.java plugins/parser/m2/PomModuleDescriptorWriter.java
plugins/parser/m2/PomWriterOptions.java
Author: maartenc
Date: Thu Aug 12 20:39:31 2010
New Revision: 984952
URL: http://svn.apache.org/viewvc?rev=984952&view=rev
Log:
Fixed an issue with the ivy:makepom scope mapping if a dependency had more than 1 configuration or if more than 1 conf was specified (IVY-770)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java?rev=984952&r1=984951&r2=984952&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java Thu Aug 12 20:39:31 2010
@@ -229,7 +229,12 @@ public class IvyMakePom extends IvyTask
Map mappingsMap = new HashMap();
for (Iterator iter = mappings.iterator(); iter.hasNext();) {
Mapping mapping = (Mapping) iter.next();
- mappingsMap.put(mapping.getConf(), mapping.getScope());
+ String[] mappingConfs = splitConfs(mapping.getConf());
+ for (int i = 0; i < mappingConfs.length; i++) {
+ if (!mappingsMap.containsKey(mappingConfs[i])) {
+ mappingsMap.put(mappingConfs[i], mapping.getScope());
+ }
+ }
}
return mappingsMap;
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java?rev=984952&r1=984951&r2=984952&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java Thu Aug 12 20:39:31 2010
@@ -41,7 +41,7 @@ public final class PomModuleDescriptorWr
private static final ConfigurationScopeMapping DEFAULT_MAPPING
= new ConfigurationScopeMapping(new HashMap() {
{
- put("compile, runtime", "compile");
+ put("compile", "compile");
put("runtime", "runtime");
put("provided", "provided");
put("test", "test");
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java?rev=984952&r1=984951&r2=984952&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java Thu Aug 12 20:39:31 2010
@@ -22,8 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.ivy.util.StringUtils;
-
public class PomWriterOptions {
private String[] confs;
@@ -117,8 +115,15 @@ public class PomWriterOptions {
* @return the scope to which the conf is mapped
*/
public String getScope(String[] confs) {
- return (String) scopes.get(StringUtils.join(confs, ", "));
+ for (int i = 0; i < confs.length; i++) {
+ if (scopes.containsKey(confs[i])) {
+ return (String) scopes.get(confs[i]);
+ }
+ }
+
+ return null;
}
+
public boolean isOptional(String[] confs) {
return getScope(confs) == null;
}