GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Roll spring-boot-maven-settings into the CLI

pull/234/head
Andy Wilkinson 12 years ago
parent
719b47fad8
commit
895daacde9
7 changed files with 8 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      pom.xml
  2. 9
      spring-boot-cli/pom.xml
  3. 3
      spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
  4. 1
      spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
  5. 3
      spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
  6. 38
      spring-boot-maven-settings/pom.xml
  7. 1
      spring-boot-maven-settings/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration

1
pom.xml
Unescape View File

@ -37,7 +37,6 @@ @@ -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>

9
spring-boot-cli/pom.xml
Unescape View File

@ -36,11 +36,6 @@ @@ -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 @@ @@ -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>

3
spring-boot-maven-settings/src/main/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
Unescape View File

@ -1,4 +1,4 @@ @@ -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.ConservativeAuthenticationSelector; @@ -23,7 +23,6 @@ import org.eclipse.aether.util.repository.ConservativeAuthenticationSelector;
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

1
spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
Unescape View File

@ -0,0 +1 @@ @@ -0,0 +1 @@
org.springframework.boot.cli.compiler.grape.SettingsXmlRepositorySystemSessionAutoConfiguration

3
spring-boot-maven-settings/src/test/java/org/springframework/boot/maven/settings/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java → spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
Unescape View File

@ -1,4 +1,4 @@ @@ -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.rules.ExpectedException; @@ -11,6 +11,7 @@ import org.junit.rules.ExpectedException;
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;

38
spring-boot-maven-settings/pom.xml
Unescape View File

@ -1,38 +0,0 @@ @@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-boot-parent</relativePath>
</parent>
<artifactId>spring-boot-maven-settings</artifactId>
<packaging>jar</packaging>
<properties>
<main.basedir>${basedir}/..</main.basedir>
</properties>
<dependencies>
<!-- Compile -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings-builder</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
</dependency>
<!-- Provided -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-cli</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

1
spring-boot-maven-settings/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.grape.RepositorySystemSessionAutoConfiguration
Unescape View File

@ -1 +0,0 @@ @@ -1 +0,0 @@
org.springframework.boot.maven.settings.SettingsXmlRepositorySystemSessionAutoConfiguration
Write Preview
Loading…
Cancel
Save