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 f29a7cb5 Still version related fixes/adjustments...
f29a7cb5 is described below
commit f29a7cb5c9178413e8d5721664830abed1b45e23
Author: ddekany <[email protected]>
AuthorDate: Mon Aug 19 13:21:31 2024 +0200
Still version related fixes/adjustments...
---
freemarker-core/src/main/java/freemarker/template/Configuration.java | 5 ++++-
.../src/test/java/freemarker/template/DefaultObjectWrapperTest.java | 1 +
freemarker-manual/src/main/docgen/en_US/book.xml | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git
a/freemarker-core/src/main/java/freemarker/template/Configuration.java
b/freemarker-core/src/main/java/freemarker/template/Configuration.java
index 19488049..d320a46b 100644
--- a/freemarker-core/src/main/java/freemarker/template/Configuration.java
+++ b/freemarker-core/src/main/java/freemarker/template/Configuration.java
@@ -492,7 +492,10 @@ public class Configuration extends Configurable implements
Cloneable, ParserConf
/** FreeMarker version 2.3.33 (an {@link #Configuration(Version)
incompatible improvements break-point}) */
public static final Version VERSION_2_3_33 = new Version(2, 3, 33);
-
+
+ /** FreeMarker version 2.3.34 (an {@link #Configuration(Version)
incompatible improvements break-point}) */
+ public static final Version VERSION_2_3_34 = new Version(2, 3, 34);
+
/** 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/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
b/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
index 51152998..a0885c0c 100644
---
a/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
+++
b/freemarker-jython25/src/test/java/freemarker/template/DefaultObjectWrapperTest.java
@@ -105,6 +105,7 @@ public class DefaultObjectWrapperTest {
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_33);
+ expected.add(Configuration.VERSION_2_3_33); // no non-BC change in
2.3.34
List<Version> actual = new ArrayList<>();
for (int i = _VersionInts.V_2_3_0; i <=
Configuration.getVersion().intValue(); i++) {
diff --git a/freemarker-manual/src/main/docgen/en_US/book.xml
b/freemarker-manual/src/main/docgen/en_US/book.xml
index ca4b302a..f999f39d 100644
--- a/freemarker-manual/src/main/docgen/en_US/book.xml
+++ b/freemarker-manual/src/main/docgen/en_US/book.xml
@@ -6659,7 +6659,7 @@ That's all.</programlisting>
<programlisting role="unspecified">// Create your Configuration
instance, and specify if up to what FreeMarker
// version (here 2.3.32) do you want to apply the fixes that are not 100%
// backward-compatible. See the Configuration JavaDoc for details.
-Configuration cfg = new Configuration(Configuration.VERSION_2_3_33);
+Configuration cfg = new Configuration(Configuration.VERSION_2_3_34);
// Specify the source where the template files come from. Here I set a
// plain directory for it, but non-file-system sources are possible too:
@@ -6958,7 +6958,7 @@ public class Test {
/* You should do this ONLY ONCE in the whole application life-cycle:
*/
/* Create and adjust the configuration singleton */
- Configuration cfg = new Configuration(Configuration.VERSION_2_3_33);
+ Configuration cfg = new Configuration(Configuration.VERSION_2_3_34);
cfg.setDirectoryForTemplateLoading(new
File("<replaceable>/where/you/store/templates</replaceable>"));
// Recommended settings for new projects:
cfg.setDefaultEncoding("UTF-8");
