Revert "Replace runing external process and parsing output with simple Proces…"

This reverts commit 0b19014.

Author: Tibor17

maven-surefire-common/pom.xml

@@ -172,6 +172,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <version>2.21.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/Platform.java

@@ -29,7 +29,7 @@
 
 /**
  * Loads platform specifics.
- * TODO simplify or remove when Java 8 support is dropped
+ *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.20.1
  */
@@ -80,6 +80,11 @@ public Platform withJdkExecAttributesForTests(JdkAttributes jdk) {
     }
 
     private static Callable<Long> pidJob() {
-        return SystemUtils::pid;
+        return new Callable<Long>() {
+            @Override
+            public Long call() throws Exception {
+                return SystemUtils.pid();
+            }
+        };
     }
 }

maven-surefire-plugin/src/site/apt/examples/shutdown.apt.vm

@@ -55,13 +55,9 @@ Shutdown of Forked JVM
 
    []
 
-   If Java9 is available, the start time of the process is determined by <<< ProcessHandle.current().info().startInstant() >>>.
-
    On Unix like systems the process' uptime is determined by native command <<< (/usr)/bin/ps -o etime= -p [PID] >>>.
 
-   On Windows the start time is determined using <<< powershell -command "... Get-CimInstance Win32_Process ..." >>>.
-
-   []
+   On Windows the start time is determined using <<< wmic process where (ProcessId=[PID]) get CreationDate >>>
    in the forked JVM.
 
 

surefire-booter/pom.xml

@@ -91,11 +91,6 @@
       <artifactId>powermock-api-mockito2</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java

@@ -215,7 +215,7 @@ private void closeForkChannel() {
     }
 
     private PingScheduler listenToShutdownCommands(String ppid) {
-        ProcessChecker ppidChecker = ProcessChecker.of(ppid);
+        PpidChecker ppidChecker = ppid == null ? null : new PpidChecker(ppid);
         commandReader.addShutdownListener(createExitHandler(ppidChecker));
         AtomicBoolean pingDone = new AtomicBoolean(true);
         commandReader.addNoopListener(createPingHandler(pingDone));
@@ -280,7 +280,7 @@ public void update(Command command) {
         };
     }
 
-    private CommandListener createExitHandler(final ProcessChecker ppidChecker) {
+    private CommandListener createExitHandler(final PpidChecker ppidChecker) {
         return new CommandListener() {
             @Override
             public void update(Command command) {
@@ -325,7 +325,7 @@ public void update(Command command) {
         };
     }
 
-    private Runnable createPingJob(final AtomicBoolean pingDone, final ProcessChecker pluginProcessChecker) {
+    private Runnable createPingJob(final AtomicBoolean pingDone, final PpidChecker pluginProcessChecker) {
         return new Runnable() {
             @Override
             public void run() {
@@ -515,7 +515,7 @@ private static void run(ForkedBooter booter, String[] args) {
         }
     }
 
-    private static boolean canUseNewPingMechanism(ProcessChecker pluginProcessChecker) {
+    private static boolean canUseNewPingMechanism(PpidChecker pluginProcessChecker) {
         return pluginProcessChecker != null && pluginProcessChecker.canUse();
     }
 
@@ -553,12 +553,12 @@ private static boolean isDebugging() {
     private static class PingScheduler {
         private final ScheduledExecutorService pingScheduler;
         private final ScheduledExecutorService processCheckerScheduler;
-        private final ProcessChecker processChecker;
+        private final PpidChecker processChecker;
 
         PingScheduler(
                 ScheduledExecutorService pingScheduler,
                 ScheduledExecutorService processCheckerScheduler,
-                ProcessChecker processChecker) {
+                PpidChecker processChecker) {
             this.pingScheduler = pingScheduler;
             this.processCheckerScheduler = processCheckerScheduler;
             this.processChecker = processChecker;

surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java

@@ -57,18 +57,11 @@
 
 /**
  * Recognizes PID of Plugin process and determines lifetime.
- * <p>
- * This implementation uses native commands ({@code ps} on Unix, {@code powershell} on Windows)
- * to check the parent process status. On Java 9+, consider using {@code ProcessHandleChecker}
- * instead, which uses the Java {@code ProcessHandle} API and doesn't require spawning external processes.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.20.1
- * @see ProcessChecker
- * @deprecated Use {@code ProcessHandleChecker} via {@link ProcessChecker#of(String)} instead
  */
-@Deprecated
-final class PpidChecker implements ProcessChecker {
+final class PpidChecker {
     private static final long MINUTES_TO_MILLIS = 60L * 1000L;
     // 25 chars https://superuser.com/questions/937380/get-creation-time-of-file-in-milliseconds/937401#937401
     private static final int WMIC_CREATION_DATE_VALUE_LENGTH = 25;
@@ -102,8 +95,7 @@ final class PpidChecker implements ProcessChecker {
         this.ppid = ppid;
     }
 
-    @Override
-    public boolean canUse() {
+    boolean canUse() {
         if (isStopped()) {
             return false;
         }
@@ -119,8 +111,7 @@ public boolean canUse() {
      *                               or this object has been {@link #destroyActiveCommands() destroyed}
      * @throws NullPointerException if extracted e-time is null
      */
-    @Override
-    public boolean isProcessAlive() {
+    boolean isProcessAlive() {
         if (!canUse()) {
             throw new IllegalStateException("irrelevant to call isProcessAlive()");
         }
@@ -235,16 +226,14 @@ ProcessInfo consumeLine(String line, ProcessInfo previousProcessInfo) throws Exc
         return reader.execute(psPath + "powershell", "-NoProfile", "-NonInteractive", "-Command", psCommand);
     }
 
-    @Override
-    public void destroyActiveCommands() {
+    void destroyActiveCommands() {
         stopped = true;
         for (Process p = destroyableCommands.poll(); p != null; p = destroyableCommands.poll()) {
             p.destroy();
         }
     }
 
-    @Override
-    public boolean isStopped() {
+    boolean isStopped() {
         return stopped;
     }
 
@@ -336,16 +325,10 @@ private static SimpleDateFormat createWindowsCreationDateFormat() {
         return formatter;
     }
 
-    @Override
     public void stop() {
         stopped = true;
     }
 
-    @Override
-    public ProcessInfo processInfo() {
-        return parentProcessInfo;
-    }
-
     /**
      * Reads standard output from {@link Process}.
      * <br>