You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/09 23:33:07 UTC
svn commit: r983829 - in /maven/plugins/trunk/maven-site-plugin: ./
src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
Author: dennisl
Date: Mon Aug 9 21:33:07 2010
New Revision: 983829
URL: http://svn.apache.org/viewvc?rev=983829&view=rev
Log:
Merge r942876 from 3.0-branch.
remove unused import
Modified:
maven/plugins/trunk/maven-site-plugin/ (props changed)
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
Propchange: maven/plugins/trunk/maven-site-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 9 21:33:07 2010
@@ -1 +1 @@
-/maven/plugins/branches/maven-site-plugin-3.x:940318,956257
+/maven/plugins/branches/maven-site-plugin-3.x:940318,942876,956257
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=983829&r1=983828&r2=983829&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Mon Aug 9 21:33:07 2010
@@ -19,7 +19,15 @@ package org.apache.maven.plugins.site;
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
@@ -32,15 +40,6 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
/**
* Adds the site descriptor (<code>site.xml</code>) to the list of files to be installed/deployed.
*
@@ -52,12 +51,6 @@ import java.util.Map;
public class SiteDescriptorAttachMojo
extends AbstractSiteMojo
{
- /**
- * @parameter expression="${project.artifact}"
- * @required
- * @readonly
- */
- private Artifact artifact;
/**
* @parameter expression="${basedir}"