From 80018a8b8aa6706c757938456206e269f42356c3 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Fri, 10 Jun 2011 11:14:50 +0200 Subject: Add /usr/share/maven-poms to pom resolving paths --- .../maven/artifact/resolver/JavadirWorkspaceReader.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src') 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 22033cb..b84974b 100644 --- a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java +++ b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java @@ -1,15 +1,14 @@ package org.apache.maven.artifact.resolver; -import org.apache.maven.artifact.repository.MavenJPackageDepmap; - import java.io.File; -import java.util.List; -import java.util.LinkedList; import java.util.Hashtable; +import java.util.LinkedList; +import java.util.List; +import org.apache.maven.artifact.repository.MavenJPackageDepmap; +import org.sonatype.aether.artifact.Artifact; import org.sonatype.aether.repository.WorkspaceReader; import org.sonatype.aether.repository.WorkspaceRepository; -import org.sonatype.aether.artifact.Artifact; public class JavadirWorkspaceReader implements WorkspaceReader { private WorkspaceRepository workspaceRepository; @@ -101,12 +100,20 @@ public class JavadirWorkspaceReader implements WorkspaceReader { return new StringBuffer(f.getPath()); } + // now maven 3 specific repository f = new File(System.getProperty("maven.local.default.repo", "/usr/share/maven/repository") + "/" + m3path); if (f.exists()) { return new StringBuffer(f.getPath()); } + // now try new path in /usr. This will be the only check after all + // packages are rebuilt + f = new File("/usr/share/maven-poms/" + fName); + if (f.exists()) { + return new StringBuffer(f.getPath()); + } + // final fallback to m2 default poms return new StringBuffer("/usr/share/maven2/repository/" + System.getProperty("maven.local.default.repo", -- cgit