You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by js...@apache.org on 2003/03/19 20:21:16 UTC
cvs commit: maven/src/plugins-build/faq plugin.jelly
jstrachan 2003/03/19 11:21:16
Modified: . project.xml
src/plugins-build/faq plugin.jelly
Log:
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
Revision Changes Path
1.259 +1 -1 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- project.xml 19 Mar 2003 16:44:20 -0000 1.258
+++ project.xml 19 Mar 2003 19:21:16 -0000 1.259
@@ -366,7 +366,7 @@
</dependency>
<dependency>
<id>commons-jelly</id>
- <version>20030211.141339</version>
+ <version>20030310.073407</version>
<url>http://jakarta.apache.org/commons/jelly/</url>
</dependency>
<dependency>
1.4 +1 -1 maven/src/plugins-build/faq/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/faq/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 17 Mar 2003 08:57:35 -0000 1.3
+++ plugin.jelly 19 Mar 2003 19:21:16 -0000 1.4
@@ -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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: cvs commit: maven/src/plugins-build/faq plugin.jelly
Posted by James Strachan <ja...@yahoo.co.uk>.
From: <di...@multitask.com.au>
> This will have no runtime effect, right? Since Maven's lib directory has
> an older version of maven, that will be loaded and used first.....
>
> Or am I missing something?
The new Jelly version only comes into effect if you do a full rebuild of
Maven which then copies the new Jelly jar into Maven's lib directory. Is
that what you meant or am I misunderstanding you?
BTW the Jelly bug this new version fixes is that when using <j:file> then
sometimes the <?xml?> declaration could come out twice if the content of the
<j:file> tag output a document, e.g. using the XML library or JSL etc.
James
-------
http://radio.weblogs.com/0112098/
> --
> dIon Gillard, Multitask Consulting
> Blog: http://www.freeroller.net/page/dion/Weblog
> Work: http://www.multitask.com.au
>
>
> jstrachan@apache.org wrote on 20/03/2003 06:21:16 AM:
>
> > jstrachan 2003/03/19 11:21:16
> >
> > Modified: . project.xml
> > src/plugins-build/faq plugin.jelly
> > Log:
> > 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
> >
> > Revision Changes Path
> > 1.259 +1 -1 maven/project.xml
> >
> > Index: project.xml
> > ===================================================================
> > RCS file: /home/cvs/maven/project.xml,v
> > retrieving revision 1.258
> > retrieving revision 1.259
> > diff -u -r1.258 -r1.259
> > --- project.xml 19 Mar 2003 16:44:20 -0000 1.258
> > +++ project.xml 19 Mar 2003 19:21:16 -0000 1.259
> > @@ -366,7 +366,7 @@
> > </dependency>
> > <dependency>
> > <id>commons-jelly</id>
> > - <version>20030211.141339</version>
> > + <version>20030310.073407</version>
> > <url>http://jakarta.apache.org/commons/jelly/</url>
> > </dependency>
> > <dependency>
> >
> >
> >
> > 1.4 +1 -1 maven/src/plugins-build/faq/plugin.jelly
> >
> > Index: plugin.jelly
> > ===================================================================
> > RCS file: /home/cvs/maven/src/plugins-build/faq/plugin.jelly,v
> > retrieving revision 1.3
> > retrieving revision 1.4
> > diff -u -r1.3 -r1.4
> > --- plugin.jelly 17 Mar 2003 08:57:35 -0000 1.3
> > +++ plugin.jelly 19 Mar 2003 19:21:16 -0000 1.4
> > @@ -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}"/>
> >
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: cvs commit: maven/src/plugins-build/faq plugin.jelly
Posted by di...@multitask.com.au.
This will have no runtime effect, right? Since Maven's lib directory has
an older version of maven, that will be loaded and used first.....
Or am I missing something?
--
dIon Gillard, Multitask Consulting
Blog: http://www.freeroller.net/page/dion/Weblog
Work: http://www.multitask.com.au
jstrachan@apache.org wrote on 20/03/2003 06:21:16 AM:
> jstrachan 2003/03/19 11:21:16
>
> Modified: . project.xml
> src/plugins-build/faq plugin.jelly
> Log:
> 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
>
> Revision Changes Path
> 1.259 +1 -1 maven/project.xml
>
> Index: project.xml
> ===================================================================
> RCS file: /home/cvs/maven/project.xml,v
> retrieving revision 1.258
> retrieving revision 1.259
> diff -u -r1.258 -r1.259
> --- project.xml 19 Mar 2003 16:44:20 -0000 1.258
> +++ project.xml 19 Mar 2003 19:21:16 -0000 1.259
> @@ -366,7 +366,7 @@
> </dependency>
> <dependency>
> <id>commons-jelly</id>
> - <version>20030211.141339</version>
> + <version>20030310.073407</version>
> <url>http://jakarta.apache.org/commons/jelly/</url>
> </dependency>
> <dependency>
>
>
>
> 1.4 +1 -1 maven/src/plugins-build/faq/plugin.jelly
>
> Index: plugin.jelly
> ===================================================================
> RCS file: /home/cvs/maven/src/plugins-build/faq/plugin.jelly,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- plugin.jelly 17 Mar 2003 08:57:35 -0000 1.3
> +++ plugin.jelly 19 Mar 2003 19:21:16 -0000 1.4
> @@ -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}"/>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org