[sling-tooling-release] 17/29: include javadoc for Sling Servlet annotations

[ra...@apache.org]

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

radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-tooling-release.git

commit 7ea17a09e9fc1418d42b698178bca8d4399b2c9d
Author: Konrad Windszus <ko...@netcentric.biz>
AuthorDate: Thu Jun 21 16:28:37 2018 +0200

    include javadoc for Sling Servlet annotations
---
 generate_javadoc_for_release.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/generate_javadoc_for_release.sh b/generate_javadoc_for_release.sh
index 9c48fea..78cdb87 100755
--- a/generate_javadoc_for_release.sh
+++ b/generate_javadoc_for_release.sh
@@ -23,6 +23,7 @@ artifacts=$(awk -F '/' '/org.apache.sling\// { print $2 ":" $3 }' < $WORKDIR/sli
 # add additional artifacts which are not part of the launchpad
 # https://issues.apache.org/jira/browse/SLING-6766
 artifacts+=" adapter-annotations:1.0.0"
+artifacts+="org.apache.sling.servlets.annotations:1.0.0"
 
 # checkout tags
 for artifact in $artifacts; do
@@ -108,6 +109,8 @@ fi
 echo "Starting javadoc generation"
 
 pushd $WORKDIR
+# This might fail due to duplications in the classpath (see https://issues.apache.org/jira/browse/SLING-6766?focusedCommentId=16358298&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16358298)
+# The classpath order is unfortunately not predictable with m-j-p 3.0.0 (https://issues.apache.org/jira/browse/MJAVADOC-513)
 mvn -DexcludePackageNames="*.impl:*.internal:*.jsp:sun.misc:*.juli:*.testservices:*.integrationtest:*.maven:javax.*:org.osgi.*" \
          org.apache.maven.plugins:maven-javadoc-plugin:3.0.0:aggregate
 popd