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 8c63a3b611a7332c1106270190978007fc6d0671 Author: Robert Munteanu <[email protected]> AuthorDate: Mon Oct 12 13:02:14 2015 +0000 SLING-5096 - Deploy API documentation for Sling 8 Update generate_javadoc_for_release.sh to work with the provisioning model. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1708104 13f79535-47bb-0310-9956-ffa450edef68 --- generate_javadoc_for_release.sh | 26 +++++++++++++++++++------- patches/org.apache.sling.discovery.impl-1.1.8 | 10 ++++++++++ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/generate_javadoc_for_release.sh b/generate_javadoc_for_release.sh index 5b4b49f..c7f99e4 100755 --- a/generate_javadoc_for_release.sh +++ b/generate_javadoc_for_release.sh @@ -1,7 +1,8 @@ #!/bin/bash -e -VERSION=7 +VERSION=8 WORKDIR=out +ALLOW_SNAPSHOT=1 # create work directory if [ ! -d $WORKDIR ] ; then @@ -9,20 +10,28 @@ if [ ! -d $WORKDIR ] ; then fi # get bundle list -if [ -f $WORKDIR/bundleList.xml ] ; then - echo "bundleList.xml already present, not downloading"; +if [ -f $WORKDIR/slingfeature.txt ] ; then + echo "slingfeature.txt already present, not downloading"; else - echo "Downloading bundleList for Sling $VERSION" - wget https://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.launchpad/$VERSION/org.apache.sling.launchpad-$VERSION-bundlelist.xml -O $WORKDIR/bundleList.xml + echo "Downloading bundle list for Sling $VERSION" + wget https://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.launchpad/$VERSION/org.apache.sling.launchpad-$VERSION-slingfeature.txt -O $WORKDIR/slingfeature.txt fi # checkout tags -artifacts=$(xsltproc bundleList-to-tagNames.xslt $WORKDIR/bundleList.xml) +artifacts=$(awk -F '/' '/org.apache.sling\// { print $2"-"$3 }' < $WORKDIR/slingfeature.txt) for artifact in $artifacts; do if [ -d $WORKDIR/$artifact ] ; then echo "Not checking out $artifact, already present"; else + if [[ "$artifact" == *-SNAPSHOT ]]; then + if [ $ALLOW_SNAPSHOT == 0 ] ; then + echo "Failing build due to SNAPSHOT artifact $artifact"; + exit 1; + else + continue + fi + fi echo "Exporting $artifact from source control" svn export https://svn.apache.org/repos/asf/sling/tags/$artifact $WORKDIR/$artifact if [ -f patches/$artifact ]; then @@ -61,6 +70,9 @@ echo >> $POM echo " <modules> " >> $POM for artifact in $artifacts; do + if [[ "$artifact" == *-SNAPSHOT ]]; then + continue + fi echo " <module>$artifact</module>" >> $POM done @@ -79,7 +91,7 @@ echo "Starting javadoc generation" pushd $WORKDIR mvn -DexcludePackageNames="*.impl:*.internal:*.jsp:sun.misc:*.juli:*.testservices:*.integrationtest:*.maven:javax.*:org.osgi.*" \ - org.apache.maven.plugins:maven-javadoc-plugin:2.9.1:aggregate + org.apache.maven.plugins:maven-javadoc-plugin:2.10.3:aggregate popd echo "Generated Javadocs can be found in $WORKDIR/target/site/apidocs/" diff --git a/patches/org.apache.sling.discovery.impl-1.1.8 b/patches/org.apache.sling.discovery.impl-1.1.8 new file mode 100644 index 0000000..5e8929b --- /dev/null +++ b/patches/org.apache.sling.discovery.impl-1.1.8 @@ -0,0 +1,10 @@ +--- pom.xml.orig 2015-10-12 15:56:36.623998965 +0300 ++++ pom.xml 2015-10-12 15:56:47.284876611 +0300 +@@ -247,7 +247,6 @@ + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.threads</artifactId> + <version>3.1.0</version> +- <type>bundle</type> + <scope>test</scope> + </dependency> + <dependency>
