commit 9761d157baf5d67aef68d3d3ce8a12c121d87c94
author Gili Tzabari <a-gtzabari@expedia.com> Sat Jan 26 15:45:29 2019 -0500
committer Gili Tzabari <a-gtzabari@expedia.com> Sat Jan 26 15:45:29 2019 -0500
tree e329d7adaba789c13f8c670547c2be7877654b68
parent 8e7b2655555b35109566428ee32f8cb7459a7f79

Avoid converting separator characters into newline.
Updated testCustomConfiguration() because JDK 11.0.2 behaves the same as JDK 12.

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

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 @@
                             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 @@
                 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 @@
                 }

                 

                 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 @@
         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 @@
         else

         {

             addArgIfNotEmpty( arguments, "-sourcepath",

-                              JavadocUtil.quotedPathArgument( getSourcePath( sourcePaths ) ) );

+                              JavadocUtil.quotedPathArgument( getSourcePath( sourcePaths ) ), false, false );

         }

 

 

src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java

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 @@
         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" ) );

         }