svn commit: r1749090 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

[sc...@apache.org]

Author: schulte
Date: Sat Jun 18 20:05:42 2016
New Revision: 1749090

URL: http://svn.apache.org/viewvc?rev=1749090&view=rev
Log:
[MJAVADOC-462] Upgrade of doxia to 1.7 and doxia-sitetools to 1.7.1.

o Reverted Doxia upgrade by reverting revisions 1749079 and 1749086.


Modified:
    maven/plugins/trunk/maven-javadoc-plugin/pom.xml
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1749090&r1=1749089&r2=1749090&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Jun 18 20:05:42 2016
@@ -62,8 +62,8 @@ under the License.
 
   <properties>
     <mavenVersion>3.0</mavenVersion>
-    <doxiaVersion>1.7</doxiaVersion>
-    <doxia-sitetoolsVersion>1.7.1</doxia-sitetoolsVersion>
+    <doxiaVersion>1.4</doxiaVersion>
+    <doxia-sitetoolsVersion>1.4</doxia-sitetoolsVersion>
     <wagonVersion>1.0-beta-6</wagonVersion>
     <!-- for ITs -->
     <sitePluginVersion>3.3</sitePluginVersion>

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=1749090&r1=1749089&r2=1749090&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Sat Jun 18 20:05:42 2016
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import org.apache.maven.doxia.siterenderer.RenderingContext;
+import org.apache.maven.doxia.sink.render.RenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -35,6 +35,7 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
+import org.codehaus.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -97,7 +98,6 @@ public class JavadocReport
     // ----------------------------------------------------------------------
 
     /** {@inheritDoc} */
-    @Override
     public String getName( Locale locale )
     {
         if ( StringUtils.isEmpty( name ) )
@@ -109,7 +109,6 @@ public class JavadocReport
     }
 
     /** {@inheritDoc} */
-    @Override
     public String getDescription( Locale locale )
     {
         if ( StringUtils.isEmpty( description ) )
@@ -120,9 +119,8 @@ public class JavadocReport
         return description;
     }
 
-    @Override
     /** {@inheritDoc} */
-    public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
+    public void generate( Sink sink, Locale locale )
         throws MavenReportException
     {
         outputDirectory = getReportOutputDirectory();
@@ -150,14 +148,12 @@ public class JavadocReport
     }
 
     /** {@inheritDoc} */
-    @Override
     public String getOutputName()
     {
         return destDir + "/index";
     }
 
     /** {@inheritDoc} */
-    @Override
     public boolean isExternalReport()
     {
         return true;
@@ -256,14 +252,12 @@ public class JavadocReport
     }
 
     /** {@inheritDoc} */
-    @Override
     public String getCategoryName()
     {
         return CATEGORY_PROJECT_REPORTS;
     }
 
     /** {@inheritDoc} */
-    @Override
     public File getReportOutputDirectory()
     {
         if ( reportOutputDirectory == null )
@@ -279,7 +273,6 @@ public class JavadocReport
      *
      * @param reportOutputDirectory the directory file to be set
      */
-    @Override
     public void setReportOutputDirectory( File reportOutputDirectory )
     {
         updateReportOutputDirectory( reportOutputDirectory, destDir );
@@ -351,5 +344,4 @@ public class JavadocReport
     {
         return ResourceBundle.getBundle( "javadoc-report", locale, getClass().getClassLoader() );
     }
-
 }