You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/04/11 16:03:19 UTC
[freemarker] branch 2.3-gae updated: Increased version number to
2.3.31-SNAPSHOT
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 88ebbaa Increased version number to 2.3.31-SNAPSHOT
88ebbaa is described below
commit 88ebbaae0029e8ad49c7c6c723684e44674b703b
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Apr 11 18:02:41 2020 +0200
Increased version number to 2.3.31-SNAPSHOT
---
src/main/java/freemarker/template/Configuration.java | 3 +++
src/main/java/freemarker/template/_TemplateAPI.java | 1 +
src/main/resources/freemarker/version.properties | 8 ++++----
src/test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 +
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java
index 93139ae..bd7585a 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -472,6 +472,9 @@ public class Configuration extends Configurable implements Cloneable, ParserConf
/** FreeMarker version 2.3.30 (an {@link #Configuration(Version) incompatible improvements break-point}) */
public static final Version VERSION_2_3_30 = new Version(2, 3, 30);
+ /** FreeMarker version 2.3.31 (an {@link #Configuration(Version) incompatible improvements break-point}) */
+ public static final Version VERSION_2_3_31 = new Version(2, 3, 31);
+
/** The default of {@link #getIncompatibleImprovements()}, currently {@link #VERSION_2_3_0}. */
public static final Version DEFAULT_INCOMPATIBLE_IMPROVEMENTS = Configuration.VERSION_2_3_0;
/** @deprecated Use {@link #DEFAULT_INCOMPATIBLE_IMPROVEMENTS} instead. */
diff --git a/src/main/java/freemarker/template/_TemplateAPI.java b/src/main/java/freemarker/template/_TemplateAPI.java
index 18c16e4..71feecb 100644
--- a/src/main/java/freemarker/template/_TemplateAPI.java
+++ b/src/main/java/freemarker/template/_TemplateAPI.java
@@ -54,6 +54,7 @@ public class _TemplateAPI {
public static final int VERSION_INT_2_3_28 = Configuration.VERSION_2_3_28.intValue();
public static final int VERSION_INT_2_3_29 = Configuration.VERSION_2_3_29.intValue();
public static final int VERSION_INT_2_3_30 = Configuration.VERSION_2_3_30.intValue();
+ public static final int VERSION_INT_2_3_31 = Configuration.VERSION_2_3_31.intValue();
public static final int VERSION_INT_2_4_0 = Version.intValueFor(2, 4, 0);
/**
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index 1980ccb..dfa4c1b 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.30
+version=2.3.31-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.30
+mavenVersion=2.3.31-SNAPSHOT
# Version string that conforms to OSGi
# ------------------------------------
@@ -73,7 +73,7 @@ mavenVersion=2.3.30
# 2.4.0.rc01
# 2.4.0.pre01
# 2.4.0.nightly_@timestampInVersion@
-versionForOSGi=2.3.30.stable
+versionForOSGi=2.3.31.nightly_@timestampInVersion@
# Version string that conforms to legacy MF
# -----------------------------------------
@@ -92,7 +92,7 @@ versionForOSGi=2.3.30.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.30
+versionForMf=2.3.30.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 3334301..b973358 100644
--- a/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
+++ b/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
@@ -99,6 +99,7 @@ public class DefaultObjectWrapperTest {
expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.28
expected.add(Configuration.VERSION_2_3_27); // no non-BC change in 2.3.29
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
List<Version> actual = new ArrayList<>();
for (int i = _TemplateAPI.VERSION_INT_2_3_0; i <= Configuration.getVersion().intValue(); i++) {