Skip to content

Commit f1961a0

Browse files
mttfrancimttfranci
authored
Merge pull request #46 from fugerit-org/feature/issue_45_poi5
1.3.2-rc.001 (2023-07-20)
2 parents d19096c + e5113d5 commit f1961a0

File tree

34 files changed

+840
-30
lines changed

34 files changed

+840
-30
lines changed

‎README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,21 @@ There are five kinds of components (each components README.md contains module st
2121

2222
### 2. Modules :
2323
* [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))
24-
* [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))
24+
* [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))
25+
* [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]
2526
* [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))
2627
* [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))
2728

2829

2930
### 3. Available type handlers :
30-
* [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
31-
* [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
31+
* [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
32+
* [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
3233
* [HTML](fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/html/FreeMarkerHtmlTypeHandler.java) - (fj-doc-freemarker) output as html
3334
* [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)
34-
* [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
35-
* [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
35+
* [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
36+
* [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
37+
* [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
38+
* [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
3639
* [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
3740
* [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
3841
* [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

‎docgen/parameters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "1.3.1-rc.006",
4+
"version" : "1.3.2-rc.001",
55
"date" : "20/07/2023",
66
"organization" : {
77
"name" : "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.3.1-rc.006 (2023-07-20)
1+
1.3.2-rc.001 (2023-07-20)
2+
------------------
3+
+ [New module fj-doc-mod-poi5 based on Apache Poi 5+ (java 11+ needed)](https://github.com/fugerit-org/fj-doc/issues/45)
4+
5+
1.3.1-rc.006 (2023-07-20)
26
------------------
37
+ Autodoc configuration review
48
+ AutodocDocConfig converted to new configuration model

‎fj-doc-base-json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-base-json</name>

‎fj-doc-base-yaml/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-base-yaml</name>

‎fj-doc-base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-base</name>

‎fj-doc-bom-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-bom-core</name>

‎fj-doc-bom-fop/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-bom-fop</name>

‎fj-doc-freemarker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-freemarker</name>

‎fj-doc-lib-autodoc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-autodoc</name>

‎fj-doc-lib-simpletable-import/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-simpletable-import</name>

‎fj-doc-lib-simpletable/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-simpletable</name>

‎fj-doc-mod-fop/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-fop</name>

‎fj-doc-mod-opencsv/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-opencsv</name>

‎fj-doc-mod-poi/README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
# Fugerit Document Generation Framework (fj-doc)
22

3-
## Apache POI Renderer (XLS/XLSX)(fj-doc-mod-poi)
3+
## Apache POI 4 Renderer (XLS/XLSX)(fj-doc-mod-poi)
44

55
[back to fj-doc index](../README.md)
66

77
*Status* :
88
Most basic features implemented. (proper color and font handling missing).
9-
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.
9+
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.
1010

1111
*Quickstart* :
12-
Basically this is only a type handler, see core library [fj-doc-base](../fj-doc-base/README.md).
12+
Basically this is only a type handler, see core library [fj-doc-base](../fj-doc-base/README.md).
13+
14+
*Compatibility*
15+
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.
16+
1317
NOTE: If you have any special need you can open a pull request or create your own handler based on this.

‎fj-doc-mod-poi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>1.3.1-rc.006</version>
10+
<version>1.3.2-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-poi</name>

‎fj-doc-mod-poi5/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Fugerit Document Generation Framework (fj-doc)
2+
3+
## Apache POI 5+ Renderer (XLS/XLSX)(fj-doc-mod-poi5)
4+
5+
[back to fj-doc index](../README.md)
6+
7+
*Status* :
8+
Most basic features implemented. (proper color and font handling missing).
9+
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.
10+
11+
*Quickstart* :
12+
Basically this is only a type handler, see core library [fj-doc-base](../fj-doc-base/README.md).
13+
14+
*Compatibility*
15+
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.
16+
17+
NOTE: If you have any special need you can open a pull request or create your own handler based on this.

‎fj-doc-mod-poi5/pom.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<artifactId>fj-doc-mod-poi5</artifactId>
6+
7+
<parent>
8+
<groupId>org.fugerit.java</groupId>
9+
<artifactId>fj-doc</artifactId>
10+
<version>1.3.2-rc.001</version>
11+
</parent>
12+
13+
<name>fj-doc-mod-poi5</name>
14+
<description>Renderer for XLS/XLSX using Apache POI 5+</description>
15+
16+
<licenses>
17+
<license>
18+
<name>Apache License, Version 2.0</name>
19+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
20+
<distribution>repo</distribution>
21+
</license>
22+
</licenses>
23+
24+
<properties>
25+
<maven.compiler.release>11</maven.compiler.release>
26+
<poi-version>${poi5-version}</poi-version>
27+
</properties>
28+
29+
<build>
30+
31+
</build>
32+
33+
<dependencies>
34+
35+
<dependency>
36+
<groupId>org.apache.poi</groupId>
37+
<artifactId>poi-ooxml</artifactId>
38+
</dependency>
39+
40+
<dependency>
41+
<groupId>org.fugerit.java</groupId>
42+
<artifactId>fj-core</artifactId>
43+
</dependency>
44+
45+
<dependency>
46+
<groupId>org.fugerit.java</groupId>
47+
<artifactId>fj-doc-base</artifactId>
48+
</dependency>
49+
50+
</dependencies>
51+
52+
<organization>
53+
<url>https://www.fugerit.org</url>
54+
<name>Fugerit</name>
55+
</organization>
56+
57+
<url>https://www.fugerit.org/perm/venus/</url>
58+
59+
</project>

0 commit comments

Comments
 (0)