Upgraded to newer version fo Jelly to fix some issues in the FAQ and html2xdoc plugins where the XML declaration could appear twice

Also patched the faq plugin to use ${basedir} so that it works inside a reactor build


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113158 13f79535-47bb-0310-9956-ffa450edef68

faq/plugin.jelly

@@ -22,7 +22,7 @@
 		    
 		<j:set var="srcfile" value="${maven.faq.src.file}"/>
     <j:if test="${empty(srcfile)}">
-    	<j:set var="srcfile" value="xdocs/faq.fml"/>
+    	<j:set var="srcfile" value="${basedir}/xdocs/faq.fml"/>
     </j:if>
     
 		<util:file var="srcfileFile" name="${srcfile}"/>