Check thin.root than user.home for settings.xml

Fixes gh-99

Author: dsyer

launcher/src/main/java/org/springframework/boot/loader/thin/DependencyResolver.java

@@ -157,7 +157,7 @@ private void dispose() {
 	private DependencyResolver() {
 	}
 
-	private void initialize() {
+	private void initialize(Properties properties) {
 		if (this.container == null) {
 			synchronized (lock) {
 				if (this.container == null) {
@@ -185,7 +185,7 @@ private void initialize() {
 						throw new IllegalStateException("Cannot create container", e);
 					}
 					this.container = container;
-					this.settings = new MavenSettingsReader().readSettings();
+					this.settings = new MavenSettingsReader(properties.getProperty(THIN_ROOT)).readSettings();
 				}
 			}
 		}
@@ -203,7 +203,7 @@ public List<Dependency> dependencies(final Resource resource,
 			model = ThinPropertiesModelProcessor.process(model, properties);
 			return aetherDependencies(model.getDependencies(), properties);
 		}
-		initialize();
+		initialize(properties);
 		try {
 			log.info("Computing dependencies from pom and properties");
 			ProjectBuildingRequest request = getProjectBuildingRequest(properties);
@@ -252,7 +252,7 @@ private List<Dependency> aetherDependencies(
 			Dependency converted = new Dependency(artifact, "runtime");
 			list.add(converted);
 		}
-		initialize();
+		initialize(properties);
 		List<ArtifactResult> result = collectNonTransitive(list, properties);
 		list = new ArrayList<>();
 		for (ArtifactResult item : result) {
@@ -289,9 +289,10 @@ private String coordinates(Dependency dependency) {
 	}
 
 	public File resolve(Dependency dependency) {
-		initialize();
+		Properties properties = new Properties();
+		initialize(properties);
 		// TODO: do we need a version of this with non-empty properties?
-		return collectNonTransitive(Arrays.asList(dependency), new Properties())
+		return collectNonTransitive(Arrays.asList(dependency), properties)
 				.iterator().next().getArtifact().getFile();
 	}
 
@@ -569,7 +570,7 @@ public Model readModel(Resource resource) {
 	}
 
 	public Model readModel(final Resource resource, final Properties properties) {
-		initialize();
+		initialize(properties);
 		try {
 			ProjectBuildingRequest request = getProjectBuildingRequest(properties);
 			request.setResolveDependencies(false);

launcher/src/main/java/org/springframework/boot/loader/thin/MavenSettingsReader.java

@@ -56,6 +56,9 @@ public MavenSettingsReader() {
 	}
 
 	public MavenSettingsReader(String homeDir) {
+		if (homeDir==null) {
+			homeDir = System.getProperty("user.home");
+		}
 		this.homeDir = homeDir;
 	}
 
@@ -97,7 +100,18 @@ private Settings loadSettings() {
 		}
 		else {
 			log.info("No settings found at: " + settingsFile);
+			String home = System.getProperty("user.home");
+			if (!new File(home).getAbsolutePath().equals(new File(this.homeDir).getAbsolutePath())) {
+				settingsFile = new File(home, ".m2/settings.xml");
+				if (settingsFile.exists()) {
+					log.info("Reading settings from: " + settingsFile);
+				}
+			}
 		}
+		return loadSettings(settingsFile);
+	}
+	
+	private Settings loadSettings(File settingsFile) {
 		SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();
 		request.setUserSettingsFile(settingsFile);
 		request.setSystemProperties(System.getProperties());

launcher/src/test/java/org/springframework/boot/loader/thin/AdhocTestSuite.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.loader.thin;
+
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * A test suite for probing weird ordering problems in the tests.
+ *
+ * @author Dave Syer
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ DependencyResolverSettingsTests.class, ThinJarLauncherTests.class })
+@Ignore
+public class AdhocTestSuite {
+
+}

launcher/src/test/java/org/springframework/boot/loader/thin/DependencyResolverModelTests.java

@@ -62,8 +62,8 @@ public boolean matches(Dependency value) {
 
 	private ProjectBuildingRequest getProjectBuildingRequest(
 			DependencyResolver resolver) {
-		ReflectionTestUtils.invokeMethod(resolver, "initialize");
 		Properties properties = new Properties();
+		ReflectionTestUtils.invokeMethod(resolver, "initialize", properties);
 		ProjectBuildingRequest request = ReflectionTestUtils.invokeMethod(resolver,
 				"getProjectBuildingRequest", properties);
 		return request;

launcher/src/test/java/org/springframework/boot/loader/thin/DependencyResolverSettingsTests.java

@@ -20,6 +20,7 @@
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.assertj.core.api.filter.NotFilter;
 import org.junit.After;
 import org.junit.Test;
 
@@ -55,17 +56,28 @@ public void testVanilla() throws Exception {
 
 	@Test
 	public void testProxy() throws Exception {
-		DependencyResolver.close();
 		System.setProperty("user.home", "src/test/resources/settings/proxy");
+		DependencyResolver.close();
 		DependencyResolver resolver = DependencyResolver.instance();
 		ProjectBuildingRequest request = getProjectBuildingRequest(resolver);
 		assertThat(request.getRemoteRepositories()).filteredOnNull("proxy").isEmpty();
 	}
 
 	@Test
-	public void testLocalRepository() throws Exception {
+	public void testThinRoot() throws Exception {
+		Properties properties = new Properties();
+		properties.setProperty("thin.root", "src/test/resources/settings/proxy");
 		DependencyResolver.close();
+		DependencyResolver resolver = DependencyResolver.instance();
+		ProjectBuildingRequest request = getProjectBuildingRequest(resolver, properties);
+		assertThat(request.getRemoteRepositories())
+				.filteredOn("proxy", NotFilter.not(null)).isNotEmpty();
+	}
+
+	@Test
+	public void testLocalRepository() throws Exception {
 		System.setProperty("user.home", "src/test/resources/settings/local");
+		DependencyResolver.close();
 		DependencyResolver resolver = DependencyResolver.instance();
 		ProjectBuildingRequest request = getProjectBuildingRequest(resolver);
 		assertThat(request.getLocalRepository().getUrl())
@@ -74,9 +86,9 @@ public void testLocalRepository() throws Exception {
 
 	@Test
 	public void testSnaphotsEnabledByDefault() throws Exception {
-		DependencyResolver.close();
 		System.setProperty("user.home",
 				"src/test/resources/settings/snapshots/defaultWithNoSnapshotsElement");
+		DependencyResolver.close();
 		DependencyResolver resolver = DependencyResolver.instance();
 		ProjectBuildingRequest request = getProjectBuildingRequest(resolver);
 		List<ArtifactRepository> repositories = request.getRemoteRepositories();
@@ -87,8 +99,13 @@ public void testSnaphotsEnabledByDefault() throws Exception {
 
 	private ProjectBuildingRequest getProjectBuildingRequest(
 			DependencyResolver resolver) {
-		ReflectionTestUtils.invokeMethod(resolver, "initialize");
 		Properties properties = new Properties();
+		return getProjectBuildingRequest(resolver, properties);
+	}
+
+	private ProjectBuildingRequest getProjectBuildingRequest(DependencyResolver resolver,
+			Properties properties) {
+		ReflectionTestUtils.invokeMethod(resolver, "initialize", properties);
 		ProjectBuildingRequest request = ReflectionTestUtils.invokeMethod(resolver,
 				"getProjectBuildingRequest", properties);
 		return request;

launcher/src/test/java/org/springframework/boot/loader/thin/ThinJarLauncherTests.java

@@ -89,13 +89,15 @@ public void emptyProperties() throws Exception {
 		launcher.launch(args);
 		verify(resolver).dependencies(any(Resource.class), props.capture());
 		assertThat(props.getValue()).isEmpty();
+		DependencyResolver.close();
 	}
 
 	@Test
 	public void profileProperties() throws Exception {
 		String[] args = new String[] { "--thin.classpath",
 				"--thin.archive=src/test/resources/apps/basic", "--thin.profile=foo" };
 		ThinJarLauncher launcher = new ThinJarLauncher(args);
+		DependencyResolver.close();
 		DependencyResolver resolver = mock(DependencyResolver.class);
 		ReflectionTestUtils.setField(DependencyResolver.class, "instance", resolver);
 		ArgumentCaptor<Properties> props = ArgumentCaptor.forClass(Properties.class);