Merge pull request ome#4159 from melissalinkert/file-leak-detector-ja…

…va-21 Turn off file-leak-detector if tests are run with Java 21
melissalinkert · Mar 18, 2024 · 8bcb3c3 · 8bcb3c3
2 parents c824ed0 + 10c1b7e
commit 8bcb3c3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/components/test-suite/pom.xml b/components/test-suite/pom.xml
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>file-leak-detector</artifactId>
-      <version>1.15</version>
+      <version>${file-leak-detector.version}</version>
       <!-- the regular jar does not specify a main class -->
       <classifier>jar-with-dependencies</classifier>
       <exclusions>
@@ -129,6 +129,27 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>jdk8-compatible</id>
+      <activation>
+        <jdk>(,11)</jdk>
+      </activation>
+      <properties>
+        <file-leak-detector.version>1.15</file-leak-detector.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk21-compatible</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <properties>
+        <file-leak-detector.version>1.18</file-leak-detector.version>
+      </properties>
+    </profile>
+  </profiles>
+
   <developers>
     <developer>
       <id>curtis</id>

diff --git a/components/test-suite/src/loci/tests/testng/FormatReaderTestFactory.java b/components/test-suite/src/loci/tests/testng/FormatReaderTestFactory.java
@@ -67,6 +67,8 @@ public class FormatReaderTestFactory {
 
   @Factory
   public Object[] createInstances() {
+    LOGGER.info("java.version = {}", System.getProperty("java.version"));
+
     List<String> files = new ArrayList<String>();
 
     // parse explicit filename, if any