Repository: incubator-brooklyn
Updated Branches:
refs/heads/master c2e55c0f0 -> bf5258b57
Fix make-javadoc.sh to work without brooklyn-all-with-dependencies (because
it's been removed)
Conflicts:
docs/_build/make-javadoc.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e11a3a22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e11a3a22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e11a3a22
Branch: refs/heads/master
Commit: e11a3a226ec6f2bf178af888e6c1e0837c09ddf7
Parents: c2e55c0
Author: Richard Downer <[email protected]>
Authored: Mon Jul 27 15:10:57 2015 +0100
Committer: Richard Downer <[email protected]>
Committed: Mon Jul 27 15:19:35 2015 +0100
----------------------------------------------------------------------
docs/_build/make-javadoc.sh | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e11a3a22/docs/_build/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_build/make-javadoc.sh b/docs/_build/make-javadoc.sh
index 8af69e5..56e3bb5 100755
--- a/docs/_build/make-javadoc.sh
+++ b/docs/_build/make-javadoc.sh
@@ -24,13 +24,7 @@ export DATESTAMP=`date "+%Y-%m-%d"`
export SHA1STAMP=`git rev-parse HEAD`
# BROOKLYN_VERSION_BELOW
-export
BROOKLYN_JAVADOC_CLASSPATH=../../usage/all/target/brooklyn-all-0.8.0-SNAPSHOT-with-dependencies.jar
-
-if [ \! -f ${BROOKLYN_JAVADOC_CLASSPATH} ]; then
- echo "Expected to find ${BROOKLYN_JAVADOC_CLASSPATH}"
- echo "Please run a full Maven build in the project root"
- exit 1
-fi
+export BROOKLYN_JAVADOC_CLASSPATH=$( mvn -f ../../pom.xml --projects
:brooklyn-all dependency:build-classpath | grep -E -v '^\[[A-Z]+\]' )
echo "building javadoc at $DATESTAMP from:
$SOURCE_PATHS"
