You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/08 10:59:19 UTC

svn commit: r1601204 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

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 );
         }