Look in other places for settings.xml

Fixes gh-208

Author: Dave Syer

README.md

@@ -577,7 +577,10 @@ also use a system property `maven.repo.local` (or `maven.home` which
 defaults to `${user.home}/.m2`) when you launch the thin jar, but not
 a command line flag. The Maven and Gradle plugins respond to the
 `settings.xml` and also (with Maven) to `-Dmaven.repo.local` as a
-command line flag.
+command line flag. When the launcher runs it also looks in `${thin.root}/..`
+for a `settings.xml` file and uses that in preference to any other location
+if it exists. (For historical reasons it also looks in `${thin.root}/.m2`
+but that directory is unlikely to exist.)
 
 ## How to Configure a Proxy
 

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

@@ -39,8 +39,8 @@
 import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
 
 /**
- * {@code MavenSettingsReader} reads settings from a user's Maven settings.xml file,
- * decrypting them if necessary using settings-security.xml.
+ * {@code MavenSettingsReader} reads settings from a user's Maven settings.xml
+ * file, decrypting them if necessary using settings-security.xml.
  *
  * @author Andy Wilkinson
  * @since 1.3.0
@@ -57,7 +57,20 @@ public MavenSettingsReader() {
 
 	public MavenSettingsReader(String homeDir) {
 		if (homeDir == null) {
-			homeDir = System.getProperty("settings.home", System.getProperty("user.home"));
+			homeDir = System.getProperty("settings.home");
+			if (homeDir == null) {
+				homeDir = System.getProperty("maven.repo.local");
+				if (homeDir != null) {
+					homeDir = new File(homeDir).getParent();
+					if (homeDir != null) {
+						homeDir = new File(homeDir).getParent();
+					} else {
+						homeDir = System.getProperty("user.home");
+					}
+				} else {
+					homeDir = System.getProperty("user.home");
+				}
+			}
 		}
 		this.homeDir = homeDir;
 	}
@@ -77,8 +90,7 @@ public static void applySettings(MavenSettings settings, DefaultRepositorySystem
 			try {
 				session.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory().newInstance(session,
 						new LocalRepository(settings.getLocalRepository())));
-			}
-			catch (NoLocalRepositoryManagerException e) {
+			} catch (NoLocalRepositoryManagerException e) {
 				throw new IllegalStateException("Cannot set local repository to " + settings.getLocalRepository(), e);
 			}
 		}
@@ -92,14 +104,27 @@ private Settings loadSettings() {
 		File settingsFile = new File(this.homeDir, ".m2/settings.xml");
 		if (settingsFile.exists()) {
 			log.info("Reading settings from: " + settingsFile);
-		}
-		else {
+		} 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);
+			settingsFile = new File(this.homeDir, "../settings.xml");
+			if (settingsFile.exists()) {
+				log.info("Reading settings from: " + settingsFile);
+			} else {
+				String home = System.getProperty("maven.repo.local");
+				if (home != null
+						&& !new File(home).getAbsolutePath().equals(new File(this.homeDir).getAbsolutePath())) {
+					settingsFile = new File(home, "../settings.xml");
+					if (settingsFile.exists()) {
+						log.info("Reading settings from: " + settingsFile);
+					}
+				} else {
+					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);
+						}
+					}
 				}
 			}
 		}
@@ -112,8 +137,7 @@ private Settings loadSettings(File settingsFile) {
 		request.setSystemProperties(System.getProperties());
 		try {
 			return new DefaultSettingsBuilderFactory().newInstance().build(request).getEffectiveSettings();
-		}
-		catch (SettingsBuildingException ex) {
+		} catch (SettingsBuildingException ex) {
 			throw new IllegalStateException("Failed to build settings from " + settingsFile, ex);
 		}
 	}
@@ -136,8 +160,7 @@ private void setField(Class<?> sourceClass, String fieldName, Object target, Obj
 			Field field = sourceClass.getDeclaredField(fieldName);
 			field.setAccessible(true);
 			field.set(target, value);
-		}
-		catch (Exception ex) {
+		} catch (Exception ex) {
 			throw new IllegalStateException("Failed to set field '" + fieldName + "' on '" + target + "'", ex);
 		}
 	}
@@ -151,8 +174,7 @@ private class SpringBootSecDispatcher extends DefaultSecDispatcher {
 			this._configurationFile = file.getAbsolutePath();
 			try {
 				this._cipher = new DefaultPlexusCipher();
-			}
-			catch (PlexusCipherException e) {
+			} catch (PlexusCipherException e) {
 				throw new IllegalStateException(e);
 			}
 		}

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

@@ -40,6 +40,32 @@ public void canReadSettings() {
 		assertThat(settings).isNotNull();
 	}
 
+	@Test
+	public void canReadSettingsAtThinRoot() {
+		MavenSettingsReader reader = new MavenSettingsReader(
+				"src/test/resources/settings/proxy/.m2");
+		MavenSettings settings = reader.readSettings();
+		assertThat(settings).isNotNull();
+	}
+
+	@Test
+	public void canReadSettingsAtMavenRepoLocal() {
+		System.setProperty("maven.repo.local",
+				"src/test/resources/settings/proxy/.m2/repository");
+		try {
+
+			MavenSettingsReader reader = new MavenSettingsReader();
+			MavenSettings settings = reader.readSettings();
+			assertThat(settings).isNotNull();
+			RemoteRepository remote = new RemoteRepository.Builder("central", null, "https://central-mirror.example.com/maven2")
+					.setContentType("default").build();
+			RemoteRepository mirror = settings.getMirrorSelector().getMirror(remote);
+			assertThat(mirror).isNotNull();
+		} finally {
+			System.clearProperty("maven.repo.local");
+		}
+	}
+
 	@Test
 	public void proxyConfiguration() {
 		MavenSettingsReader reader = new MavenSettingsReader(
@@ -130,7 +156,8 @@ public void credentialsConfiguration() {
 		RemoteRepository remote = new RemoteRepository.Builder(repo.getId(), null, repo.getUrl()).build();
 		Authentication authentication = settings.getAuthenticationSelector().getAuthentication(remote);
 		assertThat(authentication).isNotNull();
-		remote = new RemoteRepository.Builder(repo.getId(), null, repo.getUrl()).setAuthentication(authentication).build();
+		remote = new RemoteRepository.Builder(repo.getId(), null, repo.getUrl()).setAuthentication(authentication)
+				.build();
 		AuthenticationContext context = AuthenticationContext.forRepository(session,
 				remote);
 		assertThat(context).isNotNull();
@@ -145,7 +172,8 @@ public void mirrorConfiguration() {
 		assertThat(settings.getActiveProfiles().get(0).getRepositories().get(0))
 				.isNotNull();
 		MavenSettingsReader.applySettings(settings, session);
-		RemoteRepository remote = new RemoteRepository.Builder("remote", null, "https://remote").setContentType("default").build();
+		RemoteRepository remote = new RemoteRepository.Builder("remote", null, "https://remote")
+				.setContentType("default").build();
 		RemoteRepository mirror = settings.getMirrorSelector().getMirror(remote);
 		assertThat(mirror).isNotNull();
 	}