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 2024/10/06 15:04:40 UTC
(maven-doxia-sitetools) branch dependabot/maven/org.apache.velocity-velocity-engine-core-2.4 updated (2d8c811 -> cfd74d5)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch dependabot/maven/org.apache.velocity-velocity-engine-core-2.4
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
omit 2d8c811 Bump org.apache.velocity:velocity-engine-core from 2.3 to 2.4
add 1de20e3 Disable JIRA comments from GitHub (#175)
add 004b948 [DOXIASITETOOLS-348] Allow to require a parent site descriptor (#173)
add 2382658 Bump org.junit:junit-bom from 5.11.0 to 5.11.1
add f3d0a6a Bump commons-io:commons-io from 2.16.1 to 2.17.0
add ea6eb76 [DOXIASITETOOLS-351] Upgrade to Doxia 2.0.0
add 9f6d9ec Bump org.junit:junit-bom from 5.11.1 to 5.11.2
new a0a555b Bump org.apache.velocity:velocity-engine-core from 2.3 to 2.4
new cfd74d5 Update plexus-velocity to 2.2.0
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 (2d8c811)
\
N -- N -- N refs/heads/dependabot/maven/org.apache.velocity-velocity-engine-core-2.4 (cfd74d5)
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 2 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:
.asf.yaml | 2 +-
.../apache/maven/doxia/tools/DefaultSiteTool.java | 12 ++-
.../org/apache/maven/doxia/tools/SiteToolTest.java | 93 +++++++++++++---------
.../parent-site.xml} | 5 +-
.../full => require-parent-test}/pom.xml | 9 ++-
.../src/site/site.xml | 6 +-
doxia-site-model/src/main/mdo/site.mdo | 10 +++
doxia-site-renderer/pom.xml | 2 +-
pom.xml | 6 +-
9 files changed, 93 insertions(+), 52 deletions(-)
copy doxia-integration-tools/src/test/resources/unit/{interpolation-child-test/src/site/site.xml => require-parent-test/parent-site.xml} (86%)
copy doxia-integration-tools/src/test/resources/unit/{site-tool-locales-test/full => require-parent-test}/pom.xml (86%)
copy doxia-integration-tools/src/test/resources/unit/{interpolation-child-test => require-parent-test}/src/site/site.xml (86%)
(maven-doxia-sitetools) 01/02: Bump org.apache.velocity:velocity-engine-core from 2.3 to 2.4
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch dependabot/maven/org.apache.velocity-velocity-engine-core-2.4
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit a0a555b1c3a093e2aa5d25dcefa7701390ef1bce
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Sep 23 23:57:14 2024 +0000
Bump org.apache.velocity:velocity-engine-core from 2.3 to 2.4
Bumps org.apache.velocity:velocity-engine-core from 2.3 to 2.4.
---
updated-dependencies:
- dependency-name: org.apache.velocity:velocity-engine-core
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
---
doxia-site-renderer/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index ce7fb51..dadd431 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -33,7 +33,7 @@ under the License.
<description>The Site Renderer handles the rendering of sites, merging site model with document content.</description>
<properties>
- <velocityEngineVersion>2.3</velocityEngineVersion>
+ <velocityEngineVersion>2.4</velocityEngineVersion>
<velocityToolsVersion>3.1</velocityToolsVersion>
</properties>
(maven-doxia-sitetools) 02/02: Update plexus-velocity to 2.2.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch dependabot/maven/org.apache.velocity-velocity-engine-core-2.4
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit cfd74d51b7329d7f5115e0d7188bbbfcc138f717
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Oct 6 17:04:30 2024 +0200
Update plexus-velocity to 2.2.0
---
doxia-site-renderer/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index dadd431..41e5f14 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -102,7 +102,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>