From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 26 Apr 2021 16:56:19 +0000 (+0100)
Subject: JAL-3743 JAL-3745 Fixed NullPointerExceptions happening with linkCheck and jalviewjsT... 
X-Git-Tag: Release_2_11_2_0~47^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=10e125b60d03d284571d4b5a682f4449a936e4ff;p=jalview.git

JAL-3743 JAL-3745 Fixed NullPointerExceptions happening with linkCheck and jalviewjsTranspile tasks when gradle >= 6.6
---

diff --git a/build.gradle b/build.gradle
index e2a5605..7146d31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1368,13 +1368,12 @@ task linkCheck(type: JavaExec) {
   args = [ "${helpBuildDir}/${help_dir}", "-nointernet" ]
 
   def outFOS = new FileOutputStream(helpLinksCheckerOutFile, false) // false == don't append
-  def errFOS = outFOS
   standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
     outFOS,
-    standardOutput)
+    System.out)
   errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
     outFOS,
-    errorOutput)
+    System.err)
 
   inputs.dir(helpBuildDir)
   outputs.file(helpLinksCheckerOutFile)
@@ -2531,12 +2530,12 @@ DEBUG: ${eclipseDebug}
         new org.apache.tools.ant.util.TeeOutputStream(
           logOutFOS,
           stdout),
-        standardOutput)
+        System.out)
       errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
         new org.apache.tools.ant.util.TeeOutputStream(
           logErrFOS,
           stderr),
-        errorOutput)
+        System.err)
     } else {
       standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
         logOutFOS,