Author: nbubna
Date: Tue Apr 27 16:45:36 2010
New Revision: 938553
URL: http://svn.apache.org/viewvc?rev=938553&view=rev
Log:
update version after release and make a few doc updates
Modified:
velocity/engine/trunk/build/build.properties
velocity/engine/trunk/pom.xml
velocity/engine/trunk/src/changes/changes.xml
velocity/engine/trunk/xdocs/docs/committers.xml
Modified: velocity/engine/trunk/build/build.properties
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/build/build.properties?rev=938553&r1=938552&r2=938553&view=diff
==============================================================================
--- velocity/engine/trunk/build/build.properties (original)
+++ velocity/engine/trunk/build/build.properties Tue Apr 27 16:45:36 2010
@@ -22,7 +22,7 @@
# Global defaults
name= Velocity
project= velocity
-version= 1.7-beta1
+version= 1.7-dev
final.name= ${project}-${version}
# compile switches
Modified: velocity/engine/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=938553&r1=938552&r2=938553&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Tue Apr 27 16:45:36 2010
@@ -33,7 +33,7 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7-beta1</version>
+ <version>1.7-SNAPSHOT</version>
<name>Apache Velocity</name>
<url>http://velocity.apache.org/engine/devel/</url>
Modified: velocity/engine/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=938553&r1=938552&r2=938553&view=diff
==============================================================================
--- velocity/engine/trunk/src/changes/changes.xml (original)
+++ velocity/engine/trunk/src/changes/changes.xml Tue Apr 27 16:45:36 2010
@@ -25,7 +25,10 @@
</properties>
<body>
- <release version="1.7" date="2010-04-10">
+ <release version="1.7" date="In Subversion">
+ </release>
+
+ <release version="1.7-beta1" date="2010-04-10">
<action type="add" dev="nbubna" issue="VELOCITY-694">
Add support for OSGi-ready manifests in build/release tasks.
</action>
@@ -95,7 +98,7 @@
<li>A Scope reference can now be automatically made
available within each content directive:
<ul>
- <li>$template in Template.merge and #parse content<li>
+ <li>$template in Template.merge and #parse content</li>
<li>$macro in #macro</li>
<li>$foreach in #foreach</li>
<li>$evaluate in #evaluate or Velocity.evaluate(...)
content</li>
@@ -180,7 +183,7 @@
<action type="add" dev="nbubna" issue="VELOCITY-666" due-to="Jarkko
Viinamaki">
Add support for calling velocimacros with body content by prefixing
the macro
name with @.
- (e.g. #macro( bold )<strong>$bodyContent</strong>#end #...@bold()any
valid VTL here#end)
+ (e.g. #macro( foo )Here is $bodyContent#end #...@foo()any valid VTL
here#end)
The $bodyContent reference may be renamed via a
velocimacro.body.reference
setting in your velocity.properties.
</action>
Modified: velocity/engine/trunk/xdocs/docs/committers.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/committers.xml?rev=938553&r1=938552&r2=938553&view=diff
==============================================================================
--- velocity/engine/trunk/xdocs/docs/committers.xml (original)
+++ velocity/engine/trunk/xdocs/docs/committers.xml Tue Apr 27 16:45:36 2010
@@ -75,6 +75,24 @@ Listed alphabetically:
<td>[email protected]</td>
<td>ESHA Research</td>
</tr>
+
+ <tr>
+ <td>Claude Brisson</td>
+ <td>[email protected]</td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td>Byron Foster</td>
+ <td>[email protected]</td>
+ <td></td>
+ </tr>
+
+ <!--tr>
+ <td>Jarkko Viinamäki</td>
+ <td>[email protected]</td>
+ <td></td>
+ </tr-->
</table>
</section>
