1.3.0-rc.006 (2023-07-12)

+ [New freemarker configuration model, compatibility
mode](https://github.com/fugerit-org/fj-bom/issues/38) [TODO : xsd]

Author: fugerit79

docgen/parameters.json

@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "1.3.0-rc.004",
-	"date" : "11/07/2023",
+	"version" : "1.3.0-rc.006",
+	"date" : "12/07/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

docgen/release-notes.txt

@@ -1,4 +1,8 @@
-1.3.0-rc.004 (2023-07-11)
+1.3.0-rc.006 (2023-07-12)
+------------------
++ [New freemarker configuration model, compatibility mode](https://github.com/fugerit-org/fj-bom/issues/38) [TODO : xsd]
+
+1.3.0-rc.004 (2023-07-11)
 ------------------
 + fj-bom updated to 1.2.3
 

fj-doc-base-json/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.3.0-rc.004</version>
+		<version>1.3.0-rc.006</version>
 	</parent>
 
 	<name>fj-doc-base-json</name>

fj-doc-base-yaml/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.3.0-rc.004</version>
+		<version>1.3.0-rc.006</version>
 	</parent>
 
 	<name>fj-doc-base-yaml</name>

fj-doc-base/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.3.0-rc.004</version>
+		<version>1.3.0-rc.006</version>
 	</parent>
 
 	<name>fj-doc-base</name>

fj-doc-bom-core/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.3.0-rc.004</version>
+		<version>1.3.0-rc.006</version>
 	</parent>
 
 	<name>fj-doc-bom-core</name>

fj-doc-bom-fop/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.3.0-rc.004</version>
+		<version>1.3.0-rc.006</version>
 	</parent>
 
 	<name>fj-doc-bom-fop</name>

fj-doc-freemarker/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>1.3.0-rc.004</version>
+		<version>1.3.0-rc.006</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>

fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/ChainStepModel.java

@@ -1,6 +1,7 @@
 package org.fugerit.java.doc.freemarker.process;
 
 import java.io.Serializable;
+import java.util.Properties;
 
 import lombok.Data;
 
@@ -9,6 +10,8 @@ public class ChainStepModel implements Serializable {
 
 	private static final long serialVersionUID = 622077549080786391L;
 
-	private String type;
+	private String stepType;
+	
+	private Properties attributes;
 
 }

fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/ConfigInitModel.java

@@ -83,7 +83,7 @@ protected void process( DocChainModel model, DocProcessContext context, DocProce
 		}
 		map.putAll( this.getGeneralContext() );
 		for ( ChainStepModel step : model.getChainStepList() ) {
-			DocProcessorBasic docStep = (DocProcessorBasic) ClassHelper.newInstance( step.getType() );
+			DocProcessorBasic docStep = (DocProcessorBasic) ClassHelper.newInstance( step.getStepType() );
 			int res = docStep.apply(context, data);
 			log.debug( "docStep {} -> {}", docStep, res );
 		}