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/07/24 12:01:13 UTC

[sling-slingfeature-maven-plugin] branch master updated: SLING-8597 : Build fails with java 11

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 23e8484  SLING-8597 : Build fails with java 11
23e8484 is described below

commit 23e848409876cfa35b0ec8669612d73351f4e2e3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jul 24 14:01:05 2019 +0200

    SLING-8597 : Build fails with java 11
---
 pom.xml                                                             | 2 +-
 src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 51dd951..ea25e48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>33</version>
+        <version>35</version>
         <relativePath />
     </parent>
 
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 1d382bc..49cdbb4 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
@@ -877,9 +877,8 @@ public class ApisJarMojo extends AbstractIncludingFeatureMojo implements Artifac
 
         // use the -subpackages to reduce the list of the arguments
 
-        javadocExecutor.addArgument("--allow-script-in-comments")
-                       .addArgument("-subpackages", false)
-                       .addArgument(sourcesDir.list(), File.pathSeparator)
+        javadocExecutor.addArgument("-subpackages=" + StringUtils.join(sourcesDir.list(), File.pathSeparator))
+                       .addArgument("--allow-script-in-comments")
                        //.addArgument("-J-Xmx2048m")
                        .execute(javadocDir, getLog());
     }