You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/26 21:38:45 UTC
[maven-doxia-sitetools] branch DOXIASITETOOLS-230 updated (1103efc -> fa4eafb)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch DOXIASITETOOLS-230
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
omit 1103efc [DOXIASITETOOLS-230] Upgrade to Velocity Engine 2.3 and Velocity Tools 3.1
new fa4eafb [DOXIASITETOOLS-230] Upgrade to Velocity Engine 2.3 and Velocity Tools 3.1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1103efc)
\
N -- N -- N refs/heads/DOXIASITETOOLS-230 (fa4eafb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
doxia-site-renderer/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-230] Upgrade to Velocity Engine 2.3 and Velocity Tools 3.1
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIASITETOOLS-230
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit fa4eafbd3523353b1137ed03ba5894bcd7ad2ee1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 15 22:23:10 2022 +0200
[DOXIASITETOOLS-230] Upgrade to Velocity Engine 2.3 and Velocity Tools 3.1
This closes #42
---
doxia-site-renderer/pom.xml | 37 +++++----------------------
doxia-site-renderer/src/site/apt/index.apt.vm | 8 +++---
pom.xml | 10 --------
3 files changed, 10 insertions(+), 45 deletions(-)
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index 4ecf0cf..8421f2c 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -103,6 +103,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
+ <version>2.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -118,39 +119,13 @@ under the License.
<!-- misc -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>2.0</version>
- <exclusions>
- <!-- exclude VelocityView and VelocityStruts specific dependencies -->
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-taglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-tiles</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sslext</groupId>
- <artifactId>sslext</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.velocity.tools</groupId>
+ <artifactId>velocity-tools-generic</artifactId>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/doxia-site-renderer/src/site/apt/index.apt.vm b/doxia-site-renderer/src/site/apt/index.apt.vm
index efb1952..d4ff531 100644
--- a/doxia-site-renderer/src/site/apt/index.apt.vm
+++ b/doxia-site-renderer/src/site/apt/index.apt.vm
@@ -34,7 +34,7 @@ Doxia Sitetools - Site Renderer
Documents can be dynamically generated with {{{/doxia/doxia/doxia-sink-api/}Doxia Sink API}}, like Maven reports,
or simply read from static files written in {{{/doxia/references/index.html}markup supported by Doxia Parsers}},
- eventually processed by {{{http://velocity.apache.org/engine/1.7/}Velocity}}
+ eventually processed by {{{https://velocity.apache.org/engine/2.3/}Velocity}}
if their file names end in <<<.vm>>>.
[doxia-site-renderer.png]
@@ -94,13 +94,13 @@ Doxia Sitetools - Site Renderer
*------------------+----------------------------------------------------------+-------------------------------+
|| Variable || Type || Description ||
*------------------+----------------------------------------------------------+-------------------------------+
-| <<<alternator>>> | {{{$generic/AlternatorTool.html}AlternatorTool}} | For creating alternators to easily alternate over a set of values.
+| <<<alternator>>> | {{{$generic/AlternatorTool.html}AlternatorTool}} | <<Deprecated>>: use CSS3 nth-child(even/odd) selectors or #if($foreach.index % 2). For creating alternators to easily alternate over a set of values.
*------------------+----------------------------------------------------------+-------------------------------+
| <<<class>>> | {{{$generic/ClassTool.html}ClassTool}} | For simplifying reflective lookup of information about classes and their fields, methods and constructors.
*------------------+----------------------------------------------------------+-------------------------------+
| <<<context>>> | {{{$generic/ContextTool.html}ContextTool}} | For convenient access to context data and metadata.
*------------------+----------------------------------------------------------+-------------------------------+
-| <<<convert>>> | {{{$generic/ConversionTool.html}ConversionTool}} | For converting String values to richer object Types.
+| <<<convert>>> | {{{$generic/ConversionTool.html}ConversionTool}} | <<Deprecated>>: use NumberTool for numbers formatting/parsing, DateTool for date/time formatting/parsing, or CollectionTool for toStrings(). For converting String values to richer object Types.
*------------------+----------------------------------------------------------+-------------------------------+
| <<<date>>> | {{{$generic/ComparisonDateTool.html}ComparisonDateTool}} | For manipulating, formatting, and comparing dates.
*------------------+----------------------------------------------------------+-------------------------------+
@@ -122,7 +122,7 @@ Doxia Sitetools - Site Renderer
*------------------+----------------------------------------------------------+-------------------------------+
| <<<text>>> | {{{$generic/ResourceTool.html}ResourceTool}} | For simplified access to resource bundles for internationalization or other dynamic content needs.
*------------------+----------------------------------------------------------+-------------------------------+
-| <<<sorter>>> | {{{$generic/SortTool.html}SortTool}} | Used to sort collections (or arrays, iterators, etc) on any arbitary set of properties exposed by the objects contained within the collection.
+| <<<sorter>>> | {{{$generic/SortTool.html}SortTool}} | <<Deprecated>>: use CollectionTool sort methods. Used to sort collections (or arrays, iterators, etc) on any arbitary set of properties exposed by the objects contained within the collection.
*------------------+----------------------------------------------------------+-------------------------------+
| <<<xml>>> | {{{$generic/XmlTool.html}XmlTool}} | For reading/navigating XML files. This uses dom4j under the covers and provides complete XPath support.
*------------------+----------------------------------------------------------+-------------------------------+
diff --git a/pom.xml b/pom.xml
index 8c71396..2529215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,11 +156,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-velocity</artifactId>
- <version>1.2</version>
- </dependency>
<!-- Don't upgrade, it is broken: https://github.com/codehaus-plexus/plexus-utils/commit/1e18ddcc98f318b36449102f3267fd4631cc668b -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -184,11 +179,6 @@ under the License.
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
<!-- Test -->
<dependency>
<groupId>org.junit.jupiter</groupId>