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 2015/12/12 12:25:41 UTC
svn commit: r1719656 -
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
Author: hboutemy
Date: Sat Dec 12 11:25:41 2015
New Revision: 1719656
URL: http://svn.apache.org/viewvc?rev=1719656&view=rev
Log:
[MSITE-753] removed deprecated template and templateDirectory parameters
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
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=1719656&r1=1719655&r2=1719656&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 Sat Dec 12 11:25:41 2015
@@ -103,22 +103,6 @@ public abstract class AbstractSiteRender
private List<ArtifactRepository> repositories;
/**
- * Directory containing the template page.
- *
- * @deprecated use templateFile or skinning instead
- */
- @Parameter( property = "templateDirectory", defaultValue = "src/site" )
- private File templateDirectory;
-
- /**
- * Default template page.
- *
- * @deprecated use templateFile or skinning instead
- */
- @Parameter( property = "template" )
- private String template;
-
- /**
* The location of a Velocity template file to use. When used, skins and the default templates, CSS and images
* are disabled. It is highly recommended that you package this as a skin instead.
*
@@ -321,18 +305,6 @@ public abstract class AbstractSiteRender
}
}
- if ( template != null )
- {
- if ( templateFile != null )
- {
- getLog().warn( "'template' configuration is ignored when 'templateFile' is set" );
- }
- else
- {
- templateFile = new File( templateDirectory, template );
- }
- }
-
File skinFile;
try
{