From 28bffc8b7fa059bfa075d4c9943ff3420a7962ab Mon Sep 17 00:00:00 2001 From: Jared Stehler Date: Fri, 30 Jun 2023 16:16:15 -0400 Subject: [PATCH 1/3] log all compiler output at debug level --- .../codehaus/plexus/compiler/javac/JavacCompiler.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java index dbee1de9..ab5a0f90 100644 --- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java +++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java @@ -563,6 +563,10 @@ protected CompilerResult compileOutOfProcess(CompilerConfiguration config, Strin try { returnCode = CommandLineUtils.executeCommandLine(cli, out, out); + if (log.isDebugEnabled()) { + log.debug("Compiler output:\n{}", out.getOutput()); + } + messages = parseModernStream(returnCode, new BufferedReader(new StringReader(out.getOutput()))); } catch (CommandLineException | IOException e) { throw new CompilerException("Error while executing the external compiler.", e); @@ -605,7 +609,7 @@ protected CompilerResult compileInProcessWithProperClassloader(Class javacCla /** * Helper method for compileInProcess() */ - private static CompilerResult compileInProcess0(Class javacClass, String[] args) throws CompilerException { + private CompilerResult compileInProcess0(Class javacClass, String[] args) throws CompilerException { StringWriter out = new StringWriter(); Integer ok; @@ -617,6 +621,10 @@ private static CompilerResult compileInProcess0(Class javacClass, String[] ar ok = (Integer) compile.invoke(null, new Object[] {args, new PrintWriter(out)}); + if (log.isDebugEnabled()) { + log.debug("Compiler output:\n{}", out.toString()); + } + messages = parseModernStream(ok, new BufferedReader(new StringReader(out.toString()))); } catch (NoSuchMethodException | IOException | InvocationTargetException | IllegalAccessException e) { throw new CompilerException("Error while executing the compiler.", e); From 20152f3141e34336d97a7591941402e6ab2d7936 Mon Sep 17 00:00:00 2001 From: Jared Stehler Date: Wed, 12 Jul 2023 10:31:46 -0400 Subject: [PATCH 2/3] use platform-specific EOL --- .../org/codehaus/plexus/compiler/javac/JavacCompiler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java index ab5a0f90..9fb41f34 100644 --- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java +++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java @@ -564,7 +564,7 @@ protected CompilerResult compileOutOfProcess(CompilerConfiguration config, Strin returnCode = CommandLineUtils.executeCommandLine(cli, out, out); if (log.isDebugEnabled()) { - log.debug("Compiler output:\n{}", out.getOutput()); + log.debug("Compiler output:{}{}", EOL, out.getOutput()); } messages = parseModernStream(returnCode, new BufferedReader(new StringReader(out.getOutput()))); @@ -622,7 +622,7 @@ private CompilerResult compileInProcess0(Class javacClass, String[] args) thr ok = (Integer) compile.invoke(null, new Object[] {args, new PrintWriter(out)}); if (log.isDebugEnabled()) { - log.debug("Compiler output:\n{}", out.toString()); + log.debug("Compiler output:{}{}", EOL, out.toString()); } messages = parseModernStream(ok, new BufferedReader(new StringReader(out.toString()))); From 2ef5eee338405d8ddc0c4630adfbe6812b283afa Mon Sep 17 00:00:00 2001 From: Jared Stehler Date: Wed, 28 Aug 2024 08:41:35 -0400 Subject: [PATCH 3/3] fix build for logger scope --- .../org/codehaus/plexus/compiler/javac/JavacCompiler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java index c56866fa..a621d1d2 100644 --- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java +++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java @@ -545,8 +545,8 @@ protected CompilerResult compileOutOfProcess(CompilerConfiguration config, Strin try { returnCode = CommandLineUtils.executeCommandLine(cli, out, out); - if (log.isDebugEnabled()) { - log.debug("Compiler output:{}{}", EOL, out.getOutput()); + if (getLog().isDebugEnabled()) { + getLog().debug("Compiler output:{}{}", EOL, out.getOutput()); } messages = parseModernStream(returnCode, new BufferedReader(new StringReader(out.getOutput()))); @@ -603,8 +603,8 @@ private CompilerResult compileInProcess0(Class javacClass, String[] args) thr ok = (Integer) compile.invoke(null, new Object[] {args, new PrintWriter(out)}); - if (log.isDebugEnabled()) { - log.debug("Compiler output:{}{}", EOL, out.toString()); + if (getLog().isDebugEnabled()) { + getLog().debug("Compiler output:{}{}", EOL, out.toString()); } messages = parseModernStream(ok, new BufferedReader(new StringReader(out.toString())));