You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2009/07/25 21:39:25 UTC
svn commit: r797827 - in
/maven/plugins/trunk/maven-project-info-reports-plugin: ./
src/main/java/org/apache/maven/report/projectinfo/
src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/
Author: ltheussl
Date: Sat Jul 25 19:39:25 2009
New Revision: 797827
URL: http://svn.apache.org/viewvc?rev=797827&view=rev
Log:
[MPIR-101] Update to Doxia 1.1.1
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=797827&r1=797826&r2=797827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sat Jul 25 19:39:25 2009
@@ -68,8 +68,8 @@
</issueManagement>
<properties>
- <doxiaVersion>1.0</doxiaVersion>
- <doxia-sitetoolsVersion>1.0</doxia-sitetoolsVersion>
+ <doxiaVersion>1.1.1</doxiaVersion>
+ <doxia-sitetoolsVersion>1.1.1</doxia-sitetoolsVersion>
<mavenVersion>2.0.6</mavenVersion>
<wagonVersion>1.0-beta-3</wagonVersion>
<scmVersion>1.1</scmVersion>
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=797827&r1=797826&r2=797827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Sat Jul 25 19:39:25 2009
@@ -23,7 +23,7 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.site.decoration.Body;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.siterenderer.Renderer;
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=797827&r1=797826&r2=797827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Sat Jul 25 19:39:25 2009
@@ -133,6 +133,7 @@
sink.body_();
sink.flush();
+ sink.close();
}
// ----------------------------------------------------------------------
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=797827&r1=797826&r2=797827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Sat Jul 25 19:39:25 2009
@@ -46,7 +46,6 @@
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.model.License;
@@ -514,8 +513,8 @@
String sealed = getReportString( "report.dependencies.file.details.column.sealed" );
int[] justification =
- new int[] { Parser.JUSTIFY_LEFT, Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT,
- Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER };
+ new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT,
+ Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER };
startTable();
@@ -619,8 +618,8 @@
tableHeader[0] = getReportString( "report.dependencies.file.details.total" );
tableHeader( tableHeader );
- justification[0] = Parser.JUSTIFY_RIGHT;
- justification[6] = Parser.JUSTIFY_RIGHT;
+ justification[0] = Sink.JUSTIFY_RIGHT;
+ justification[6] = Sink.JUSTIFY_RIGHT;
for ( int i = -1; i < TotalCell.SCOPES_COUNT; i++ )
{
@@ -1097,14 +1096,14 @@
{
tableHeader = new String[] { repoid, url, release, snapshot };
justificationRepo =
- new int[] { Parser.JUSTIFY_LEFT, Parser.JUSTIFY_LEFT, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER };
+ new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER };
}
else
{
tableHeader = new String[] { repoid, url, release, snapshot, blacklisted };
justificationRepo =
- new int[] { Parser.JUSTIFY_LEFT, Parser.JUSTIFY_LEFT, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER,
- Parser.JUSTIFY_CENTER };
+ new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER,
+ Sink.JUSTIFY_CENTER };
}
sink.tableRows( justificationRepo, true );
@@ -1177,14 +1176,14 @@
int[] justificationRepo = new int[repoIdList.size() + 1];
tableHeader[0] = artifact;
- justificationRepo[0] = Parser.JUSTIFY_LEFT;
+ justificationRepo[0] = Sink.JUSTIFY_LEFT;
int idnum = 1;
for ( Iterator it = repoIdList.iterator(); it.hasNext(); )
{
String id = (String) it.next();
tableHeader[idnum] = id;
- justificationRepo[idnum] = Parser.JUSTIFY_CENTER;
+ justificationRepo[idnum] = Sink.JUSTIFY_CENTER;
idnum++;
}