This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/2.3-gae by this push:
new 3ac86b54 Updated version to 2.3.33-nightly
3ac86b54 is described below
commit 3ac86b54aa4d91d3540e8f17efffaa56c917b0f1
Author: ddekany <[email protected]>
AuthorDate: Sun Mar 19 17:44:26 2023 +0100
Updated version to 2.3.33-nightly
---
src/main/resources/freemarker/version.properties | 8 ++++----
src/test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/freemarker/version.properties
b/src/main/resources/freemarker/version.properties
index fa1fc2a9..95cd4ef3 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -56,11 +56,11 @@
# continue working without modification or recompilation.
# - When the major version number is increased, major backward
# compatibility violations are allowed, but still should be avoided.
-version=2.3.32
+version=2.3.33-nightly_@timestampInVersion@
# This exists as for Maven we use "-SNAPSHOT" for nightly releases,
# and no _nightly_@timestampInVersion@. For final releases it's the
# same as "version".
-mavenVersion=2.3.32
+mavenVersion=2.3.33-SNAPSHOT
# Version string that conforms to OSGi
# ------------------------------------
@@ -73,7 +73,7 @@ mavenVersion=2.3.32
# 2.4.0.rc01
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
-versionForOSGi=2.3.32.stable
+versionForOSGi=2.3.33.nightly_@timestampInVersion@
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -92,7 +92,7 @@ versionForOSGi=2.3.32.stable
# "97 denotes "nightly", 98 denotes "pre", 99 denotes "rc" build.
# In general, for the nightly/preview/rc Y of version 2.X, the versionForMf is
# 2.X-1.(99|98).Y. Note the X-1.
-versionForMf=2.3.32
+versionForMf=2.3.32.97
# The date of the build.
# This should be automatically filled by the building tool (Ant).
diff --git a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
index 541bf1bf..d67d1950 100644
--- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
+++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
@@ -104,6 +104,7 @@ public class DefaultObjectWrapperTest {
expected.add(Configuration.VERSION_2_3_27); // no non-BC change in
2.3.30
expected.add(Configuration.VERSION_2_3_27); // no non-BC change in
2.3.31
expected.add(Configuration.VERSION_2_3_27); // no non-BC change in
2.3.32
+ expected.add(Configuration.VERSION_2_3_27); // no non-BC change in
2.3.33
List<Version> actual = new ArrayList<>();
for (int i = _VersionInts.V_2_3_0; i <=
Configuration.getVersion().intValue(); i++) {
