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

Don't use snapshot repos for CLI test 

Update SampleIntegrationTests to only use local maven repo when
running integration tests.
This commit is contained in:
Phillip Webb 2013-08-06 01:22:59 -07:00
parent e773db2401
commit f4c129a063
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java
View File

@ -85,10 +85,12 @@ class GrapeEngineCustomizer {
springBootResolver.setSettings(settings); springBootResolver.setSettings(settings);
springBootResolver.setName("springBoot"); springBootResolver.setName("springBoot");
springBootResolver.addSpringSnapshotResolver(newResolver("spring-snapshot", if (!Boolean.getBoolean("disableSpringSnapshotRepos")) {
"http://repo.springsource.org/snapshot")); springBootResolver.addSpringSnapshotResolver(newResolver("spring-snapshot",
springBootResolver.addSpringSnapshotResolver(newResolver("spring-milestone", "http://repo.springsource.org/snapshot"));
"http://repo.springsource.org/milestone")); springBootResolver.addSpringSnapshotResolver(newResolver("spring-milestone",
"http://repo.springsource.org/milestone"));
}
grapesResolver.getResolvers().clear(); grapesResolver.getResolvers().clear();
grapesResolver.getResolvers().add(springBootResolver); grapesResolver.getResolvers().add(springBootResolver);

11
spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
View File

@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.FileUtil;
import org.junit.After; import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@ -64,6 +65,16 @@ public class SampleIntegrationTests {
this.command = future.get(4, TimeUnit.MINUTES); this.command = future.get(4, TimeUnit.MINUTES);
} }
@Before
public void setup() {
System.setProperty("disableSpringSnapshotRepos", "true");
}
@After
public void teardown() {
System.clearProperty("disableSpringSnapshotRepos");
}
@After @After
public void stop() { public void stop() {
if (this.command != null) { if (this.command != null) {