[maven-javadoc-plugin] branch master updated: Avoid converting separator characters into newline. Updated testCustomConfiguration() because JDK 11.0.2 behaves the same as JDK 12.

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 9761d15  Avoid converting separator characters into newline. Updated 
testCustomConfiguration() because JDK 11.0.2 behaves the same as JDK 12.
     new c2681a4  [MJAVADOC-570] --add-modules expects comma-separated arguments
9761d15 is described below

commit 9761d157baf5d67aef68d3d3ce8a12c121d87c94
Author: Gili Tzabari <a-gtzab...@expedia.com>
AuthorDate: Sat Jan 26 15:45:29 2019 -0500

    Avoid converting separator characters into newline.
    Updated testCustomConfiguration() because JDK 11.0.2 behaves the same as 
JDK 12.
---
 .../maven/plugins/javadoc/AbstractJavadocMojo.java       | 16 ++++++++++------
 .../apache/maven/plugins/javadoc/JavadocReportTest.java  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java 
b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 4ddab70..a98a48c 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -4964,7 +4964,8 @@ public abstract class AbstractJavadocMojo
                             additionalModules.add( moduleName );
                             
                             addArgIfNotEmpty( arguments, "--patch-module", 
moduleName + '='
-                                + JavadocUtil.quotedPathArgument( 
getSourcePath( projectSourcepaths.getValue() ) ) );
+                                 + JavadocUtil.quotedPathArgument( 
getSourcePath( projectSourcepaths.getValue() ) ),
+                                   false, false );
                             
                             Path modulePath = moduleSourceDir.resolve( 
moduleName );
                             if ( !Files.isDirectory( modulePath ) )
@@ -5076,7 +5077,8 @@ public abstract class AbstractJavadocMojo
                 additionalModules.addAll( addModules );
 
                 String addModulesLine = StringUtils.join( 
addModules.iterator(), "," );
-                addArgIfNotEmpty( arguments, "--add-modules", 
JavadocUtil.quotedPathArgument( addModulesLine ) );
+                addArgIfNotEmpty( arguments, "--add-modules", 
JavadocUtil.quotedPathArgument( addModulesLine ),
+                                  false, false );
             }
 
             request.setAdditionalModules( additionalModules );
@@ -5106,11 +5108,13 @@ public abstract class AbstractJavadocMojo
                 }
                 
                 String classpath = StringUtils.join( 
classPathElements.iterator(), File.pathSeparator );
-                addArgIfNotEmpty( arguments, "--class-path", 
JavadocUtil.quotedPathArgument( classpath ) );
+                addArgIfNotEmpty( arguments, "--class-path", 
JavadocUtil.quotedPathArgument( classpath ), false,
+                                  false );
                 
                 String modulepath =
                     StringUtils.join( modulePathElements.iterator(), 
File.pathSeparator );
-                addArgIfNotEmpty( arguments, "--module-path", 
JavadocUtil.quotedPathArgument( modulepath ) );
+                addArgIfNotEmpty( arguments, "--module-path", 
JavadocUtil.quotedPathArgument( modulepath ), false,
+                                  false );
             }
             catch ( IOException e )
             {
@@ -5120,7 +5124,7 @@ public abstract class AbstractJavadocMojo
         else
         {
             String classpath = StringUtils.join( getPathElements().iterator(), 
File.pathSeparator );
-            addArgIfNotEmpty( arguments, "-classpath", 
JavadocUtil.quotedPathArgument( classpath ) );
+            addArgIfNotEmpty( arguments, "-classpath", 
JavadocUtil.quotedPathArgument( classpath ) , false, false );
         }
         
         if ( StringUtils.isNotEmpty( doclet ) )
@@ -5176,7 +5180,7 @@ public abstract class AbstractJavadocMojo
         else
         {
             addArgIfNotEmpty( arguments, "-sourcepath",
-                              JavadocUtil.quotedPathArgument( getSourcePath( 
sourcePaths ) ) );
+                              JavadocUtil.quotedPathArgument( getSourcePath( 
sourcePaths ) ), false, false );
         }
 
 
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 4716434..a3cf34d 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -394,7 +394,7 @@ public class JavadocReportTest
         assertTrue( str.toUpperCase().contains( "SAMPLE BOTTOM CONTENT" ) );
 
         // offlineLinks
-        if ( JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore( "12" ) )
+        if ( JavaVersion.JAVA_VERSION.isBefore( "11.0.2" ) )
         {
             assertTrue( str.toLowerCase().contains( 
"href=\"http://java.sun.com/j2se/1.4.2/docs/api/java/lang/string.html"; ) );
         }