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/08/16 09:06:08 UTC

[maven-jxr] branch JXR-157 updated (5543255 -> 2313f3a)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch JXR-157
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git


 discard 5543255  [JXR-174] Revert JXR-157 until next major version
     new 2313f3a  [JXR-174] Revert JXR-157 until next major version

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   (5543255)
            \
             N -- N -- N   refs/heads/JXR-157 (2313f3a)

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:


[maven-jxr] 01/01: [JXR-174] Revert JXR-157 until next major version

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch JXR-157
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git

commit 2313f3aa8448da577bd7190ceeffcc9b9b028681
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Aug 16 10:13:01 2022 +0200

    [JXR-174] Revert JXR-157 until next major version
    
    Downgrade to Velocity 1.7 to be consistent with Doxia Sitetools 1.11.1.
    
    This closes #69
---
 maven-jxr/pom.xml | 3 ++-
 pom.xml           | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/maven-jxr/pom.xml b/maven-jxr/pom.xml
index 1d005ae..6f7f72b 100644
--- a/maven-jxr/pom.xml
+++ b/maven-jxr/pom.xml
@@ -89,7 +89,8 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-engine-core</artifactId>
+      <artifactId>velocity</artifactId>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index d5b9153..12e1e35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,11 +92,6 @@ under the License.
         <artifactId>commons-lang3</artifactId>
         <version>3.12.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.velocity</groupId>
-        <artifactId>velocity-engine-core</artifactId>
-        <version>2.3</version>
-      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-java</artifactId>