This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch Jenkins_investigation in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit d1ba6b27e93f4dcadb9c7c3622d8e98d079f4c1f Author: rfscholte <[email protected]> AuthorDate: Sat Jan 6 14:40:46 2018 +0100 show output javadoc -J-version show content javadoc file --- .../org/apache/maven/plugins/javadoc/JavadocUtil.java | 16 +++++++++++++--- .../apache/maven/plugins/javadoc/JavadocReportTest.java | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java index f575455..5c37f72 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -540,13 +540,23 @@ public class JavadocUtil if ( StringUtils.isNotEmpty( err.getOutput() ) ) { - return JavadocVersion.parse( extractJavadocVersion( err.getOutput() ) ); + JavadocVersion jv= JavadocVersion.parse( extractJavadocVersion( err.getOutput() ) ); +// if ( "2".equals( jv.toString() ) ) + { + System.out.print( "stderr: " + err.getOutput() ); + } + return jv; } else if ( StringUtils.isNotEmpty( out.getOutput() ) ) { - return JavadocVersion.parse( extractJavadocVersion( out.getOutput() ) ); + JavadocVersion jv= JavadocVersion.parse( extractJavadocVersion( out.getOutput() ) ); +// if ( "2".equals( jv.toString() ) ) + { + System.out.print( "stdout: " + out.getOutput() ); + } + return jv; } - + throw new IllegalArgumentException( "No output found from the command line 'javadoc -J-version'" ); } diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java index a521839..516a26b 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -237,7 +237,7 @@ public class JavadocReportTest connection.setRequestMethod( "HEAD" ); if ( connection.getResponseCode() == 200 ) { - assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ).contains( "/docs/api/java/lang/Object.html" ) ); + assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ), FileUtils.fileRead( generatedFile, "UTF-8" ).contains( "/docs/api/java/lang/Object.html" ) ); } assertTrue( new File( apidocs, "def/configuration/AppSample.html" ).exists() ); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
