diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
index 543229d97b1..a7d824dcc31 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
@@ -25,6 +25,8 @@ import org.apache.maven.settings.Profile;
 import org.apache.maven.settings.Repository;
 
 import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
+import org.springframework.boot.cli.compiler.maven.MavenSettings;
+import org.springframework.boot.cli.compiler.maven.MavenSettingsReader;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
index e0fb35153bf..b0438f71696 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
@@ -20,8 +20,8 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.repository.LocalRepository;
 
-import org.springframework.boot.cli.compiler.MavenSettings;
-import org.springframework.boot.cli.compiler.MavenSettingsReader;
+import org.springframework.boot.cli.compiler.maven.MavenSettings;
+import org.springframework.boot.cli.compiler.maven.MavenSettingsReader;
 
 /**
  * Auto-configuration for a RepositorySystemSession that uses Maven's settings.xml to
@@ -35,14 +35,7 @@ public class SettingsXmlRepositorySystemSessionAutoConfiguration
 	@Override
 	public void apply(DefaultRepositorySystemSession session,
 			RepositorySystem repositorySystem) {
-
-		MavenSettings settings = new MavenSettingsReader().readSettings();
-
-		session.setOffline(settings.getOffline());
-		session.setMirrorSelector(settings.getMirrorSelector());
-		session.setAuthenticationSelector(settings.getAuthenticationSelector());
-		session.setProxySelector(settings.getProxySelector());
-
+		MavenSettings settings = getSettings(session);
 		String localRepository = settings.getLocalRepository();
 		if (localRepository != null) {
 			session.setLocalRepositoryManager(repositorySystem.newLocalRepositoryManager(
@@ -50,4 +43,13 @@ public class SettingsXmlRepositorySystemSessionAutoConfiguration
 		}
 	}
 
+	private MavenSettings getSettings(DefaultRepositorySystemSession session) {
+		MavenSettings settings = new MavenSettingsReader().readSettings();
+		session.setOffline(settings.getOffline());
+		session.setMirrorSelector(settings.getMirrorSelector());
+		session.setAuthenticationSelector(settings.getAuthenticationSelector());
+		session.setProxySelector(settings.getProxySelector());
+		return settings;
+	}
+
 }
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettings.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
similarity index 99%
rename from spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettings.java
rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
index a589c49b99a..08ca2a6382d 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettings.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler;
+package org.springframework.boot.cli.compiler.maven;
 
 import java.io.File;
 import java.io.PrintWriter;
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettingsReader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java
similarity index 98%
rename from spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettingsReader.java
rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java
index 82fd97c8803..97d0fa7196d 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettingsReader.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler;
+package org.springframework.boot.cli.compiler.maven;
 
 import java.io.File;
 import java.lang.reflect.Field;