diff options
author | Stanislav Ochotnicky <sochotnicky@redhat.com> | 2011-06-10 09:32:34 +0200 |
---|---|---|
committer | Stanislav Ochotnicky <sochotnicky@redhat.com> | 2011-06-10 09:32:34 +0200 |
commit | bd67d96a29c250373c7dda9cbc173f03a7d058f1 (patch) | |
tree | 94635b8af520b9937f032d7718006151fff3f9d4 /src/main/java/org/apache/maven/artifact | |
parent | 676915056de4f491fb1f49c67fb43e8552a5e282 (diff) | |
download | maven-javadir-resolver-bd67d96a29c250373c7dda9cbc173f03a7d058f1.tar.gz maven-javadir-resolver-bd67d96a29c250373c7dda9cbc173f03a7d058f1.tar.xz maven-javadir-resolver-bd67d96a29c250373c7dda9cbc173f03a7d058f1.zip |
Use maven.local instead of maven2.jpp
Diffstat (limited to 'src/main/java/org/apache/maven/artifact')
-rw-r--r-- | src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java b/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java index 6f2da41..14fcac5 100644 --- a/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java +++ b/src/main/java/org/apache/maven/artifact/repository/MavenJPackageDepmap.java @@ -50,8 +50,8 @@ public class MavenJPackageDepmap { Hashtable<String, String> jppDep; String idToCheck, jppCombination; - if (System.getProperty("maven2.ignore.versions") == null - && System.getProperty("maven2.jpp.mode") == null) { + if (System.getProperty("maven.ignore.versions") == null + && System.getProperty("maven.local.mode") == null) { idToCheck = groupId + "," + artifactId + "," + version; } else { idToCheck = groupId + "," + artifactId; @@ -87,8 +87,8 @@ public class MavenJPackageDepmap { String version) { String idToCheck; - if (System.getProperty("maven2.ignore.versions") == null - && System.getProperty("maven2.jpp.mode") == null) { + if (System.getProperty("maven.ignore.versions") == null + && System.getProperty("maven.local.mode") == null) { idToCheck = groupId + "," + artifactId + "," + version; } else { idToCheck = groupId + "," + artifactId; @@ -101,8 +101,8 @@ public class MavenJPackageDepmap { private static void buildJppArtifactMap() { - if (System.getProperty("maven2.ignore.versions") != null - || System.getProperty("maven2.jpp.mode") != null) { + if (System.getProperty("maven.ignore.versions") != null + || System.getProperty("maven.local.mode") != null) { debug("Processing file: /usr/share/java-utils/xml/maven2-versionless-depmap.xml"); processDepmapFile("/etc/maven/maven2-versionless-depmap.xml"); } @@ -110,7 +110,7 @@ public class MavenJPackageDepmap { debug("Processing file: /usr/share/java-utils/xml/maven2-depmap.xml"); processDepmapFile("/etc/maven/maven2-depmap.xml"); - String customFileName = System.getProperty("maven2.jpp.depmap.file", + String customFileName = System.getProperty("maven.local.depmap.file", null); if (customFileName != null) { debug("Processing file: " + customFileName); @@ -169,8 +169,8 @@ public class MavenJPackageDepmap { if (jppNodeList.getLength() == 1) { jppAD = getArtifactDefinition((Element) jppNodeList.item(0)); - if (System.getProperty("maven2.ignore.versions") == null - && System.getProperty("maven2.jpp.mode") == null) { + if (System.getProperty("maven.ignore.versions") == null + && System.getProperty("maven.local.mode") == null) { debug("*** Adding: " + mavenAD.groupId + "," + mavenAD.artifactId + "," + mavenAD.version + " => " + jppAD.groupId + "," + jppAD.artifactId @@ -229,7 +229,7 @@ public class MavenJPackageDepmap { } public static void debug(String msg) { - if (System.getProperty("maven2.jpp.debug") != null) + if (System.getProperty("maven.local.debug") != null) System.err.println(msg); } } |