You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2016/12/09 23:43:53 UTC

svn commit: r1773490 - in /velocity/site/production: engine/2.0/dependencies.html engine/2.0/upgrading.html engine/devel/changes.html engine/devel/dependencies.html engine/devel/upgrading.html tools/devel/changes.html

Author: cbrisson
Date: Fri Dec  9 23:43:52 2016
New Revision: 1773490

URL: http://svn.apache.org/viewvc?rev=1773490&view=rev
Log:
[site] push last changes into production

Modified:
    velocity/site/production/engine/2.0/dependencies.html
    velocity/site/production/engine/2.0/upgrading.html
    velocity/site/production/engine/devel/changes.html
    velocity/site/production/engine/devel/dependencies.html
    velocity/site/production/engine/devel/upgrading.html
    velocity/site/production/tools/devel/changes.html

Modified: velocity/site/production/engine/2.0/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/dependencies.html?rev=1773490&r1=1773489&r2=1773490&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/dependencies.html (original)
+++ velocity/site/production/engine/2.0/dependencies.html Fri Dec  9 23:43:52 2016
@@ -224,7 +224,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h2 id="velocity-dependencies">Velocity Dependencies<a class="headerlink" href="#velocity-dependencies" title="Permanent link">&para;</a></h2>
-<p>When building from sources, Maven should fetch all needed dependencies. At runtime, velocity only needs slf4j-api, and one of the slf4j bindings (needed classes from commons-lang and commons-collections are incorporated using <a href="https://maven.apache.org/plugins/maven-shade-plugin/">"shading"</a>).</p>
+<p>When building from sources, Maven should fetch all needed dependencies. At runtime, velocity only needs commons-lang, slf4j-api, and one of the slf4j bindings.</p>
 <p>The following table lists all needed jars.</p>
 <table class="table">
 <thead>
@@ -247,19 +247,11 @@ h2:hover > .headerlink, h3:hover > .head
 <td>you'll also need an slf4j binding at runtime</td>
 </tr>
 <tr>
-<td>commons-collections</td>
-<td>3.2.2</td>
-<td>Yes</td>
-<td>No</td>
-<td>No</td>
-<td></td>
-</tr>
-<tr>
 <td>commons-lang</td>
 <td>3.5</td>
 <td>Yes</td>
-<td>No</td>
-<td>No</td>
+<td>Yes</td>
+<td>Yes</td>
 <td></td>
 </tr>
 <tr>
@@ -296,7 +288,7 @@ h2:hover > .headerlink, h3:hover > .head
 </tr>
 </tbody>
 </table>
-<p>At runtime, Velocity Engine only requires the SLF4J API jar, and will require an SLF4J binding to be present in the path. Typically, one of:</p>
+<p>Here is a list of slf4j bindings:</p>
 <ul>
 <li><a href="http://software.clapper.org/avsl/">AVSL</a> - “A Very Simple Logger”</li>
 <li><a href="http://www.slf4j.org/api/org/slf4j/impl/JDK14LoggerAdapter.html">SLF4J JDK14 Adapter</a> - redirect logs towards Java 1.4+ logging framework</li>

Modified: velocity/site/production/engine/2.0/upgrading.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/2.0/upgrading.html?rev=1773490&r1=1773489&r2=1773490&view=diff
==============================================================================
--- velocity/site/production/engine/2.0/upgrading.html (original)
+++ velocity/site/production/engine/2.0/upgrading.html Fri Dec  9 23:43:52 2016
@@ -245,10 +245,10 @@ space.gobbling = bc
 The 1.x behavior did send invalid reference events in all those cases.</li>
 </ul>
 </li>
-<li>The <code>ResourceLoader</code> class has been deprecated in favor of a <code>ResourceLoader2</code> class, in which the <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>. Since <code>ResourceLoader</code> inherits from <code>ResourceLoader2</code>, the change remains backward compatible, but custom resource loaders should be upgraded to avoid deprecation warnings.</li>
+<li>The <code>ResourceLoader</code> class API has replaced InputStream getters by Reader getters: <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>.</li>
 <li>the default encoding ('ISO-8859-1' in 1.x) is now UTF-8.</li>
 <li>the MethodException event handler now receives an additional argument providing template name and location infos.</li>
-<li>all occurences of the class org.apache.commons.collections.ExtendedProperties in the initialization API have been replaced by org.apache.velocity.util.ExtProperties.</li>
+<li>Initialization methods in Velocity and VelocityEngine taking an ExtendedProperties have been removed (but <code>setProperties(Properties)</code> methods are still here). All occurences of the org.apache.commons.collections.ExtendedProperties class in the runtime internal initialization API have been replaced by org.apache.velocity.util.ExtProperties.</li>
 <li>the macros are now using a 'call by sharing' convention (which means that all arguments are evaluated once at start, and that the macro receives a copy of the reference to each argument).</li>
 <li>the <code>UberspectLoggable</code> interface has been removed.</li>
 </ul>
@@ -262,9 +262,10 @@ The 1.x behavior did send invalid refere
 <h3 id="dependencies-changes">Dependencies changes:<a class="headerlink" href="#dependencies-changes" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Velocity now requires a JDK version of 1.7 or higher.</li>
-<li>commons-lang, commons-collections and commons-logging aren't needed any more at runtime.</li>
-<li>there's a new runtime dependency, slf4j-api 1.7.12</li>
-<li>you'll need an <a href="dependencies.html">SLF4J binding</a></li>
+<li>commons-collections and commons-logging aren't needed any more at runtime.</li>
+<li>there's a new runtime dependency, slf4j-api 1.7.12.</li>
+<li>you'll need an <a href="dependencies.html">SLF4J binding</a>.</li>
+<li>commons-lang has to be upgraded to 3.5.</li>
 </ul>
 <h2 id="upgrading-from-velocity-16x-to-velocity-17x">Upgrading from Velocity 1.6.x to Velocity 1.7.x<a class="headerlink" href="#upgrading-from-velocity-16x-to-velocity-17x" title="Permanent link">&para;</a></h2>
 <p>There are no changes in the dependencies since Velocity 1.6</p>

Modified: velocity/site/production/engine/devel/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/changes.html?rev=1773490&r1=1773489&r2=1773490&view=diff
==============================================================================
--- velocity/site/production/engine/devel/changes.html (original)
+++ velocity/site/production/engine/devel/changes.html Fri Dec  9 23:43:52 2016
@@ -471,7 +471,7 @@ h2:hover > .headerlink, h3:hover > .head
         <td>
           <img src="images/add.png"/>
         </td>
-        <td> The ResourceLoader API now provides a Reader rather than an InputStream. The InputStream getter method has been deprecated. Also fixes VELOCITY-599. . Fixes <a href="https://issues.apache.org/jira/browse/VELOCITY-793">VELOCITY-793</a>. </td>
+        <td> The ResourceLoader API now provides a Reader rather than an InputStream. Also fixes VELOCITY-599. . Fixes <a href="https://issues.apache.org/jira/browse/VELOCITY-793">VELOCITY-793</a>. </td>
         <td>cbrisson</td>
       </tr>
       <tr>
@@ -594,13 +594,6 @@ h2:hover > .headerlink, h3:hover > .head
         <td>apetrelli</td>
       </tr>
       <tr>
-        <td>
-          <img src="images/add.png"/>
-        </td>
-        <td> Shading of Commons Lang and Commons Collections . Fixes <a href="https://issues.apache.org/jira/browse/VELOCITY-789">VELOCITY-789</a>. </td>
-        <td>apetrelli</td>
-      </tr>
-      <tr>
         <td>
           <img src="images/add.png"/>
         </td>

Modified: velocity/site/production/engine/devel/dependencies.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/dependencies.html?rev=1773490&r1=1773489&r2=1773490&view=diff
==============================================================================
--- velocity/site/production/engine/devel/dependencies.html (original)
+++ velocity/site/production/engine/devel/dependencies.html Fri Dec  9 23:43:52 2016
@@ -224,7 +224,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h2 id="velocity-dependencies">Velocity Dependencies<a class="headerlink" href="#velocity-dependencies" title="Permanent link">&para;</a></h2>
-<p>When building from sources, Maven should fetch all needed dependencies. At runtime, velocity only needs slf4j-api, and one of the slf4j bindings (needed classes from commons-lang and commons-collections are incorporated using <a href="https://maven.apache.org/plugins/maven-shade-plugin/">"shading"</a>).</p>
+<p>When building from sources, Maven should fetch all needed dependencies. At runtime, velocity only needs commons-lang, slf4j-api, and one of the slf4j bindings.</p>
 <p>The following table lists all needed jars.</p>
 <table class="table">
 <thead>
@@ -247,19 +247,11 @@ h2:hover > .headerlink, h3:hover > .head
 <td>you'll also need an slf4j binding at runtime</td>
 </tr>
 <tr>
-<td>commons-collections</td>
-<td>3.2.2</td>
-<td>Yes</td>
-<td>No</td>
-<td>No</td>
-<td></td>
-</tr>
-<tr>
 <td>commons-lang</td>
 <td>3.5</td>
 <td>Yes</td>
-<td>No</td>
-<td>No</td>
+<td>Yes</td>
+<td>Yes</td>
 <td></td>
 </tr>
 <tr>
@@ -296,7 +288,7 @@ h2:hover > .headerlink, h3:hover > .head
 </tr>
 </tbody>
 </table>
-<p>At runtime, Velocity Engine only requires the SLF4J API jar, and will require an SLF4J binding to be present in the path. Typically, one of:</p>
+<p>Here is a list of slf4j bindings:</p>
 <ul>
 <li><a href="http://software.clapper.org/avsl/">AVSL</a> - “A Very Simple Logger”</li>
 <li><a href="http://www.slf4j.org/api/org/slf4j/impl/JDK14LoggerAdapter.html">SLF4J JDK14 Adapter</a> - redirect logs towards Java 1.4+ logging framework</li>

Modified: velocity/site/production/engine/devel/upgrading.html
URL: http://svn.apache.org/viewvc/velocity/site/production/engine/devel/upgrading.html?rev=1773490&r1=1773489&r2=1773490&view=diff
==============================================================================
--- velocity/site/production/engine/devel/upgrading.html (original)
+++ velocity/site/production/engine/devel/upgrading.html Fri Dec  9 23:43:52 2016
@@ -245,10 +245,10 @@ space.gobbling = bc
 The 1.x behavior did send invalid reference events in all those cases.</li>
 </ul>
 </li>
-<li>The <code>ResourceLoader</code> class has been deprecated in favor of a <code>ResourceLoader2</code> class, in which the <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>. Since <code>ResourceLoader</code> inherits from <code>ResourceLoader2</code>, the change remains backward compatible, but custom resource loaders should be upgraded to avoid deprecation warnings.</li>
+<li>The <code>ResourceLoader</code> class API has replaced InputStream getters by Reader getters: <code>InputStream ResourceLoader.getResourceStream(String name)</code> has been replaced by a <code>Reader ResourceLoader.getResourceReader(String name, String encoding)</code>.</li>
 <li>the default encoding ('ISO-8859-1' in 1.x) is now UTF-8.</li>
 <li>the MethodException event handler now receives an additional argument providing template name and location infos.</li>
-<li>all occurences of the class org.apache.commons.collections.ExtendedProperties in the initialization API have been replaced by org.apache.velocity.util.ExtProperties.</li>
+<li>Initialization methods in Velocity and VelocityEngine taking an ExtendedProperties have been removed (but <code>setProperties(Properties)</code> methods are still here). All occurences of the org.apache.commons.collections.ExtendedProperties class in the runtime internal initialization API have been replaced by org.apache.velocity.util.ExtProperties.</li>
 <li>the macros are now using a 'call by sharing' convention (which means that all arguments are evaluated once at start, and that the macro receives a copy of the reference to each argument).</li>
 <li>the <code>UberspectLoggable</code> interface has been removed.</li>
 </ul>
@@ -262,9 +262,10 @@ The 1.x behavior did send invalid refere
 <h3 id="dependencies-changes">Dependencies changes:<a class="headerlink" href="#dependencies-changes" title="Permanent link">&para;</a></h3>
 <ul>
 <li>Velocity now requires a JDK version of 1.7 or higher.</li>
-<li>commons-lang, commons-collections and commons-logging aren't needed any more at runtime.</li>
-<li>there's a new runtime dependency, slf4j-api 1.7.12</li>
-<li>you'll need an <a href="dependencies.html">SLF4J binding</a></li>
+<li>commons-collections and commons-logging aren't needed any more at runtime.</li>
+<li>there's a new runtime dependency, slf4j-api 1.7.12.</li>
+<li>you'll need an <a href="dependencies.html">SLF4J binding</a>.</li>
+<li>commons-lang has to be upgraded to 3.5.</li>
 </ul>
 <h2 id="upgrading-from-velocity-16x-to-velocity-17x">Upgrading from Velocity 1.6.x to Velocity 1.7.x<a class="headerlink" href="#upgrading-from-velocity-16x-to-velocity-17x" title="Permanent link">&para;</a></h2>
 <p>There are no changes in the dependencies since Velocity 1.6</p>

Modified: velocity/site/production/tools/devel/changes.html
URL: http://svn.apache.org/viewvc/velocity/site/production/tools/devel/changes.html?rev=1773490&r1=1773489&r2=1773490&view=diff
==============================================================================
--- velocity/site/production/tools/devel/changes.html (original)
+++ velocity/site/production/tools/devel/changes.html Fri Dec  9 23:43:52 2016
@@ -330,7 +330,7 @@ h2:hover > .headerlink, h3:hover > .head
         <td>
           <img src="images/add.png"/>
         </td>
-        <td> Reflect Velocity Engine dependency shading of commons-lang and commons-collections . </td>
+        <td> Replace all uses of commons-collections ExtendedProperties class by org.apache.velocity.util.ExtProperties . </td>
         <td>cbrisson</td>
       </tr>
       <tr>