natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the correct XML namespace URI in the Ivy module descriptor generated out of a pom.xml

This commit is contained in:
Jaikiran Pai 2019-05-31 18:06:45 +05:30
parent 0114c604b6
commit 3cdf4752ec
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
View File

@ -28,7 +28,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.apache.ivy.Ivy;
import org.apache.ivy.core.cache.ArtifactOrigin;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.Configuration;
@ -64,6 +63,12 @@ import static org.apache.ivy.util.StringUtils.isNullOrEmpty;
*/
public class PomModuleDescriptorBuilder {
/**
* The namespace URI which is used to refer to Maven (pom) specific elements within a
* Ivy module descriptor file (ivy.xml)
*/
private static final String IVY_XML_MAVEN_NAMESPACE_URI = "http://ant.apache.org/ivy/maven";
private static final int DEPENDENCY_MANAGEMENT_KEY_PARTS_COUNT = 4;
public static final Configuration[] MAVEN2_CONFIGURATIONS = new Configuration[] {
@ -199,7 +204,7 @@ public class PomModuleDescriptorBuilder {
ivyModuleDescriptor.addConfiguration(m2conf);
}
ivyModuleDescriptor.setMappingOverride(true);
ivyModuleDescriptor.addExtraAttributeNamespace("m", Ivy.getIvyHomeURL() + "maven");
ivyModuleDescriptor.addExtraAttributeNamespace("m", IVY_XML_MAVEN_NAMESPACE_URI);
parserSettings = ivySettings;
}