1.1.1-rc.001 (2023-07-02)

fugerit79 · fugerit79 · commit da80292cc5af · 2023-07-02T23:36:01.000+02:00
+ Added fj-doc bom dependencies for incubator and deprecated modules
(fj-doc-ent, fj-doc-mod-pdfbox, fj-doc-mod-itext, fj-doc-mod-jxl)
+ Fi
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,6 +1,7 @@
 ﻿1.1.1-rc.001 (2023-07-02)
 ------------------
 + Added fj-doc bom dependencies for incubator and deprecated modules (fj-doc-ent, fj-doc-mod-pdfbox, fj-doc-mod-itext, fj-doc-mod-jxl)
++ Fix page number handling on footer / header of fj-doc-mod-fop,[[fj-doc-mod-fop] inccorect handling of &](https://github.com/fugerit-org/fj-bom/issues/35)
 
 1.1.0-rc.001 (2023-06-25)
 ------------------
diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-base-json</name>
diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-base-yaml</name>
diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-base</name>
diff --git a/fj-doc-bom-core/pom.xml b/fj-doc-bom-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-bom-core</name>
diff --git a/fj-doc-bom-fop/pom.xml b/fj-doc-bom-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-bom-fop</name>
diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>
diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-lib-autodoc</name>
diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable</name>
diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>
diff --git a/fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl b/fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl
@@ -46,7 +46,7 @@
 </#macro>
 
 <#macro handleParaRole current role>
-	<fo:block <#if (current.id)??> id="${current.id}" </#if> <@handleFormat formatValue=current.format!''/><@handleWhiteSpace element=current/><@handleRole role=role element=current/><@handleStyle styleValue=current.originalStyle/><@handleParaSpacing textIndent=current.textIndent!0 spaceBefore=current.spaceBefore!0 spaceAfter=current.spaceAfter!0 spaceLeft=current.spaceLeft!0 spaceRight=current.spaceRight!0/><@handleAlign alignValue=current.align/><@handleFont element=current/>><![CDATA[${current.text?replace(r"${currentPage}","<fo:page-number/>")}]]><#list current.elementList as currentChild><@handleElement current=currentChild/></#list></fo:block>
+	<fo:block <#if (current.id)??> id="${current.id}" </#if> <@handleFormat formatValue=current.format!''/><@handleWhiteSpace element=current/><@handleRole role=role element=current/><@handleStyle styleValue=current.originalStyle/><@handleParaSpacing textIndent=current.textIndent!0 spaceBefore=current.spaceBefore!0 spaceAfter=current.spaceAfter!0 spaceLeft=current.spaceLeft!0 spaceRight=current.spaceRight!0/><@handleAlign alignValue=current.align/><@handleFont element=current/>><![CDATA[${current.text?replace(r"${currentPage}","]]><fo:page-number/><![CDATA[")}]]><#list current.elementList as currentChild><@handleElement current=currentChild/></#list></fo:block>
 </#macro>
 
 <#macro handlePara current>
diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-opencsv</name>
diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</name>
diff --git a/fj-doc-playground-quarkus/pom.xml b/fj-doc-playground-quarkus/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 	<artifactId>fj-doc-playground-quarkus</artifactId>
 	<properties>
diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-sample</name>
diff --git a/fj-doc-sample/src/test/resources/dev/test-xml-01.xml b/fj-doc-sample/src/test/resources/dev/test-xml-01.xml
@@ -11,6 +11,9 @@
 		<info name="doc-author">Fugerit</info>
 		<info name="doc-creator">fj-doc (Venus) Sample</info>
 		<info name="doc-language">en</info>
+		<footer-ext numbered="true">
+	        <para align="center">Page ${currentPage}</para>
+		</footer-ext>
 		<bookmark-tree>
 			<bookmark ref="b1">Bookmark 1</bookmark>
 			<bookmark ref="b2">Bookmark 2</bookmark>
diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val-core</name>
diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val-pdfbox</name>
diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val-poi</name>
diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.1.0-rc.001</version>
+		<version>1.1.1-rc.001</version>
 	</parent>
 
 	<name>fj-doc-val</name>
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>fj-doc</artifactId>
 
-	<version>1.1.0-rc.001</version>
+	<version>1.1.1-rc.001</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>
