Roll spring-boot-maven-settings into the CLI

sendskk · Jan 14, 2014 · 895daac · 895daac
1 parent 719b47f
commit 895daac
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 48 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,6 @@
 				<module>spring-boot-actuator</module>
 				<module>spring-boot-starters</module>
 				<module>spring-boot-cli</module>
-				<module>spring-boot-maven-settings</module>
 			</modules>
 		</profile>
 		<profile>

diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
@@ -36,11 +36,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-boot-maven-settings</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy-xml</artifactId>
@@ -82,6 +77,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-settings-builder</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.aether</groupId>
 			<artifactId>aether-api</artifactId>

diff --git a/...sitorySystemSessionAutoConfiguration.java → ...sitorySystemSessionAutoConfiguration.java b/...sitorySystemSessionAutoConfiguration.java → ...sitorySystemSessionAutoConfiguration.java
@@ -1,4 +1,4 @@
-package org.springframework.boot.maven.settings;
+package org.springframework.boot.cli.compiler.grape;
 
 import java.io.File;
 
@@ -23,7 +23,6 @@
 import org.eclipse.aether.util.repository.DefaultAuthenticationSelector;
 import org.eclipse.aether.util.repository.DefaultMirrorSelector;
 import org.eclipse.aether.util.repository.DefaultProxySelector;
-import org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration;
 
 /**
  * Auto-configuration for a RepositorySystemSession that uses Maven's settings.xml to

diff --git a/...ices/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration b/...ices/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
@@ -0,0 +1 @@
+org.springframework.boot.cli.compiler.grape.SettingsXmlRepositorySystemSessionAutoConfiguration
diff --git a/...ySystemSessionAutoConfigurationTests.java → ...ySystemSessionAutoConfigurationTests.java b/...ySystemSessionAutoConfigurationTests.java → ...ySystemSessionAutoConfigurationTests.java
@@ -1,4 +1,4 @@
-package org.springframework.boot.maven.settings;
+package org.springframework.boot.cli.compiler.grape;
 
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
 import org.apache.maven.settings.building.SettingsBuildingException;
@@ -11,6 +11,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.boot.cli.compiler.grape.SettingsXmlRepositorySystemSessionAutoConfiguration;
 
 import static org.junit.Assert.assertNotNull;
 

diff --git a/spring-boot-maven-settings/pom.xml b/spring-boot-maven-settings/pom.xml
diff --git a/...ices/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration b/...ices/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		org.springframework.boot.cli.compiler.grape.SettingsXmlRepositorySystemSessionAutoConfiguration