You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by de...@apache.org on 2010/01/06 19:51:14 UTC
svn commit: r896619 - in /maven/surefire/trunk/maven-surefire-report-plugin:
pom.xml
src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
Author: dennisl
Date: Wed Jan 6 18:51:13 2010
New Revision: 896619
URL: http://svn.apache.org/viewvc?rev=896619&view=rev
Log:
[SUREFIRE-590] Update to Maven Reporting Impl 2.0.4.3
o Remove workaround for MSHARED-120 that was fixed in 2.0.4.3
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=896619&r1=896618&r2=896619&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Wed Jan 6 18:51:13 2010
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4.2</version>
+ <version>2.0.4.3</version>
</dependency>
<!-- doxia -->
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java?rev=896619&r1=896618&r2=896619&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java Wed Jan 6 18:51:13 2010
@@ -139,63 +139,6 @@
*/
private boolean aggregate;
- // TODO: Remove this override once MSHARED-120 is released
- public void execute()
- throws MojoExecutionException
- {
- Locale locale = Locale.getDefault();
-
- SiteRendererSink sink;
- try
- {
- sink = SinkFactory.createSink( new File( getOutputDirectory() ), getOutputName() + ".html" );
-
- try
- {
- generate( sink, locale );
- }
- finally
- {
- sink.close();
- }
- }
- catch ( MavenReportException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
-
- File outputHtml = new File( getOutputDirectory(), getOutputName() + ".html" );
- outputHtml.getParentFile().mkdirs();
-
- Writer writer = null;
- try
- {
- SiteRenderingContext context = new SiteRenderingContext();
- context.setDecoration( new DecorationModel() );
- context.setTemplateName( "org/apache/maven/doxia/siterenderer/resources/default-site.vm" );
- context.setLocale( locale );
-
- writer = WriterFactory.newXmlWriter( outputHtml );
-
- getSiteRenderer().generateDocument( writer, sink, context );
- }
- catch ( RendererException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
- finally
- {
- IOUtil.close( writer );
- }
- }
-
/** {@inheritDoc} */
public void executeReport( Locale locale )
throws MavenReportException