You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/06/04 13:06:30 UTC
[maven-doxia-sitetools] branch velocity22 updated (cb5438e ->
3d1d282)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch velocity22
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
discard cb5438e Upgrade to Velocity 2.2
add e549258 [DOXIA-611] Add line number to RendererException message only when available
add 1b301e6 [DOXIASITETOOLS-219] Fix javadoc issues with JDK 8 when generating documentation
add b88de2b [DOXIASITETOOLS-219] Convert Plexus javadoc to annotations
add ea98c2b Cleanup pom
add f736bcd add Reproducible Builds ok badge
add d77513f update ASF CI url
add 3d13597 update ASF CI url
add c476501 Upgrade maven-project-info-reports-plugin from 3.1.0 to 3.1.1
add 33d7973 DOXIASITETOOLS-226 update JUnit version
add d629e71 Bump junit from 4.13.1 to 4.13.2
add b4f5c4a Bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2
add 8fff1b5 [DOXIASITETOOLS-230] Upgrade to Velocity Engine 2.0
new 3d1d282 Upgrade to Velocity 2.2
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 (cb5438e)
\
N -- N -- N refs/heads/velocity22 (3d1d282)
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:
Jenkinsfile | 2 +-
README.md | 9 +-
doxia-decoration-model/src/main/mdo/decoration.mdo | 2 +-
doxia-doc-renderer/pom.xml | 10 +-
.../docrenderer/AbstractDocumentRenderer.java | 6 +-
.../maven/doxia/docrenderer/DocumentRenderer.java | 1 -
.../doxia/docrenderer/DocumentRendererContext.java | 4 +-
.../docrenderer/itext/AbstractITextRender.java | 15 +--
.../velocity/DefaultVelocityComponent.java | 87 -------------
.../docrenderer/velocity/VelocityComponent.java | 29 -----
.../apache/maven/doxia/tools/ReportComparator.java | 4 +-
.../org/apache/maven/doxia/tools/SiteTool.java | 2 +-
doxia-site-renderer/pom.xml | 22 ++--
.../doxia/siterenderer/DefaultSiteRenderer.java | 21 ++--
.../apache/maven/doxia/siterenderer/Renderer.java | 41 ++++---
.../doxia/siterenderer/SiteRenderingContext.java | 2 +-
.../doxia/siterenderer/SkinResourceLoader.java | 134 ---------------------
.../velocity/DefaultVelocityComponent.java | 88 --------------
.../siterenderer/velocity/VelocityComponent.java | 29 -----
.../siterenderer/DefaultSiteRendererTest.java | 81 ++++++++++++-
.../doxia/siterenderer/SkinResourceLoaderTest.java | 63 ----------
.../src/test/resources/log4j.properties | 24 ----
pom.xml | 66 +++++-----
23 files changed, 186 insertions(+), 556 deletions(-)
delete mode 100644 doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/velocity/DefaultVelocityComponent.java
delete mode 100644 doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/velocity/VelocityComponent.java
delete mode 100644 doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SkinResourceLoader.java
delete mode 100644 doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/velocity/DefaultVelocityComponent.java
delete mode 100644 doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/velocity/VelocityComponent.java
delete mode 100644 doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/SkinResourceLoaderTest.java
delete mode 100644 doxia-site-renderer/src/test/resources/log4j.properties
[maven-doxia-sitetools] 01/01: Upgrade to Velocity 2.2
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch velocity22
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 3d1d282486a00e9b252568594e6dd00c05dfa009
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jun 4 15:00:44 2021 +0200
Upgrade to Velocity 2.2
---
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 725f264..514bce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@ under the License.
</distributionManagement>
<properties>
+ <javaVersion>8</javaVersion>
<doxiaVersion>1.9.1</doxiaVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
<project.build.outputTimestamp>2020-02-19T07:03:09Z</project.build.outputTimestamp>
@@ -185,12 +186,12 @@ under the License.
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.apache.velocity.tools</groupId>
<artifactId>velocity-tools-generic</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
</dependency>
<!-- Test -->
<dependency>