You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2018/04/30 21:57:08 UTC
[GitHub] asfgit closed pull request #4: MPIR-345 Update Doxia and Doxia
Tools to latest version 1.8
asfgit closed pull request #4: MPIR-345 Update Doxia and Doxia Tools to latest version 1.8
URL: https://github.com/apache/maven-project-info-reports-plugin/pull/4
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index b1de515..f001b91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,8 +117,8 @@ under the License.
</distributionManagement>
<properties>
- <doxiaVersion>1.6</doxiaVersion>
- <doxia-sitetoolsVersion>1.6</doxia-sitetoolsVersion>
+ <doxiaVersion>1.8</doxiaVersion>
+ <doxia-sitetoolsVersion>1.8</doxia-sitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
<scmVersion>1.9.5</scmVersion>
<sitePluginVersion>3.7</sitePluginVersion>
@@ -184,7 +184,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-integration-tools</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
index b027415..dabdcae 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -230,10 +230,11 @@ public void execute()
Artifact defaultSkin =
siteTool.getDefaultSkinArtifact( localRepository, project.getRemoteArtifactRepositories() );
- SiteRenderingContext siteContext = siteRenderer.createContextForSkin( defaultSkin.getFile(), attributes,
+ SiteRenderingContext siteContext = siteRenderer.createContextForSkin( defaultSkin, attributes,
model, getName( locale ), locale );
- RenderingContext context = new RenderingContext( outputDirectory, filename );
+ RenderingContext context = new RenderingContext(
+ outputDirectory, null, filename, null, null, false, null );
SiteRendererSink sink = new SiteRendererSink( context );
@@ -243,10 +244,9 @@ public void execute()
writer = new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, filename ) ), "UTF-8" );
- siteRenderer.generateDocument( writer, sink, siteContext );
+ siteRenderer.mergeDocumentIntoSite( writer, sink, siteContext );
- siteRenderer.copyResources( siteContext, new File( project.getBasedir(), "src/site/resources" ),
- outputDirectory );
+ siteRenderer.copyResources( siteContext, outputDirectory );
writer.close();
writer = null;
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
index f6738b4..e99087c 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -35,8 +35,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
@@ -237,7 +237,7 @@ protected void executeReport( Locale locale )
*
* @param locale
* @param sink
- * @param conflictingDependencyMap
+ * @param result
*/
private void generateConvergence( Locale locale, Sink sink, DependencyAnalyzeResult result )
{
@@ -320,7 +320,7 @@ private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDe
for ( String version : artifactMap.keySet() )
{
sink.tableRow();
- sink.tableCell( new SinkEventAttributeSet( new String[] { SinkEventAttributes.WIDTH, "25%" } ) );
+ sink.tableCell( new SinkEventAttributeSet( SinkEventAttributes.WIDTH, "25%" ) );
sink.text( version );
sink.tableCell_();
@@ -545,7 +545,7 @@ private void generateLegend( Locale locale, Sink sink )
*
* @param locale
* @param sink
- * @param dependencyMap
+ * @param result
*/
private void generateStats( Locale locale, Sink sink, DependencyAnalyzeResult result )
{
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index e87b4b5..26f6c81 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -41,8 +41,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.model.License;
import org.apache.maven.plugin.logging.Log;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services