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/15 21:12:57 UTC
[maven-site-plugin] branch MSITE-900 created (now 8ade258d)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSITE-900
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
at 8ade258d [MSITE-900] Upgrade to Doxia Sitetools to 2.0.0-M3
This branch includes the following new commits:
new 8ade258d [MSITE-900] Upgrade to Doxia Sitetools to 2.0.0-M3
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.
[maven-site-plugin] 01/01: [MSITE-900] Upgrade to Doxia Sitetools to 2.0.0-M3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSITE-900
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 8ade258dc04c5e012c695a5374ba24d9c4512f8b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 15 23:09:35 2022 +0200
[MSITE-900] Upgrade to Doxia Sitetools to 2.0.0-M3
---
pom.xml | 2 +-
src/it/projects/doxia-formats/pom.xml | 7 ++++---
src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm | 2 +-
src/site/apt/examples/creating-content.apt.vm | 6 +++---
src/site/apt/examples/creatingskins.apt | 6 +++---
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index da91fa96..6c26c123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@ under the License.
<javaVersion>8</javaVersion>
<!-- for dependencies -->
<doxiaVersion>2.0.0-M2</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M2</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>2.0.0-M3-SNAPSHOT</doxiaSitetoolsVersion>
<jettyVersion>9.4.46.v20220331</jettyVersion>
<wagonVersion>3.5.1</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
diff --git a/src/it/projects/doxia-formats/pom.xml b/src/it/projects/doxia-formats/pom.xml
index 2acd9ee0..1b083cd8 100644
--- a/src/it/projects/doxia-formats/pom.xml
+++ b/src/it/projects/doxia-formats/pom.xml
@@ -35,9 +35,10 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>2.0</version>
+ <groupId>org.apache.velocity.tools</groupId>
+ <artifactId>velocity-tools-generic</artifactId>
+ <version>3.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
index b1e30996..5ae7936b 100644
--- a/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
+++ b/src/it/projects/doxia-formats/src/site/apt/velocity-context.apt.vm
@@ -90,7 +90,7 @@ Doxia Site Renderer Velocity Context
| <<<project>>> | = <<<$project>>>, \
| | <<<project.version>>> = <<<$project.version>>>
*-----------------------+-------------------------------------------------------+
-| <<<property-project-version>>> | = <<<${property-project-version}>>>
+| <<<property-project-version>>> | = <<<$context.get('property-project-version')>>>
*-----------------------+-------------------------------------------------------+
| (attributes) <<<att1>>> | = <<<${att1}>>>
*-----------------------+-------------------------------------------------------+
diff --git a/src/site/apt/examples/creating-content.apt.vm b/src/site/apt/examples/creating-content.apt.vm
index 1d6111ad..514ad0fa 100644
--- a/src/site/apt/examples/creating-content.apt.vm
+++ b/src/site/apt/examples/creating-content.apt.vm
@@ -189,12 +189,12 @@ Creating Content
* <<Markdown conflict with Velocity on ${esc.h}${esc.h} syntax>>:
Since <<<${esc.h}${esc.h}>>> denotes a
- {{{http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments}single line comment}} in Velocity,
+ {{{https://velocity.apache.org/engine/2.3/vtl-reference.html#single-line-comments}single line comment}} in Velocity,
Markdown headers using this syntax are suppressed from generated content.
- You can use {{{http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content}unparsed content syntax}}
+ You can use {{{https://velocity.apache.org/engine/2.3/vtl-reference.html#unparsed-content}unparsed content syntax}}
<<<${esc.h}[[#[[##]]#]]${esc.h}>>> or
- {{{http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html}escape tool}}
+ {{{https://velocity.apache.org/tools/3.1/apidocs/org/apache/velocity/tools/generic/EscapeTool.html}escape tool}}
like <<<${esc.d}\{esc.h\}${esc.d}\{esc.h\}>>>.
* Internationalization
diff --git a/src/site/apt/examples/creatingskins.apt b/src/site/apt/examples/creatingskins.apt
index ffe8c7c5..72a7e74c 100644
--- a/src/site/apt/examples/creatingskins.apt
+++ b/src/site/apt/examples/creatingskins.apt
@@ -86,8 +86,8 @@ Creating Skins
modify it to your needs.
For more information about how to write Velocity templates see the
- {{{http://velocity.apache.org/engine/releases/velocity-1.7/user-guide.html}Velocity User Guide}}
+ {{{https://velocity.apache.org/engine/2.3/user-guide.html}Velocity User Guide}}
and
- {{{http://velocity.apache.org/engine/releases/velocity-1.7/vtl-reference-guide.html}Velocity Template Language Reference Guide}}.
+ {{{https://velocity.apache.org/engine/2.3/vtl-reference.html}Velocity Template Language Reference Guide}}.
- Notice that Velocity 1.7 is used since Maven Site Plugin 3.5, but version 1.5 was used previously.
+ Notice that Velocity 2.3 is used since Maven Site Plugin 4.0.0-M2, but version 1.7 was used previously.