[tomcat8] 02/03: Build the Javadoc with the JDK specified by the JAVA_HOME variable instead of the default JDK

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 190fec9ab89e43a54b4d1b43d2e5ec7b100e1a98
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 27 13:10:19 2014 +0200

    Build the Javadoc with the JDK specified by the JAVA_HOME variable instead of the default JDK
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 519cb3c..028ca55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ tomcat8 (8.0.9-2) UNRELEASED; urgency=medium
     the default JDBC pool implementation instead of Commons DBCP.
   * Removed the obsolete patch 0012-java7-compat.patch
   * Tightened the build dependency on junit4 (>= 4.11)
+  * Build the Javadoc with the JDK specified by the JAVA_HOME variable
+    instead of the default JDK (this fixes a build failure when backporting
+    to Wheezy)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 25 Jun 2014 11:40:20 +0200
 
diff --git a/debian/rules b/debian/rules
index 348e308..3c9011d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 else
 	$(ANT_INVOKE) deploy
 endif
-	javadoc -subpackages "javax.servlet:javax.el:javax.websocket" -d "output/api" \
+	$(JAVA_HOME)/bin/javadoc -subpackages "javax.servlet:javax.el:javax.websocket" -d "output/api" \
 		-sourcepath "java" -author -version -breakiterator \
 		-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
 		-bottom "Copyright © 2000-2014 The Apache Software Foundation. All Rights Reserved."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git