You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/22 08:38:18 UTC
[maven-pdf-plugin] branch master updated: updated Doxia Sitetools
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 6a57274 updated Doxia Sitetools
6a57274 is described below
commit 6a572743a9438f05c03e1646870182d0744a79c7
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Fri Dec 22 09:38:17 2017 +0100
updated Doxia Sitetools
---
pom.xml | 2 +-
src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06e2221..7c33dac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@ under the License.
<properties>
<doxiaVersion>1.8</doxiaVersion>
- <doxiaSitetoolsVersion>1.7.1</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>1.7.5</doxiaSitetoolsVersion>
<mavenVersion>2.2.1</mavenVersion>
</properties>
diff --git a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
index f5330a5..7c1371f 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.commons.io.input.XmlStreamReader;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -867,32 +868,32 @@ public class PdfMojo
return;
}
- File skinFile;
+ Artifact skinArtifact;
try
{
- skinFile =
+ skinArtifact =
siteTool.getSkinArtifactFromRepository( localRepository, project.getRemoteArtifactRepositories(),
- decorationModel ).getFile();
+ decorationModel );
}
catch ( SiteToolException e )
{
throw new MojoExecutionException( "SiteToolException: " + e.getMessage(), e );
}
- if ( skinFile == null )
+ if ( skinArtifact == null )
{
return;
}
if ( getLog().isDebugEnabled() )
{
- getLog().debug( "Copy resources from skin artifact: '" + skinFile + "'..." );
+ getLog().debug( "Copy resources from skin artifact: '" + skinArtifact.getId() + "'..." );
}
try
{
final SiteRenderingContext context =
- siteRenderer.createContextForSkin( skinFile, new HashMap<String, Object>( 2 ), decorationModel,
+ siteRenderer.createContextForSkin( skinArtifact, new HashMap<String, Object>( 2 ), decorationModel,
project.getName(), locale );
context.addSiteDirectory( new File( siteDirectory, locale.getLanguage() ) );
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].