You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2019/09/06 13:58:42 UTC
[sling-slingfeature-maven-plugin] branch master updated: SLING-8681
: Correct javadoc subpackages handlingCorrect javadoc subpackages handling
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 58d4dc4 SLING-8681 : Correct javadoc subpackages handlingCorrect javadoc subpackages handling
58d4dc4 is described below
commit 58d4dc488f123bf4c4fe4e7b1e1820a6a36a494d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 15:55:42 2019 +0200
SLING-8681 : Correct javadoc subpackages handlingCorrect javadoc subpackages handling
---
.../org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index bfb45bb..d2f6559 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -876,11 +876,14 @@ public class ApisJarMojo extends AbstractIncludingFeatureMojo implements Artifac
}
// use the -subpackages to reduce the list of the arguments
+ if (sourcesDir.list().length > 0) {
+ javadocExecutor.addArgument("-subpackages", false);
+ javadocExecutor.addArgument(sourcesDir.list(), File.pathSeparator);
+ }
+ javadocExecutor.addArgument("--allow-script-in-comments");
- javadocExecutor.addArgument("-subpackages=" + StringUtils.join(sourcesDir.list(), File.pathSeparator))
- .addArgument("--allow-script-in-comments")
- //.addArgument("-J-Xmx2048m")
- .execute(javadocDir, getLog());
+ // .addArgument("-J-Xmx2048m")
+ javadocExecutor.execute(javadocDir, getLog());
}
private static ArtifactId newArtifacId(ArtifactId original, String classifier, String type) {