Skip to content

Commit b6a83eb

Browse files
committed
Allow integration tests to use custom repos
Update integration tests so that they can use a custom local Maven repository. See gh-9316
1 parent 4ff65d5 commit b6a83eb

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed

Diff for: spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<configuration>
5555
<systemPropertyVariables>
5656
<maven.home>${maven.home}</maven.home>
57+
<repository>${repository}</repository>
5758
</systemPropertyVariables>
5859
</configuration>
5960
</plugin>

Diff for: spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java

+8
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.Collections;
2626
import java.util.HashMap;
2727
import java.util.Map;
28+
import java.util.Properties;
2829
import java.util.jar.JarOutputStream;
2930
import java.util.zip.ZipEntry;
3031

@@ -37,6 +38,7 @@
3738
import org.junit.rules.TemporaryFolder;
3839

3940
import org.springframework.util.FileCopyUtils;
41+
import org.springframework.util.StringUtils;
4042

4143
import static org.assertj.core.api.Assertions.assertThat;
4244

@@ -128,6 +130,12 @@ private void packageApplication(File appFolder) throws MavenInvocationException
128130
InvocationRequest invocation = new DefaultInvocationRequest();
129131
invocation.setBaseDirectory(appFolder);
130132
invocation.setGoals(Collections.singletonList("package"));
133+
String repository = System.getProperty("repository");
134+
if (StringUtils.hasText(repository) && !repository.equals("${repository}")) {
135+
Properties properties = new Properties();
136+
properties.put("repository", repository);
137+
invocation.setProperties(properties);
138+
}
131139
InvocationResult execute = new DefaultInvoker().execute(invocation);
132140
assertThat(execute.getExitCode()).isEqualTo(0);
133141
}

Diff for: spring-boot-tests/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/resources/pom-template.xml

+28
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,32 @@
6161
</snapshots>
6262
</repository>
6363
</repositories>
64+
<profiles>
65+
<profile>
66+
<id>repository</id>
67+
<activation>
68+
<property>
69+
<name>repository</name>
70+
</property>
71+
</activation>
72+
<repositories>
73+
<repository>
74+
<id>repository</id>
75+
<url>${repository}</url>
76+
<snapshots>
77+
<enabled>true</enabled>
78+
</snapshots>
79+
</repository>
80+
</repositories>
81+
<pluginRepositories>
82+
<pluginRepository>
83+
<id>repository</id>
84+
<url>${repository}</url>
85+
<snapshots>
86+
<enabled>true</enabled>
87+
</snapshots>
88+
</pluginRepository>
89+
</pluginRepositories>
90+
</profile>
91+
</profiles>
6492
</project>

0 commit comments

Comments
 (0)