Merge branch 'main' into docs

Author: fugerit79

.gitignore

@@ -2,6 +2,8 @@
 
 #react
 
+.DS_Store
+
 npm
 
 .metadata
@@ -100,4 +102,4 @@ buildNumber.properties
 
 # End of https://www.gitignore.io/api/java,maven,eclipse
 
-/.apt_generated/
+/.apt_generated/

docgen/parameters.json

@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.8.0",
-	"date" : "07/01/2023",
+	"version" : "0.8.9",
+	"date" : "20/02/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

docgen/release-notes.txt

@@ -1,4 +1,53 @@
-0.8.0 (2023-01-07)
+0.8.9 (2023-02-20)
+------------------
++ [Upgraded quarkus version to 3.0.0.Alpha4](https://github.com/fugerit-org/fj-doc/issues/29)
++ Fix chatset handling for csv type handler
++ Fix to alternate text for json and yaml sample
+
+
+0.8.8 (2023-02-11)
+------------------
++ [Fix javadoc build for java 17](https://github.com/fugerit-org/fj-doc/issues/26)
++ [Jackson core need to be upgraded 2.14.1](https://github.com/fugerit-org/fj-doc/issues/9)
++ update fj-core version to 0.8.12
+
+
+0.8.7 (2023-02-08)
+------------------
++ [Fix Javadoc generations with older versions of jdk 11 fails](https://github.com/fugerit-org/fj-doc/issues/24)
+
+0.8.6 (2023-02-06)
+------------------
++ Added meta informations to samples documents
++ Added new sample catalog entry from playground
++ Playground tests disabled by default
++ Playground not included in release
+
+0.8.5 (2023-01-31)
+------------------
++ [fj-doc-base - Extend charset provider capabilities](https://github.com/fugerit-org/fj-doc/issues/22)
+
+0.8.4 (2023-01-27)
+------------------
++ [fj-doc-base - Enable charset selection for DocTypeHandlerXML](https://github.com/fugerit-org/fj-doc/issues/17)
+
+0.8.3 (2023-01-24)
+------------------
++ [fj-doc-mod-fop - need to create FopConfigClassLoaderWrapper with default ResourceResolver](https://github.com/fugerit-org/fj-doc/issues/15)
+
+0.8.2 (2023-01-22)
+------------------
++ Updated fj-core version to 0.8.8
++ Improved playground
+
+0.8.1 (2023-01-15)
+------------------
++ Added methods to DocProcessContext for DocBase and DocType availability.
++ Added access to DocConfig static variables in Freemarker Chain process
++ Added new info doc-version-compatibility for handling behaviours in 1-x e 2-x doc versions. 
++ Added a sample documents catalog to the fj-doc-sample modules (accessible in the playgound application too)
+
+0.8.0 (2023-01-07)
 ------------------
 + Added a new module for generating documentation [fj-doc-lib-autodoc](https://github.com/fugerit-org/fj-doc/tree/main/fj-doc-lib-autodoc)
 + Published new version of [doc-2-0.xsd](https://venusdocs.fugerit.org/fj-doc-base/src/main/resources/config/doc-2-0.xsd), [see doc xsd changelog](https://github.com/fugerit-org/fj-doc/blob/main/fj-doc-base/DocXsdChangelog.md)
@@ -390,4 +439,4 @@ syntax)
 
 0.3.0.0 (2020-03-31)
 --------------------
-+ Java 8 is the minimum version supported
++ Java 8 is the minimum version supported

fj-doc-base-json/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.0</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-base-json</name>

fj-doc-base-json/src/main/java/org/fugerit/java/doc/json/parse/DocJsonParser.java

@@ -23,8 +23,8 @@ private DocObjectMapperHelper getHelper() {
 	}
 
 	@Override
-	protected DocValidationResult validateWorker(Reader reader) throws Exception {
-		return this.getHelper().validateWorkerResult(reader);
+	protected DocValidationResult validateWorker(Reader reader, boolean parseVersion) throws Exception {
+		return this.getHelper().validateWorkerResult(reader, parseVersion);
 	}
 
 	@Override

fj-doc-base-json/src/main/java/org/fugerit/java/doc/json/parse/DocObjectMapperHelper.java

@@ -94,15 +94,20 @@ private void handleElement( JsonNode node, DocParserContext context ) {
 		context.handleEndElement(qName);
 	}
 
-	public DocValidationResult validateWorkerResult(Reader reader) throws Exception {
+	public DocValidationResult validateWorkerResult(Reader reader, boolean parseVersion) throws Exception {
 		DocValidationResult result = DocValidationResult.newDefaultNotDefinedResult();
 		DocJsonToXml convert = new DocJsonToXml( this.mapper );
 		Element root = convert.convertToElement( reader );
 		try ( ByteArrayOutputStream buffer = new ByteArrayOutputStream() )  {
 			DOMIO.writeDOMIndent(root, buffer);
 			try ( Reader xmlReader = new InputStreamReader( new ByteArrayInputStream( buffer.toByteArray() ) ) ) {
 				DocXmlParser parser = new DocXmlParser();
-				result = parser.validateResult(xmlReader);
+				result = null;
+				if ( parseVersion ) {
+					result = parser.validateVersionResult(xmlReader);
+				} else {
+					result = parser.validateResult(xmlReader);
+				}
 				if ( !result.getErrorList().isEmpty() ) {
 					result.getInfoList().add( "This validation is made through conversion to xml, so lines/columns number in errors are to be considered an hint" );
 				}

fj-doc-base-yaml/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.0</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-base-yaml</name>

fj-doc-base-yaml/src/main/java/org/fugerit/java/doc/yaml/parse/DocYamlParser.java

@@ -25,8 +25,8 @@ private DocObjectMapperHelper getHelper() {
 	}
 
 	@Override
-	protected DocValidationResult validateWorker(Reader reader) throws Exception {
-		return this.getHelper().validateWorkerResult(reader);
+	protected DocValidationResult validateWorker(Reader reader, boolean parseVersion) throws Exception {
+		return this.getHelper().validateWorkerResult(reader, parseVersion);
 	}
 
 	@Override

fj-doc-base/DocXsdChangelog.md

@@ -17,6 +17,7 @@
 * Attribute 'base64' has now its own type 'base64Type'
 * Attribute 'url' has now its own type 'urlType'
 * Element 'br', 'barcode', 'image', 'nbsp' are no longer 'mixed'
+* Type styleType as a new possible value : 'normal'
 
 Summary of previous versions : 
 -----------------------------

fj-doc-base/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.8.0</version>
+		<version>0.8.9</version>
 	</parent>
 
 	<name>fj-doc-base</name>