You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2010/04/01 23:42:25 UTC

svn commit: r930107 - in /velocity/engine/trunk: README.txt build/build.properties pom.xml src/changes/changes.xml src/site/apt/upgrading.apt xdocs/docs/index.xml

Author: nbubna
Date: Thu Apr  1 21:42:24 2010
New Revision: 930107

URL: http://svn.apache.org/viewvc?rev=930107&view=rev
Log:
update version and docs for release

Modified:
    velocity/engine/trunk/README.txt
    velocity/engine/trunk/build/build.properties
    velocity/engine/trunk/pom.xml
    velocity/engine/trunk/src/changes/changes.xml
    velocity/engine/trunk/src/site/apt/upgrading.apt
    velocity/engine/trunk/xdocs/docs/index.xml

Modified: velocity/engine/trunk/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/README.txt?rev=930107&r1=930106&r2=930107&view=diff
==============================================================================
--- velocity/engine/trunk/README.txt (original)
+++ velocity/engine/trunk/README.txt Thu Apr  1 21:42:24 2010
@@ -94,6 +94,12 @@ Upgrading from Velocity 1.5
     * Maven Ant 2.0.9 is required for the Maven Ant tasks.
     * Java CC 4.1 is recommended to compile the parser files.
 
+Upgrading from Velocity 1.6
+
+    Optional:
+
+    * SpringSource Bundlor 1.0 is required for building releases
+
 
 BUILDING APACHE VELOCITY
 ------------------------

Modified: velocity/engine/trunk/build/build.properties
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/build/build.properties?rev=930107&r1=930106&r2=930107&view=diff
==============================================================================
--- velocity/engine/trunk/build/build.properties (original)
+++ velocity/engine/trunk/build/build.properties Thu Apr  1 21:42:24 2010
@@ -22,7 +22,7 @@
 # Global defaults
 name=       Velocity
 project=    velocity
-version=    1.7-dev
+version=    1.7-beta1
 final.name= ${project}-${version}
 
 # compile switches

Modified: velocity/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=930107&r1=930106&r2=930107&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Thu Apr  1 21:42:24 2010
@@ -33,7 +33,7 @@
 
   <groupId>org.apache.velocity</groupId>
   <artifactId>velocity</artifactId>
-  <version>1.7-dev</version>
+  <version>1.7-beta1</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=930107&r1=930106&r2=930107&view=diff
==============================================================================
--- velocity/engine/trunk/src/changes/changes.xml (original)
+++ velocity/engine/trunk/src/changes/changes.xml Thu Apr  1 21:42:24 2010
@@ -25,7 +25,11 @@
   </properties>
 
   <body>
-    <release version="1.7" date="In Subversion">
+    <release version="1.7" date="2010-04-10">
+      <action type="add" dev="nbubna" issue="VELOCITY-694">
+    Add support for OSGi-ready manifests in build/release tasks.
+      </action>
+
       <action type="fix" dev="nbubna" issue="VELOCITY-753">
     When comparing parameter types during method mapping, make Object always less specific than other types.
       </action>

Modified: velocity/engine/trunk/src/site/apt/upgrading.apt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/site/apt/upgrading.apt?rev=930107&r1=930106&r2=930107&view=diff
==============================================================================
--- velocity/engine/trunk/src/site/apt/upgrading.apt (original)
+++ velocity/engine/trunk/src/site/apt/upgrading.apt Thu Apr  1 21:42:24 2010
@@ -13,6 +13,14 @@ Upgrading from earlier versions
 * Upgrading from Velocity 1.6
 
   There are no changes in the dependencies since Velocity 1.6
+  
+    * Deprecated $velocityCount; please use $foreach.count or $foreach.index
+
+    * Deprecated $velocityHasNext; please use $foreach.hasNext, $foreach.first or $foreach.last
+
+    * Deprecated velocimacro.context.localscope setting; please get/set local #macro references as members of the provided $macro scope control instead. (e.g. #set( $macro.foo = 'bar' ) and $macro.foo )
+
+    * Deprecated directive.evaluate.context.class setting; please get/set local #evaluate references as members of the provided $evaluate scope control instead. (e.g. #set( $evaluate.foo = 'bar' ) and $evaluate.foo )
 
 * Upgrading from Velocity 1.5
 

Modified: velocity/engine/trunk/xdocs/docs/index.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/index.xml?rev=930107&r1=930106&r2=930107&view=diff
==============================================================================
--- velocity/engine/trunk/xdocs/docs/index.xml (original)
+++ velocity/engine/trunk/xdocs/docs/index.xml Thu Apr  1 21:42:24 2010
@@ -55,7 +55,7 @@
 
     <section name="Where do I get releases?" href="WheredoIgetreleases?">
 
-      <p> The current stable release version is version 1.6.2. </p>
+      <p> The current stable release version is version 1.6.3. </p>
 
       <p> The release distribution is available as a combined source/binary distribution in
         <code>tar.gz</code> and