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 2012/12/16 22:18:53 UTC
svn commit: r1422691 - in /maven/plugins/trunk/maven-site-plugin/src:
it/interpolation/invoker.properties
main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
Author: hboutemy
Date: Sun Dec 16 21:18:52 2012
New Revision: 1422691
URL: http://svn.apache.org/viewvc?rev=1422691&view=rev
Log:
[MSITE-670] fixed XML content generated by site:effective-site: removed duplicate <?xml instruction
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties?rev=1422691&r1=1422690&r2=1422691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties Sun Dec 16 21:18:52 2012
@@ -1,2 +1,3 @@
invoker.goals.1 = clean
invoker.goals.2 = site-deploy
+invoker.goals.3 = site:effective-site
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java?rev=1422691&r1=1422690&r2=1422691&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/EffectiveSiteMojo.java Sun Dec 16 21:18:52 2012
@@ -184,6 +184,7 @@ public class EffectiveSiteMojo
}
effectiveSite = sWriter.toString();
+ effectiveSite = effectiveSite.substring( effectiveSite.indexOf( "<project " ) ); // remove "<?xml" header
writeComment( writer, "Effective site descriptor for project \'" + project.getId() + "\'" );