You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/12/26 22:50:09 UTC
[maven-javadoc-plugin] branch MJAVADOC-469 created (now ccbc18d)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MJAVADOC-469
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
at ccbc18d Prototype
This branch includes the following new commits:
new ccbc18d Prototype
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-javadoc-plugin] 01/01: Prototype
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MJAVADOC-469
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit ccbc18d4fae0cb989c6906abf05b650d64ae26f9
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Dec 26 23:49:48 2018 +0100
Prototype
---
.../additional-dependencies-non-aggregate/pom.xml | 15 ++++++++-------
src/it/projects/additional-dependencies/pom.xml | 13 +++++++------
.../apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 12 +++++++++++-
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/it/projects/additional-dependencies-non-aggregate/pom.xml b/src/it/projects/additional-dependencies-non-aggregate/pom.xml
index ec8d186..3e9188c 100644
--- a/src/it/projects/additional-dependencies-non-aggregate/pom.xml
+++ b/src/it/projects/additional-dependencies-non-aggregate/pom.xml
@@ -103,14 +103,15 @@
-->
<bootclasspath>${sun.boot.class.path}</bootclasspath>
<additionalOptions>
- <additionalOption>
- <!-- comment as produce an NPE
+ <!-- comment as produce an NPE
-federate JDK http://docs.oracle.com/javase/6/docs/api/index.html?
- -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml -->
- -hdf project.name "${project.name}"
- -d ${project.build.directory}/site/apidocs
- </additionalOption>
- </additionalOptions>
+ -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml -->
+ <additionalOption>-hdf</additionalOption>
+ <additionalOption>project.name</additionalOption>
+ <additionalOption>"${project.name}"</additionalOption>
+ <additionalOption>-d</additionalOption>
+ <additionalOption>${project.build.directory}/site/apidocs</additionalOption>
+ </additionalOptions>
<useStandardDocletOptions>false</useStandardDocletOptions>
<!--
| Apple's JVM sometimes requires more memory
diff --git a/src/it/projects/additional-dependencies/pom.xml b/src/it/projects/additional-dependencies/pom.xml
index 91def63..042318c 100644
--- a/src/it/projects/additional-dependencies/pom.xml
+++ b/src/it/projects/additional-dependencies/pom.xml
@@ -103,13 +103,14 @@
-->
<bootclasspath>${sun.boot.class.path}</bootclasspath>
<additionalOptions>
- <additionalOption>
- <!-- comment as produce an NPE
+ <!-- comment as produce an NPE
-federate JDK http://docs.oracle.com/javase/6/docs/api/index.html?
- -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml -->
- -hdf project.name "${project.name}"
- -d ${project.build.directory}/site/apidocs
- </additionalOption>
+ -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml -->
+ <additionalOption>-hdf</additionalOption>
+ <additionalOption>project.name</additionalOption>
+ <additionalOption>"${project.name}"</additionalOption>
+ <additionalOption>-d</additionalOption>
+ <additionalOption>${project.build.directory}/site/apidocs</additionalOption>
</additionalOptions>
<useStandardDocletOptions>false</useStandardDocletOptions>
<!--
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 e7c8bbc..58f9ea5 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -5002,7 +5002,17 @@ public abstract class AbstractJavadocMojo
if ( additionalOptions != null && additionalOptions.length > 0 )
{
- Collections.addAll( arguments, additionalOptions );
+ for ( String additionalOption : additionalOptions )
+ {
+ if ( additionalOption.contains( "\\" ) )
+ {
+ arguments.add( JavadocUtil.quotedPathArgument( additionalOption ) );
+ }
+ else
+ {
+ arguments.add( additionalOption );
+ }
+ }
}
}