You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2019/05/31 12:37:04 UTC
[ant-ivy] branch master updated: Use the correct XML namespace URI
in the Ivy module descriptor generated out of a pom.xml
This is an automated email from the ASF dual-hosted git repository.
jaikiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-ivy.git
The following commit(s) were added to refs/heads/master by this push:
new 3cdf475 Use the correct XML namespace URI in the Ivy module descriptor generated out of a pom.xml
3cdf475 is described below
commit 3cdf4752ec2422c44caa536969569e23456416e6
Author: Jaikiran Pai <ja...@apache.org>
AuthorDate: Fri May 31 18:06:45 2019 +0530
Use the correct XML namespace URI in the Ivy module descriptor generated out of a pom.xml
---
.../apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
index 482cf0f..c1accb8 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
@@ -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;
}