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/10/27 23:51:00 UTC
git commit: upgraded Doxia to 1.4 and maven-reporting-impl to 2.3
Repository: maven-surefire
Updated Branches:
refs/heads/master 5ccbf9c2f -> e759182b0
upgraded Doxia to 1.4 and maven-reporting-impl to 2.3
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e759182b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e759182b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e759182b
Branch: refs/heads/master
Commit: e759182b005576c54ca5ecfff35390ed7d4d0ec7
Parents: 5ccbf9c
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon Oct 27 23:50:56 2014 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Mon Oct 27 23:50:56 2014 +0100
----------------------------------------------------------------------
maven-surefire-report-plugin/pom.xml | 4 +-
.../report/AbstractSurefireReportMojo.java | 50 --------------------
.../surefire/report/SurefireReportMojoTest.java | 14 +++++-
3 files changed, 15 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e759182b/maven-surefire-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index ab8e9ac..e71556d 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -47,7 +47,7 @@
</prerequisites>
<properties>
- <doxiaVersion>1.1.4</doxiaVersion>
+ <doxiaVersion>1.4</doxiaVersion>
</properties>
<dependencies>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
</dependency>
<!-- doxia -->
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e759182b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
index 8235856..b1431a5 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
@@ -26,9 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
@@ -45,30 +43,6 @@ public abstract class AbstractSurefireReportMojo
extends AbstractMavenReport
{
/**
- * Location where generated html will be created.
- *
- * @noinspection UnusedDeclaration
- */
- @Parameter( property = "project.reporting.outputDirectory" )
- private File outputDirectory;
-
- /**
- * Doxia Site Renderer
- *
- * @noinspection UnusedDeclaration
- */
- @Component
- private Renderer siteRenderer;
-
- /**
- * Maven Project
- *
- * @noinspection UnusedDeclaration
- */
- @Parameter( property = "project", required = true, readonly = true )
- private MavenProject project;
-
- /**
* If set to false, only failures are shown.
*
* @noinspection UnusedDeclaration
@@ -359,32 +333,8 @@ public abstract class AbstractSurefireReportMojo
/**
* {@inheritDoc}
*/
- protected Renderer getSiteRenderer()
- {
- return siteRenderer;
- }
-
- /**
- * {@inheritDoc}
- */
- protected MavenProject getProject()
- {
- return project;
- }
-
- /**
- * {@inheritDoc}
- */
public abstract String getOutputName();
- /**
- * {@inheritDoc}
- */
- protected String getOutputDirectory()
- {
- return outputDirectory.getAbsolutePath();
- }
-
private ResourceBundle getBundle( Locale locale )
{
return ResourceBundle.getBundle( "surefire-report", locale, this.getClass().getClassLoader() );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e759182b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
index 229c457..a94f5f2 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
@@ -26,7 +26,9 @@ import java.io.Writer;
import java.net.URL;
import java.net.URLDecoder;
import java.util.Locale;
+
import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -41,6 +43,16 @@ import org.apache.maven.shared.utils.io.IOUtil;
public class SurefireReportMojoTest
extends AbstractMojoTestCase
{
+ private Renderer renderer;
+
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ renderer = (Renderer) lookup( Renderer.ROLE );
+ }
+
public void testBasicSurefireReport()
throws Exception
{
@@ -205,7 +217,7 @@ public class SurefireReportMojoTest
outputHtml.getParentFile().mkdirs();
writer = WriterFactory.newXmlWriter( outputHtml );
- mojo.getSiteRenderer().generateDocument( writer, (SiteRendererSink) mojo.getSink(), context );
+ renderer.generateDocument( writer, (SiteRendererSink) mojo.getSink(), context );
}
finally
{