Merge branch '3.0.x'

spring-cloud · Sep 8, 2023 · 9ced614 · 9ced614 · wind57 · Sep 8, 2023
2 parents 35c3e06 + df10283
commit 9ced614
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml b/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml
@@ -21,7 +21,7 @@ runs:
       shell: bash
       run: |
         cd spring-cloud-kubernetes-test-support
-        .././mvnw -q exec:java -Dexec.mainClass="org.springframework.cloud.kubernetes.tests.discovery.TestsDiscovery" > /tmp/tests.txt
+        .././mvnw -q exec:java -Prun-on-github-actions -Dexec.mainClass="org.springframework.cloud.kubernetes.tests.discovery.TestsDiscovery" > /tmp/tests.txt
         cd ..
 
     - name: show result

diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml
@@ -49,24 +49,33 @@
 
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.1.0</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>java</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<mainClass>org.springframework.cloud.kubernetes.tests.discovery.TestsDiscovery</mainClass>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+
+	<profiles>
+		<profile>
+			<id>run-on-github-actions</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>3.1.0</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>java</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<mainClass>org.springframework.cloud.kubernetes.tests.discovery.TestsDiscovery</mainClass>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
 </project>
diff --git a/...rt/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java b/...rt/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java
@@ -31,6 +31,7 @@
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.LauncherSession;
 import org.junit.platform.launcher.TestIdentifier;
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
@@ -57,12 +58,15 @@ public static void main(String[] args) throws Exception {
 		LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
 				.selectors(DiscoverySelectors.selectClasspathRoots(paths)).build();
 
-		Launcher launcher = LauncherFactory.openSession().getLauncher();
-		TestPlan testPlan = launcher.discover(request);
-		testPlan.getRoots().stream().flatMap(x -> testPlan.getChildren(x).stream())
+		try (LauncherSession session = LauncherFactory.openSession()) {
+			Launcher launcher = session.getLauncher();
+			TestPlan testPlan = launcher.discover(request);
+			testPlan.getRoots().stream().flatMap(x -> testPlan.getChildren(x).stream())
 				.map(TestIdentifier::getLegacyReportingName).sorted().forEach(test -> {
 					System.out.println("spring.cloud.k8s.test.to.run -> " + test);
 				});
+		}
+
 	}
 
 	private static void replaceClassloader(List<URL> classpathURLs) {
@@ -73,7 +77,9 @@ private static void replaceClassloader(List<URL> classpathURLs) {
 
 	// /tmp/deps.txt are created by the pipeline
 	private static List<String> entireClasspath() throws Exception {
-		return Files.lines(Paths.get("/tmp/deps.txt")).distinct().collect(Collectors.toList());
+		try (Stream<String> lines = Files.lines(Paths.get("/tmp/deps.txt"))) {
+			return lines.distinct().collect(Collectors.toList());
+		}
 	}
 
 	private static URL toURL(URI uri) {