svn commit: r681151 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main: java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java javadoc/org/apache/maven/plugin/javadoc/package.html

[vsiveton]

Author: vsiveton
Date: Wed Jul 30 11:02:31 2008
New Revision: 681151

URL: http://svn.apache.org/viewvc?rev=681151&view=rev
Log:
o fixed warning for subpackages depending jdk version


Modified:
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html

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=681151&r1=681150&r2=681151&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
 Wed Jul 30 11:02:31 2008
@@ -3554,9 +3554,9 @@
 
         addArgIfNotEmpty( arguments, "-sourcepath", 
JavadocUtil.quotedPathArgument( getSourcePath( sourcePaths ) ) );
 
-        if ( StringUtils.isNotEmpty( sourcepath ) )
+        if ( StringUtils.isNotEmpty( sourcepath ) && isJavaDocVersionAtLeast( 
SINCE_JAVADOC_1_5 ) )
         {
-            addArgIfNotEmpty( arguments, "-subpackages", subpackages, 
SINCE_JAVADOC_1_4 );
+            addArgIfNotEmpty( arguments, "-subpackages", subpackages, 
SINCE_JAVADOC_1_5 );
         }
 
         addArgIfNotEmpty( arguments, "-exclude", getExcludedPackages( 
sourcePaths ), SINCE_JAVADOC_1_4 );
@@ -3635,6 +3635,11 @@
         addArgIfNotEmpty( arguments, "-stylesheetfile",
                           JavadocUtil.quotedPathArgument( getStylesheetFile( 
javadocOutputDirectory ) ) );
 
+        if ( StringUtils.isNotEmpty( sourcepath ) && !isJavaDocVersionAtLeast( 
SINCE_JAVADOC_1_5 ) )
+        {
+            addArgIfNotEmpty( arguments, "-subpackages", subpackages, 
SINCE_JAVADOC_1_4 );
+        }
+
         addArgIfNotEmpty( arguments, "-taglet", JavadocUtil.quotedArgument( 
taglet ), SINCE_JAVADOC_1_4 );
         addTaglets( arguments );
         addTagletsFromTagletArtifacts( arguments );

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html?rev=681151&r1=681150&r2=681151&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html
 Wed Jul 30 11:02:31 2008
@@ -289,10 +289,10 @@
       <tr class="b">
         <td><b>-subpackages</b><i> package1</i><b>:</b><i> 
package2</i><b>:</b>... </td>
         <td>
-          1.4
+          1.5
         </td>
         <td>
-          -
+          &lt;subpackages/&gt;
         </td>
       </tr>
       <tr class="a">
@@ -718,7 +718,7 @@
           <i> package1:package1:...</i>
         </td>
         <td>
-          1.4
+          1.4 only
         </td>
         <td>
           &lt;subpackages/&gt;