Skip to content

Commit 65dadfd

Browse files
committed
Updated freemarker version to 2.3.32
1 parent 7509fa3 commit 65dadfd

File tree

7 files changed

+548
-209
lines changed

7 files changed

+548
-209
lines changed

docgen/parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "1.4.2-rc.002",
5-
"date" : "01/08/2023",
4+
"version" : "1.4.3-rc.001",
5+
"date" : "02/08/2023",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

docgen/release-notes.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
1.4.2-rc.002 (2023-08-01)
1+
1.4.3-rc.001 (2023-08-02)
2+
------------------
3+
+ Updated freemarker version to 2.3.32
4+
5+
1.4.2-rc.002 (2023-08-01)
26
------------------
37
+ Updated fj-core version to 8.0.13-rc.001
48

fj-doc-freemarker/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog for module fj-doc-lib-simpletable
22

3+
## version 1.4.3-rc.001
4+
* Updated freemarker version to 2.3.32
5+
36
## version 1.4.0-rc.001
47
* Added GrallVM native support
58

fj-doc-freemarker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</licenses>
2323

2424
<properties>
25-
<freemarker-version>2.3.31</freemarker-version>
25+
<freemarker-version>2.3.32</freemarker-version>
2626
</properties>
2727

2828
<build>

fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/config/FreeMarkerConfigStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ public class FreeMarkerConfigStep extends DocProcessorBasic {
2121
public static final String ATT_DEFAULT = "FreeMarkerConfigStep.DEFAULT";
2222

2323
public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION = "version";
24+
public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_32 = "2.3.32";
2425
public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_31 = "2.3.31";
2526
public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_30 = "2.3.30";
2627
public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_29 = "2.3.29";
27-
public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_DEFAULT = ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_31;
28+
public static final String ATT_FREEMARKER_CONFIG_KEY_VERSION_DEFAULT = ATT_FREEMARKER_CONFIG_KEY_VERSION_2_3_32;
2829

2930
public static final String ATT_FREEMARKER_CONFIG_KEY_MODE = "mode";
3031
public static final String ATT_FREEMARKER_CONFIG_KEY_MODE_CLASS = "class";

fj-doc-freemarker/src/main/resources/fj_doc_freemarker_config/template/freemarker-doc-process-config-stub.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="https://freemarkerdocprocess.fugerit.org https://www.fugerit.org/data/java/doc/xsd/freemarker-doc-process-1-0.xsd" >
66

77
<!--
8-
Configuration stub version : 003 (2023-07-19)
8+
Configuration stub version : 004 (2023-08-02)
99
-->
1010

1111
<#assign stubHandler=stubParams['stub-handler']!'1'>
@@ -82,7 +82,7 @@
8282
<#assign stubChain=stubParams['stub-chain']!'0'>
8383
<#if stubChain == '1'>
8484
<#assign configId=stubParams['config-id']!'FJ_DOC_STUB'>
85-
<#assign fmVersion=stubParams['fm-version']!'2.3.29'>
85+
<#assign fmVersion=stubParams['fm-version']!'2.3.32'>
8686
<#assign fmTemplatePath=stubParams['fm-template-path']!'/free_marker/'>
8787
<docChain id="shared">
8888
<!-- configurations -->

fj-doc-sample/src/test/resources/dev/test-fo-01.fo

Lines changed: 533 additions & 202 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)