Skip to content

Commit 8bb5d8d

Browse files
authored
Allow MAVEN_HOME or M2_HOME for integration tests (#235)
1 parent c861441 commit 8bb5d8d

File tree

2 files changed

+9
-132
lines changed

2 files changed

+9
-132
lines changed

applications/spring-shell/src/test/java/org/springframework/sbm/IntegrationTestBaseClass.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,18 @@ public abstract class IntegrationTestBaseClass {
110110

111111
@BeforeAll
112112
public static void beforeAll() {
113-
if (System.getenv("MAVEN_HOME") == null) {
113+
String mvnHome = System.getenv("MAVEN_HOME");
114+
115+
if (mvnHome == null) {
116+
mvnHome = System.getenv("M2_HOME");
117+
}
118+
119+
if (mvnHome == null) {
114120
System.err.println("You must set $MAVEN_HOME on your system for the integration test to run.");
115121
throw new RuntimeException();
116122
}
117-
System.setProperty("maven.home", System.getenv("MAVEN_HOME"));
123+
124+
System.setProperty("maven.home", mvnHome);
118125
}
119126

120127
@BeforeEach

components/sbm-openrewrite/src/test/java/org/springframework/sbm/openrewrite/maven/BumpParentVersionTest.java

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)