Merge pull request #46 from fugerit-org/feature/issue_45_poi5

1.3.2-rc.001 (2023-07-20)
fugerit-org · Jul 20, 2023 · f1961a0 · f1961a0
2 parents d19096c + e5113d5
commit f1961a0
Show file tree

Hide file tree

Showing 34 changed files with 840 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -21,18 +21,21 @@ There are five kinds of components (each components README.md contains module st
 
 ### 2. Modules :
 * [FreeMarker template, (fj-doc-freemarker)](fj-doc-freemarker/README.md) (contains a simple renderer for [HTML](fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/html/FreeMarkerHtmlTypeHandler.java) and [HTML FRAGMENT](fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/html/FreeMarkerHtmlFragmentTypeHandler.java))
-* [Apache POI Module (fj-doc-mod-poi)](fj-doc-mod-poi/README.md) ([XLS](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java)/[XLSX](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java))
+* [Apache POI 4 Module (fj-doc-mod-poi)](fj-doc-mod-poi/README.md) ([XLS](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java)/[XLSX](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java))
+* [Apache POI 5 Module (fj-doc-mod-poi5)](fj-doc-mod-poi5/README.md) ([XLS](fj-doc-mod-poi5/src/main/java/org/fugerit/java/doc/mod/poi5/XlsPoi5TypeHandler.java)/[XLSX](fj-doc-mod-poi5/src/main/java/org/fugerit/java/doc/mod/poi5/XlsPoi5TypeHandler.java)) [requires java 11+, since 1.3.2]
 * [Apache FOP Module (fj-doc-mod-fop)](fj-doc-mod-fop/README.md) ([PDF](fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PdfFopTypeHandler.java)/[FO](fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/FreeMarkerFopTypeHandler.java))
 * [OpenCSV Module (fj-doc-mod-opencsv)](fj-doc-mod-opencsv/README.md) ([CSV](fj-doc-mod-opencsv/src/main/java/org/fugerit/java/doc/mod/opencsv/OpenCSVTypeHandler.java))
 
 
 ### 3. Available type handlers :
-* [MD BASIC](fj-doc-base/src/main/java/org/fugerit/java/doc/base/typehandler/markdown/SimpleMarkdownBasicTypeHandler.java) - (fj-doc-core) output as Markdown basic language
-* [MD EXT](fj-doc-base/src/main/java/org/fugerit/java/doc/base/typehandler/markdown/SimpleMarkdownExtTypeHandler.java) - (fj-doc-core) output as Markdown extended (include tables) language
+* [MD BASIC](fj-doc-base/src/main/java/org/fugerit/java/doc/base/typehandler/markdown/SimpleMarkdownBasicTypeHandler.java) - (fj-doc-base) output as Markdown basic language
+* [MD EXT](fj-doc-base/src/main/java/org/fugerit/java/doc/base/typehandler/markdown/SimpleMarkdownExtTypeHandler.java) - (fj-doc-base) output as Markdown extended (include tables) language
 * [HTML](fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/html/FreeMarkerHtmlTypeHandler.java) - (fj-doc-freemarker) output as html
 * [HTML FRAGMENT](fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/html/FreeMarkerHtmlFragmentTypeHandler.java) - (fj-doc-freemarker) output as html body content only (no html, head or body tags)
-* [XLS](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java) - (fj-doc-mod-poi) output as Microsoft XLS using Apache POI
-* [XLSX](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java) - (fj-doc-mod-poi) output as Microsoft XLSX using Apache POI
+* [XLS](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java) - (fj-doc-mod-poi) output as Microsoft XLS using Apache POI 4
+* [XLSX](fj-doc-mod-poi/src/main/java/org/fugerit/java/doc/mod/poi/XlsPoiTypeHandler.java) - (fj-doc-mod-poi) output as Microsoft XLSX using Apache POI 4
+* [XLS](fj-doc-mod-poi5/src/main/java/org/fugerit/java/doc/mod/poi5/XlsPoi5TypeHandler.java) - (fj-doc-mod-poi5) output as Microsoft XLS using Apache POI 5
+* [XLSX](fj-doc-mod-poi5/src/main/java/org/fugerit/java/doc/mod/poi5/XlsPoi5TypeHandler.java) - (fj-doc-mod-poi5) output as Microsoft XLSX using Apache POI 5
 * [PDF](fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PdfFopTypeHandler.java) - (fj-doc-mod-fop) - output as PDF using Apache FOP
 * [FO](fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/FreeMarkerFopTypeHandler.java) - (fj-doc-mod-fop) - output as FO using Apache FOP
 * [CSV](fj-doc-mod-opencsv/src/main/java/org/fugerit/java/doc/mod/opencsv/OpenCSVTypeHandler.java) - (fj-doc-mod-opencsv) - output as CSV using OpenCSV

diff --git a/docgen/parameters.json b/docgen/parameters.json
@@ -1,7 +1,7 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "1.3.1-rc.006",
+	"version" : "1.3.2-rc.001",
 	"date" : "20/07/2023",
 	"organization" : {
 		"name" : "Fugerit Org",

diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,8 @@
-1.3.1-rc.006 (2023-07-20)
+1.3.2-rc.001 (2023-07-20)
+------------------
++ [New module fj-doc-mod-poi5 based on Apache Poi 5+ (java 11+ needed)](https://github.com/fugerit-org/fj-doc/issues/45)
+
+1.3.1-rc.006 (2023-07-20)
 ------------------
 + Autodoc configuration review
 + AutodocDocConfig converted to new configuration model

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.3.1-rc.006</version>
+		<version>1.3.2-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.3.1-rc.006</version>
+		<version>1.3.2-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.3.1-rc.006</version>
+		<version>1.3.2-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.3.1-rc.006</version>
+		<version>1.3.2-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.3.1-rc.006</version>
+		<version>1.3.2-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.3.1-rc.006</version>
+		<version>1.3.2-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.3.1-rc.006</version>
+		<version>1.3.2-rc.001</version>
 	</parent>
 
 	<name>fj-doc-lib-autodoc</name>

diff --git a/fj-doc-lib-simpletable-import/pom.xml b/fj-doc-lib-simpletable-import/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.3.1-rc.006</version>
+		<version>1.3.2-rc.001</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable-import</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.3.1-rc.006</version>
+		<version>1.3.2-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.3.1-rc.006</version>
+		<version>1.3.2-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>

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.3.1-rc.006</version>
+		<version>1.3.2-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-opencsv</name>

diff --git a/fj-doc-mod-poi/README.md b/fj-doc-mod-poi/README.md
@@ -1,13 +1,17 @@
 # Fugerit Document Generation Framework (fj-doc)
 
-## Apache POI Renderer (XLS/XLSX)(fj-doc-mod-poi)
+## Apache POI 4 Renderer (XLS/XLSX)(fj-doc-mod-poi)
 
 [back to fj-doc index](../README.md)  
 
 *Status* :  
 Most basic features implemented. (proper color and font handling missing).  
-For the intrinsic limitations of the XLS/XLSX format, it is possibile to choose a some tables in the document and output it as excel sheets.  
+For the intrinsic limitations of the XLS/XLSX format, it is possible to choose a some tables in the document and output it as excel sheets.  
 
 *Quickstart* :  
-Basically this is only a type handler, see core library [fj-doc-base](../fj-doc-base/README.md).  
+Basically this is only a type handler, see core library [fj-doc-base](../fj-doc-base/README.md). 
+
+*Compatibility*  
+This module is based on Apache POI 4.X, which is compatible with java 8. If you are using java 11+ you can use the [fj-doc-mod-poi5](../fj-doc-mod-poi5/README.md)   module. 
+
 NOTE: If you have any special need you can open a pull request or create your own handler based on this.
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.3.1-rc.006</version>
+		<version>1.3.2-rc.001</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</name>

diff --git a/fj-doc-mod-poi5/README.md b/fj-doc-mod-poi5/README.md
@@ -0,0 +1,17 @@
+# Fugerit Document Generation Framework (fj-doc)
+
+## Apache POI 5+ Renderer (XLS/XLSX)(fj-doc-mod-poi5)
+
+[back to fj-doc index](../README.md)  
+
+*Status* :  
+Most basic features implemented. (proper color and font handling missing).  
+For the intrinsic limitations of the XLS/XLSX format, it is possible to choose a some tables in the document and output it as excel sheets.  
+
+*Quickstart* :  
+Basically this is only a type handler, see core library [fj-doc-base](../fj-doc-base/README.md).  
+
+*Compatibility*  
+This module is based on Apache POI 5.X, which is compatible with java 11+. If you are using java 8 you can use the [fj-doc-mod-poi](../fj-doc-mod-poi/README.md)   module. 
+
+NOTE: If you have any special need you can open a pull request or create your own handler based on this.
diff --git a/fj-doc-mod-poi5/pom.xml b/fj-doc-mod-poi5/pom.xml
@@ -0,0 +1,59 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>fj-doc-mod-poi5</artifactId>
+
+	<parent>
+		<groupId>org.fugerit.java</groupId>
+		<artifactId>fj-doc</artifactId>
+		<version>1.3.2-rc.001</version>
+	</parent>
+
+	<name>fj-doc-mod-poi5</name>
+	<description>Renderer for XLS/XLSX using Apache POI 5+</description>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+		<poi-version>${poi5-version}</poi-version>
+	</properties>
+
+	<build>
+
+	</build>
+
+	<dependencies>
+
+		<dependency>
+		    <groupId>org.apache.poi</groupId>
+		    <artifactId>poi-ooxml</artifactId>
+		</dependency>		
+
+		<dependency>
+			<groupId>org.fugerit.java</groupId>
+			<artifactId>fj-core</artifactId>
+		</dependency>	
+
+		<dependency>
+			<groupId>org.fugerit.java</groupId>
+			<artifactId>fj-doc-base</artifactId>
+		</dependency>		
+
+	</dependencies>
+
+	<organization>
+		<url>https://www.fugerit.org</url>
+		<name>Fugerit</name>
+	</organization>
+
+	<url>https://www.fugerit.org/perm/venus/</url>
+
+</project>