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/04/04 23:06:35 UTC
[maven-changes-plugin] branch dox2 created (now 3d4078d)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch dox2
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git.
at 3d4078d udpate doxia
This branch includes the following new commits:
new 3d4078d udpate 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: udpate doxia
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch dox2
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
commit 3d4078d94cbdd749876cfb8cb3df27ba0be78f03
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat Apr 4 19:06:06 2020 -0400
udpate doxia
---
pom.xml | 6 +++---
.../apache/maven/plugins/changes/AbstractChangesReport.java | 12 ++++++------
.../apache/maven/plugins/changes/ChangesReportGenerator.java | 2 +-
.../maven/plugins/issues/AbstractIssuesReportGenerator.java | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0186c3..df0a36c 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.1</doxiaSitetoolsVersion>
<mavenVersion>3.0.5</mavenVersion>
<sitePluginVersion>3.3</sitePluginVersion>
<wagonVersion>2.4</wagonVersion>
@@ -228,7 +228,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>1.1.8</version>
+ <version>1.2</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
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..54cd9cd 100644
--- a/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
+++ b/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
@@ -20,12 +20,13 @@ package org.apache.maven.plugins.changes;
*/
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;
@@ -127,7 +128,7 @@ public abstract class AbstractChangesReport
@Component
protected I18N i18n;
- private File getSkinArtifactFile()
+ private Artifact getSkinArtifact()
throws MojoExecutionException
{
Skin skin = Skin.getDefaultSkin();
@@ -139,7 +140,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 )
{
@@ -164,7 +165,7 @@ public abstract class AbstractChangesReport
Map<String, String> attributes = new HashMap<>();
attributes.put( "outputEncoding", getOutputEncoding() );
Locale locale = Locale.getDefault();
- SiteRenderingContext siteContext = siteRenderer.createContextForSkin( getSkinArtifactFile(), attributes,
+ SiteRenderingContext siteContext = siteRenderer.createContextForSkin( getSkinArtifact(), attributes,
model, getName( locale ), locale );
siteContext.setOutputEncoding( getOutputEncoding() );
@@ -183,8 +184,7 @@ public abstract class AbstractChangesReport
writer.close();
writer = null;
- 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..d962f73 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
@@ -29,8 +29,8 @@ 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.SinkEventAttributes;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.plugins.changes.model.Action;
import org.apache.maven.plugins.changes.model.Component;
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..c71e6bf 100644
--- a/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/issues/AbstractIssuesReportGenerator.java
@@ -20,8 +20,8 @@ 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.SinkEventAttributes;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.codehaus.plexus.util.StringUtils;
import java.util.ResourceBundle;