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 2016/10/30 14:50:13 UTC
svn commit: r1767163 - in /maven/plugins/trunk/maven-site-plugin: pom.xml
src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
Author: hboutemy
Date: Sun Oct 30 14:50:13 2016
New Revision: 1767163
URL: http://svn.apache.org/viewvc?rev=1767163&view=rev
Log:
[MSITE-786] improved error message when Velocity error with skin
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1767163&r1=1767162&r2=1767163&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Oct 30 14:50:13 2016
@@ -191,7 +191,7 @@ under the License.
<properties>
<doxiaVersion>1.7</doxiaVersion>
- <doxiaSitetoolsVersion>1.7.2</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>1.7.3-SNAPSHOT</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
<prerequisiteMavenVersion>2.2.1</prerequisiteMavenVersion>
<wagonVersion>1.0</wagonVersion>
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java?rev=1767163&r1=1767162&r2=1767163&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java Sun Oct 30 14:50:13 2016
@@ -317,7 +317,6 @@ public abstract class AbstractSiteRender
}
else
{
- File skinFile;
try
{
Artifact skinArtifact =
@@ -325,10 +324,8 @@ public abstract class AbstractSiteRender
getLog().info( "Rendering site with " + skinArtifact.getId() + " skin." );
- skinFile = skinArtifact.getFile();
-
- context = siteRenderer.createContextForSkin( skinFile, attributes, decorationModel, project.getName(),
- locale );
+ context = siteRenderer.createContextForSkin( skinArtifact, attributes, decorationModel,
+ project.getName(), locale );
}
catch ( SiteToolException e )
{