root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-06-18 17:02:49 +01:00
parent a21b48a95c 7d80f0efea
commit c60d65823b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.cli.compiler.grape; package org.springframework.boot.cli.compiler.grape;
import java.io.File;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystem;
@ -103,7 +105,7 @@ public class GrapeRootRepositorySystemSessionAutoConfigurationTests {
assertThat(this.session.getLocalRepository(), is(notNullValue())); assertThat(this.session.getLocalRepository(), is(notNullValue()));
assertThat(this.session.getLocalRepository().getBasedir().getAbsolutePath(), assertThat(this.session.getLocalRepository().getBasedir().getAbsolutePath(),
endsWith("/foo/repository")); endsWith(File.separatorChar + "foo" + File.separatorChar + "repository"));
} }
private class LocalRepositoryManagerAnswer implements Answer<LocalRepositoryManager> { private class LocalRepositoryManagerAnswer implements Answer<LocalRepositoryManager> {

4
spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.cli.compiler.grape; package org.springframework.boot.cli.compiler.grape;
import java.io.File;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.settings.building.SettingsBuildingException; import org.apache.maven.settings.building.SettingsBuildingException;
import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.DefaultRepositorySystemSession;
@ -98,7 +100,7 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
} }
assertThat(session.getLocalRepository().getBasedir().getAbsolutePath(), assertThat(session.getLocalRepository().getBasedir().getAbsolutePath(),
endsWith("/bar/repository")); endsWith(File.separatorChar + "bar" + File.separatorChar + "repository"));
} }
private void assertSessionCustomization(String userHome) { private void assertSessionCustomization(String userHome) {