Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AD0C01176F for ; Sun, 8 Jun 2014 08:59:42 +0000 (UTC) Received: (qmail 81680 invoked by uid 500); 8 Jun 2014 08:59:42 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 81622 invoked by uid 500); 8 Jun 2014 08:59:42 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 81615 invoked by uid 99); 8 Jun 2014 08:59:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jun 2014 08:59:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jun 2014 08:59:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 53B31238883D; Sun, 8 Jun 2014 08:59:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1601204 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Date: Sun, 08 Jun 2014 08:59:19 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140608085919.53B31238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hboutemy Date: Sun Jun 8 08:59:18 2014 New Revision: 1601204 URL: http://svn.apache.org/r1601204 Log: [MJAVADOC-394] javadoc is not found properly by default under Oracle's JDK 7+ on Mac OSX Submmitted by: Laird Nelson Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1601204&r1=1601203&r2=1601204&view=diff ============================================================================== --- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun Jun 8 08:59:18 2014 @@ -3531,7 +3531,8 @@ public abstract class AbstractJavadocMoj javadocExe = new File( SystemUtils.getJavaHome() + File.separator + ".." + File.separator + "sh", javadocCommand ); } - else if ( SystemUtils.IS_OS_MAC_OSX ) + // For Apple's JDK 1.6.x (and older?) on Mac OSX + else if ( SystemUtils.IS_OS_MAC_OSX && SystemUtils.JAVA_VERSION_FLOAT < 1.7f ) { javadocExe = new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); }