You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2026/09/01 13:59:28 UTC
(velocity-engine) 02/02: Revert "Release 2.5: set versions to 2.5 and =2.5"
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit b115c7ef83f8eaa7bb7792ae2081841c5feb9f18
Author: Claude Brisson <cl...@renegat.net>
AuthorDate: Tue Sep 1 15:57:35 2026 +0200
Revert "Release 2.5: set versions to 2.5 and <scm><tag>=2.5"
This reverts commit bfbd57270df474b7e97f847139fb9fe179d98418.
---
pom.xml | 4 +-
pom.xml.versionsBackup | 283 ---------------------------------
spring-velocity-support/pom.xml | 2 +-
spring5-velocity-support/pom.xml | 2 +-
velocity-custom-parser-example/pom.xml | 2 +-
velocity-engine-core/pom.xml | 2 +-
velocity-engine-examples/pom.xml | 2 +-
velocity-engine-scripting/pom.xml | 2 +-
8 files changed, 8 insertions(+), 291 deletions(-)
diff --git a/pom.xml b/pom.xml
index 130ac0b2..874b84a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
</parent>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
+ <version>2.5-SNAPSHOT</version>
<name>Apache Velocity</name>
<url>http://velocity.apache.org/engine/devel/</url>
@@ -133,7 +133,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/velocity-engine.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/velocity-engine.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=velocity-engine.git</url>
- <tag>2.5</tag>
+ <tag>2.4</tag>
</scm>
<issueManagement>
diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup
deleted file mode 100644
index a2dfad31..00000000
--- a/pom.xml.versionsBackup
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-master</artifactId>
- <version>8</version>
- <relativePath />
- </parent>
-
- <artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
-
- <name>Apache Velocity</name>
- <url>http://velocity.apache.org/engine/devel/</url>
- <description>Apache Velocity is a general purpose template engine.</description>
- <inceptionYear>2000</inceptionYear>
- <packaging>pom</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <junit.version>4.13.2</junit.version>
- <slf4j.version>2.0.17</slf4j.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- full checking is left disabled
- <doclint>html,missing,reference,syntax</doclint>
- -->
- <doclint>none</doclint>
- </configuration>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <site>
- <id>velocity.apache.org</id>
- <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/</url>
- </site>
- </distributionManagement>
-
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/velocity-engine.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/velocity-engine.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=velocity-engine.git</url>
- <tag>2.4</tag>
- </scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/VELOCITY</url>
- </issueManagement>
- <modules>
- <module>velocity-engine-core</module>
- <module>velocity-engine-examples</module>
- <module>velocity-engine-scripting</module>
- <module>velocity-custom-parser-example</module>
- <module>spring5-velocity-support</module>
- <module>spring-velocity-support</module>
- </modules>
-
- <!-- This project is an effort by many people. If you feel that your name
- should be in here and has been omitted in error, please open an issue
- with the Apache Velocity Issue tracker. -->
- <contributors>
- <contributor>
- <name>Adrian Tarau</name>
- </contributor>
- <contributor>
- <name>Aki Nieminen</name>
- </contributor>
- <contributor>
- <name>Alexey Pachenko</name>
- </contributor>
- <contributor>
- <name>Anil K. Vijendran</name>
- </contributor>
- <contributor>
- <name>Attila Szegedi</name>
- </contributor>
- <contributor>
- <name>Bob McWhirter</name>
- </contributor>
- <contributor>
- <name>Byron Foster</name>
- </contributor>
- <contributor>
- <name>Candid Dauth</name>
- </contributor>
- <contributor>
- <name>Christoph Reck</name>
- </contributor>
- <contributor>
- <name>Darren Cruse</name>
- </contributor>
- <contributor>
- <name>Dave Bryson</name>
- </contributor>
- <contributor>
- <name>David Kinnvall</name>
- </contributor>
- <contributor>
- <name>Dawid Weiss</name>
- </contributor>
- <contributor>
- <name>Dishara Wijewardana</name>
- </contributor>
- <contributor>
- <name>Eelco Hillenius</name>
- </contributor>
- <contributor>
- <name>Fedor Karpelevitch</name>
- </contributor>
- <contributor>
- <name>Felipe Maschio</name>
- </contributor>
- <contributor>
- <name>Gal Shachor</name>
- </contributor>
- <contributor>
- <name>Hervé Boutemy</name>
- </contributor>
- <contributor>
- <name>Jarkko Viinamäki</name>
- </contributor>
- <contributor>
- <name>Jeff Bowden</name>
- </contributor>
- <contributor>
- <name>Jorgen Rydenius</name>
- </contributor>
- <contributor>
- <name>Jose Alberto Fernandez</name>
- </contributor>
- <contributor>
- <name>Kasper Nielsen</name>
- </contributor>
- <contributor>
- <name>Kent Johnson</name>
- </contributor>
- <contributor>
- <name>Kyle F. Downey</name>
- </contributor>
- <contributor>
- <name>Leon Messerschmidt</name>
- </contributor>
- <contributor>
- <name>Llewellyn Falco</name>
- </contributor>
- <contributor>
- <name>Matt Raible</name>
- </contributor>
- <contributor>
- <name>Matt Ryall</name>
- </contributor>
- <contributor>
- <name>Matthijs Lambooy</name>
- </contributor>
- <contributor>
- <name>Oswaldo Hernandez</name>
- </contributor>
- <contributor>
- <name>Paulo Gaspar</name>
- </contributor>
- <contributor>
- <name>Peter Romianowski</name>
- </contributor>
- <contributor>
- <name>Robert Burrell Donkin</name>
- </contributor>
- <contributor>
- <name>Robert Fuller</name>
- </contributor>
- <contributor>
- <name>Sam Ruby</name>
- </contributor>
- <contributor>
- <name>Sean Legassick</name>
- </contributor>
- <contributor>
- <name>Serge Knystautas</name>
- </contributor>
- <contributor>
- <name>Stephane Bailliez</name>
- </contributor>
- <contributor>
- <name>Stephen Habermann</name>
- </contributor>
- <contributor>
- <name>Sylwester Lachiewicz</name>
- </contributor>
- </contributors>
-</project>
diff --git a/spring-velocity-support/pom.xml b/spring-velocity-support/pom.xml
index 76338461..1afb0a73 100644
--- a/spring-velocity-support/pom.xml
+++ b/spring-velocity-support/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>spring-velocity-support</artifactId>
<name>Spring framework Velocity support</name>
diff --git a/spring5-velocity-support/pom.xml b/spring5-velocity-support/pom.xml
index 3b184589..f6c91af1 100644
--- a/spring5-velocity-support/pom.xml
+++ b/spring5-velocity-support/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>spring5-velocity-support</artifactId>
<name>Spring 5 framework Velocity support</name>
diff --git a/velocity-custom-parser-example/pom.xml b/velocity-custom-parser-example/pom.xml
index 302aeef6..7c609b23 100644
--- a/velocity-custom-parser-example/pom.xml
+++ b/velocity-custom-parser-example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>velocity-custom-parser-example</artifactId>
diff --git a/velocity-engine-core/pom.xml b/velocity-engine-core/pom.xml
index 5f4045f6..0e136ee0 100644
--- a/velocity-engine-core/pom.xml
+++ b/velocity-engine-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>velocity-engine-core</artifactId>
diff --git a/velocity-engine-examples/pom.xml b/velocity-engine-examples/pom.xml
index 06be5b39..97c694b2 100644
--- a/velocity-engine-examples/pom.xml
+++ b/velocity-engine-examples/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>velocity-engine-examples</artifactId>
diff --git a/velocity-engine-scripting/pom.xml b/velocity-engine-scripting/pom.xml
index 6a513768..144316f1 100644
--- a/velocity-engine-scripting/pom.xml
+++ b/velocity-engine-scripting/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.5</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>velocity-engine-scripting</artifactId>
<name>Apache Velocity - JSR 223 Scripting</name>