Browse Source

Attempt to allow Aether to load from local repo

pull/118/merge
Dave Syer 12 years ago
parent
commit
578fadf6f9
  1. 13
      spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

13
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

@ -114,11 +114,24 @@ public class AetherGrapeEngine implements GrapeEngine {
if (StringUtils.hasLength(grapeRoot)) { if (StringUtils.hasLength(grapeRoot)) {
return new File(grapeRoot); return new File(grapeRoot);
} }
return getDefaultM2HomeDirectory();
}
private File getDefaultM2HomeDirectory() {
String mavenRoot = System.getProperty("maven.home");
if (StringUtils.hasLength(mavenRoot)) {
return new File(mavenRoot);
}
return new File(System.getProperty("user.home"), ".m2"); return new File(System.getProperty("user.home"), ".m2");
} }
private Set<RemoteRepository> getRemoteRepositories() { private Set<RemoteRepository> getRemoteRepositories() {
LinkedHashSet<RemoteRepository> repositories = new LinkedHashSet<RemoteRepository>(); LinkedHashSet<RemoteRepository> repositories = new LinkedHashSet<RemoteRepository>();
String grapeRoot = System.getProperty("grape.root");
if (StringUtils.hasLength(grapeRoot)) {
addRemoteRepository(repositories, "local", new File(
getDefaultM2HomeDirectory(), "repository").toURI().toASCIIString());
}
addRemoteRepository(repositories, "central", "http://repo1.maven.org/maven2/"); addRemoteRepository(repositories, "central", "http://repo1.maven.org/maven2/");
return repositories; return repositories;
} }

Loading…
Cancel
Save