Author: michaelo
Date: Sun Feb 7 22:15:07 2016
New Revision: 1729045
URL: http://svn.apache.org/viewvc?rev=1729045&view=rev
Log:
[MSITE-762] Upgrade Velocity from 1.5 to 1.7
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/site/apt/index.apt.vm
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site_sv.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sun Feb 7 22:15:07 2016
@@ -377,7 +377,7 @@ under the License.
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
Sun Feb 7 22:15:07 2016
@@ -27,7 +27,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
</skin>
<body>
<breadcrumbs>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/src/site/site.xml?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/src/site/site.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-609/src/site/site.xml
Sun Feb 7 22:15:07 2016
@@ -27,7 +27,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
</skin>
<body>
<breadcrumbs>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/site/apt/index.apt.vm?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/site/apt/index.apt.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/site/apt/index.apt.vm
Sun Feb 7 22:15:07 2016
@@ -97,5 +97,5 @@ Velocity processing
| \ \ projectInfoReportsPluginVersion | |
$projectInfoReportsPluginVersion |
*---------------------------------+--------------------+-------------------------------+
- see
<<<{{{/plugins/maven-site-plugin/apidocs/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.html#createSiteRenderingContext(java.util.Locale)}AbstractSiteRenderingMojo.createSiteRenderingContext(...)}}>>>
+ see
<<<{{{/plugins/maven-site-plugin/apidocs/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.html\#createSiteRenderingContext(java.util.Locale)}AbstractSiteRenderingMojo.createSiteRenderingContext(...)}}>>>
source for more details.
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site.xml?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site.xml
Sun Feb 7 22:15:07 2016
@@ -27,6 +27,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
+ <version>1.5</version>
</skin>
<body>
<breadcrumbs>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site_sv.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site_sv.xml?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site_sv.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site_sv.xml
Sun Feb 7 22:15:07 2016
@@ -27,6 +27,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
+ <version>1.5</version>
</skin>
<body>
<breadcrumbs>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/site.xml?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/site.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/site.xml
Sun Feb 7 22:15:07 2016
@@ -27,7 +27,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
</skin>
<body>
<breadcrumbs>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/site.xml?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/site.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/site.xml Sun
Feb 7 22:15:07 2016
@@ -27,7 +27,7 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
</skin>
<body>
<breadcrumbs>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm?rev=1729045&r1=1729044&r2=1729045&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/template-skin/src/main/resources/META-INF/maven/site.vm
Sun Feb 7 22:15:07 2016
@@ -18,7 +18,7 @@
<head></head>
<body>
-<h1>variables available in templates' Velocity context</h1>
+<h1>variables available in template's Velocity context</h1>
<p>Variables are prepared in template's Velocity context by <a
href="http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/";>doxia-siterenderer</a>.</p>
@@ -62,8 +62,8 @@ render=$render
text=$text
sorter=$sorter
xml=$xml
-context (cause NullPointerException)
-link (cause NullPointerException)
+context=$context
+link=$link
</pre>
\$date.format('yyyy-MM-dd', \$currentDate) = $date.format('yyyy-MM-dd',
$currentDate)
