diff options
author | Stanislav Ochotnicky <sochotnicky@redhat.com> | 2011-06-22 11:49:04 +0200 |
---|---|---|
committer | Stanislav Ochotnicky <sochotnicky@redhat.com> | 2011-06-22 16:57:18 +0200 |
commit | 0bca7acc36f76a8a128736fce51cc83556bb4f0c (patch) | |
tree | 7aa5158f82e32443320cfb511b3c01221e28a83d /src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java | |
parent | 80018a8b8aa6706c757938456206e269f42356c3 (diff) | |
download | maven-javadir-resolver-0bca7acc36f76a8a128736fce51cc83556bb4f0c.tar.gz maven-javadir-resolver-0bca7acc36f76a8a128736fce51cc83556bb4f0c.tar.xz maven-javadir-resolver-0bca7acc36f76a8a128736fce51cc83556bb4f0c.zip |
Fix handling of fallback pom destinations
Diffstat (limited to 'src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java')
-rw-r--r-- | src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java index b84974b..9fe54f1 100644 --- a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java +++ b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java @@ -84,25 +84,18 @@ public class JavadirWorkspaceReader implements WorkspaceReader { } private StringBuffer getPOMPath(String groupId, String artifactId) { - String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom"; - String m2path = System.getProperty("maven2.local.pom.path", - "JPP/maven2/poms") + "/" + fName; - String m3path = System.getProperty("maven.local.pom.path", - "JPP/maven/poms") + "/" + fName; File f; // let's try maven 2 repo first - f = new File(System.getProperty("maven2.local.default.repo", - "/usr/share/maven2/repository") + "/" + m2path); + f = new File("/usr/share/maven2/poms/" + fName); if (f.exists()) { return new StringBuffer(f.getPath()); } // now maven 3 specific repository - f = new File(System.getProperty("maven.local.default.repo", - "/usr/share/maven/repository") + "/" + m3path); + f = new File("/usr/share/maven/poms/" + fName); if (f.exists()) { return new StringBuffer(f.getPath()); } @@ -115,8 +108,6 @@ public class JavadirWorkspaceReader implements WorkspaceReader { } // final fallback to m2 default poms - return new StringBuffer("/usr/share/maven2/repository/" - + System.getProperty("maven.local.default.repo", - "JPP/maven2/default_poms") + "/" + fName); + return new StringBuffer("/usr/share/maven2/default_poms/" + fName); } } |