From 8dcb349b079c2bd389a28312a215590cf0c0a2fa Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Mon, 26 Apr 2021 17:56:19 +0100 Subject: [PATCH] JAL-3743 JAL-3745 Fixed NullPointerExceptions happening with linkCheck and jalviewjsTranspile tasks when gradle >= 6.6 --- build.gradle | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 180d4ad..fc37a00 100644 --- a/build.gradle +++ b/build.gradle @@ -1299,13 +1299,12 @@ task linkCheck(type: JavaExec) { args = [ "${classesDir}/${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("${classesDir}/${help_dir}") outputs.file(helpLinksCheckerOutFile) @@ -2418,12 +2417,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, -- 1.7.10.2