You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/03/07 12:09:38 UTC
[maven-changes-plugin] branch dox created (now edeb2c1)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch dox
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git.
at edeb2c1 update doxia
This branch includes the following new commits:
new edeb2c1 update doxia
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-changes-plugin] 01/01: update doxia
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch dox
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
commit edeb2c1ab9339b83cc7f66a2c36e5fedcac6fa8d
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat Mar 7 07:09:20 2020 -0500
update doxia
---
.gitignore | 2 ++
pom.xml | 13 ++-------
.../plugins/changes/AbstractChangesReport.java | 32 ++++++++++------------
.../plugins/changes/ChangesReportGenerator.java | 2 +-
.../issues/AbstractIssuesReportGenerator.java | 2 +-
5 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/.gitignore b/.gitignore
index f79c928..e1b7e45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ out/
/bootstrap
/dependencies.xml
.java-version
+.checkstyle
+
diff --git a/pom.xml b/pom.xml
index 55104c9..97edad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,8 @@ under the License.
<properties>
<javaVersion>7</javaVersion>
- <doxiaVersion>1.4</doxiaVersion>
- <doxiaSitetoolsVersion>1.4</doxiaSitetoolsVersion>
+ <doxiaVersion>1.9.1</doxiaVersion>
+ <doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
<mavenVersion>3.0.5</mavenVersion>
<sitePluginVersion>3.3</sitePluginVersion>
<wagonVersion>2.4</wagonVersion>
@@ -425,15 +425,6 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <!--
- This file should not contain a license header as it represents
- real data downloaded from a JIRA server.
- -->
- <exclude>src/test/resources/org/apache/maven/plugins/jira/unicode-jira-results.xml</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</pluginManagement>
diff --git a/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java b/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
index b4b9ea5..ea8e787 100644
--- a/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
+++ b/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
@@ -19,13 +19,22 @@ package org.apache.maven.plugins.changes;
* under the License.
*/
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
import org.apache.commons.io.IOUtils;
-import org.apache.maven.doxia.sink.render.RenderingContext;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.doxia.site.decoration.Body;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.Skin;
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.execution.MavenSession;
@@ -43,15 +52,6 @@ import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverExcepti
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.ReaderFactory;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
/**
* Base class with the things that should be in AbstractMavenReport anyway. Note: This file was copied from r415312 of
* AbstractProjectInfoReport in maven-project-info-reports, as a work-around to MCHANGES-88.
@@ -127,7 +127,7 @@ public abstract class AbstractChangesReport
@Component
protected I18N i18n;
- private File getSkinArtifactFile()
+ private Artifact getSkinArtifactFile()
throws MojoExecutionException
{
Skin skin = Skin.getDefaultSkin();
@@ -139,7 +139,7 @@ public abstract class AbstractChangesReport
pbr.setRemoteRepositories( project.getRemoteArtifactRepositories() );
try
{
- return resolver.resolveArtifact( pbr, coordinate ).getArtifact().getFile();
+ return resolver.resolveArtifact( pbr, coordinate ).getArtifact();
}
catch ( ArtifactResolverException e )
{
@@ -178,13 +178,9 @@ public abstract class AbstractChangesReport
File file = new File( outputDirectory, getOutputName() + ".html" );
writer = new OutputStreamWriter( new FileOutputStream( file ), getOutputEncoding() );
- siteRenderer.generateDocument( writer, sink, siteContext );
-
- writer.close();
- writer = null;
+ siteRenderer.mergeDocumentIntoSite( writer, sink, siteContext );
- siteRenderer.copyResources( siteContext, new File( project.getBasedir(), "src/site/resources" ),
- outputDirectory );
+ siteRenderer.copyResources( siteContext, outputDirectory );
}
catch ( RendererException | IOException | MavenReportException e )
{
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
index 8fe0e62..bd4c68e 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
@@ -29,7 +29,7 @@ import java.util.ResourceBundle;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.plugins.changes.model.Action;
diff --git a/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java b/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java
index cc53b1d..7c1943f 100644
--- a/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java
@@ -20,7 +20,7 @@ package org.apache.maven.plugins.issues;
*/
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.codehaus.plexus.util.StringUtils;