You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/08/26 23:43:07 UTC

[freemarker-generator] 02/02: Merge remote-tracking branch 'origin/master' into FREEMARKER-154

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch FREEMARKER-154
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git

commit 448bf9511aa4d4db222d87376c60cbef61f84e6a
Merge: 641d82c 73b40a8
Author: ddekany <dd...@apache.org>
AuthorDate: Thu Aug 27 01:07:38 2020 +0200

    Merge remote-tracking branch 'origin/master' into FREEMARKER-154
    
    # Conflicts:
    #	freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/FreeMarkerConstants.java
    #	freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
    #	freemarker-generator-cli/examples/data/accesslog/combined-access.log
    #	freemarker-generator-cli/examples/data/csv/contract.csv
    #	freemarker-generator-cli/examples/data/csv/dataframe.csv
    #	freemarker-generator-cli/examples/data/csv/excel-export-utf8.csv
    #	freemarker-generator-cli/examples/data/csv/locker-test-users.csv
    #	freemarker-generator-cli/examples/data/csv/sales-records.csv
    #	freemarker-generator-cli/examples/data/csv/transactions.csv
    #	freemarker-generator-cli/examples/data/csv/user.csv
    #	freemarker-generator-cli/examples/data/excel/test-multiple-sheets.xlsx
    #	freemarker-generator-cli/examples/data/excel/test.xls
    #	freemarker-generator-cli/examples/data/excel/test.xlsx
    #	freemarker-generator-cli/examples/data/ftl/nginx/nginx.conf.ftl
    #	freemarker-generator-cli/examples/data/ftl/nginx/nginx.env
    #	freemarker-generator-cli/examples/data/html/dependencies.html
    #	freemarker-generator-cli/examples/data/json/github-users.json
    #	freemarker-generator-cli/examples/data/json/swagger-spec.json
    #	freemarker-generator-cli/examples/data/properties/user_0001/user.properties
    #	freemarker-generator-cli/examples/data/properties/user_0002/user.properties
    #	freemarker-generator-cli/examples/data/properties/user_0003/user.properties
    #	freemarker-generator-cli/examples/data/properties/user_0004/user.properties
    #	freemarker-generator-cli/examples/data/template/application.properties
    #	freemarker-generator-cli/examples/data/template/nginx/nginx.conf.ftl
    #	freemarker-generator-cli/examples/data/xml/recipients.xml
    #	freemarker-generator-cli/examples/data/yaml/customer.yaml
    #	freemarker-generator-cli/examples/data/yaml/swagger-spec.yaml
    #	freemarker-generator-cli/examples/templates/accesslog/combined-access.ftl
    #	freemarker-generator-cli/examples/templates/csv/csv/gatling-user-credentials.ftl
    #	freemarker-generator-cli/examples/templates/csv/fo/transactions.ftl
    #	freemarker-generator-cli/examples/templates/csv/fo/transform.ftl
    #	freemarker-generator-cli/examples/templates/csv/html/transactions.ftl
    #	freemarker-generator-cli/examples/templates/csv/md/filter.ftl
    #	freemarker-generator-cli/examples/templates/csv/shell/curl.ftl
    #	freemarker-generator-cli/examples/templates/dataframe/example.ftl
    #	freemarker-generator-cli/examples/templates/dataframe/html/print.ftl
    #	freemarker-generator-cli/examples/templates/demo.ftl
    #	freemarker-generator-cli/examples/templates/excel/csv/custom.ftl
    #	freemarker-generator-cli/examples/templates/excel/dataframe/transform.ftl
    #	freemarker-generator-cli/examples/templates/html/csv/dependencies.ftl
    #	freemarker-generator-cli/examples/templates/json/csv/swagger-endpoints.ftl
    #	freemarker-generator-cli/examples/templates/json/dataframe/github-users.ftl
    #	freemarker-generator-cli/examples/templates/json/md/github-users.ftl
    #	freemarker-generator-cli/examples/templates/properties/csv/locker-test-users.ftl
    #	freemarker-generator-cli/examples/templates/tsv/fo/transactions.ftl
    #	freemarker-generator-cli/examples/templates/xml/txt/recipients.ftl
    #	freemarker-generator-cli/examples/templates/yaml/txt/transform.ftl
    #	freemarker-generator-cli/pom.xml
    #	freemarker-generator-cli/run-examples.bat
    #	freemarker-generator-cli/run-examples.sh
    #	freemarker-generator-cli/src/app/config/freemarker-generator.properties
    #	freemarker-generator-cli/src/app/examples/data/accesslog/combined-access.log
    #	freemarker-generator-cli/src/app/examples/data/csv/contract.csv
    #	freemarker-generator-cli/src/app/examples/data/csv/dataframe.csv
    #	freemarker-generator-cli/src/app/examples/data/csv/excel-export-utf8.csv
    #	freemarker-generator-cli/src/app/examples/data/csv/locker-test-users.csv
    #	freemarker-generator-cli/src/app/examples/data/csv/sales-records.csv
    #	freemarker-generator-cli/src/app/examples/data/csv/transactions.csv
    #	freemarker-generator-cli/src/app/examples/data/csv/user.csv
    #	freemarker-generator-cli/src/app/examples/data/excel/test-multiple-sheets.xlsx
    #	freemarker-generator-cli/src/app/examples/data/excel/test.xls
    #	freemarker-generator-cli/src/app/examples/data/excel/test.xlsx
    #	freemarker-generator-cli/src/app/examples/data/ftl/nginx/nginx.conf.ftl
    #	freemarker-generator-cli/src/app/examples/data/ftl/nginx/nginx.env
    #	freemarker-generator-cli/src/app/examples/data/html/dependencies.html
    #	freemarker-generator-cli/src/app/examples/data/json/github-users.json
    #	freemarker-generator-cli/src/app/examples/data/json/swagger-spec.json
    #	freemarker-generator-cli/src/app/examples/data/properties/user_0001/user.properties
    #	freemarker-generator-cli/src/app/examples/data/properties/user_0002/user.properties
    #	freemarker-generator-cli/src/app/examples/data/properties/user_0003/user.properties
    #	freemarker-generator-cli/src/app/examples/data/properties/user_0004/user.properties
    #	freemarker-generator-cli/src/app/examples/data/template/application.properties
    #	freemarker-generator-cli/src/app/examples/data/template/nginx/nginx.conf.ftl
    #	freemarker-generator-cli/src/app/examples/data/xml/recipients.xml
    #	freemarker-generator-cli/src/app/examples/data/yaml/customer.yaml
    #	freemarker-generator-cli/src/app/examples/data/yaml/swagger-spec.yaml
    #	freemarker-generator-cli/src/app/examples/templates/accesslog/combined-access.ftl
    #	freemarker-generator-cli/src/app/examples/templates/csv/csv/gatling-user-credentials.ftl
    #	freemarker-generator-cli/src/app/examples/templates/csv/fo/transactions.ftl
    #	freemarker-generator-cli/src/app/examples/templates/csv/fo/transform.ftl
    #	freemarker-generator-cli/src/app/examples/templates/csv/html/transactions.ftl
    #	freemarker-generator-cli/src/app/examples/templates/csv/md/filter.ftl
    #	freemarker-generator-cli/src/app/examples/templates/csv/shell/curl.ftl
    #	freemarker-generator-cli/src/app/examples/templates/dataframe/example.ftl
    #	freemarker-generator-cli/src/app/examples/templates/dataframe/html/print.ftl
    #	freemarker-generator-cli/src/app/examples/templates/demo.ftl
    #	freemarker-generator-cli/src/app/examples/templates/excel/csv/custom.ftl
    #	freemarker-generator-cli/src/app/examples/templates/excel/dataframe/transform.ftl
    #	freemarker-generator-cli/src/app/examples/templates/html/csv/dependencies.ftl
    #	freemarker-generator-cli/src/app/examples/templates/json/csv/swagger-endpoints.ftl
    #	freemarker-generator-cli/src/app/examples/templates/json/dataframe/github-users.ftl
    #	freemarker-generator-cli/src/app/examples/templates/json/md/github-users.ftl
    #	freemarker-generator-cli/src/app/examples/templates/properties/csv/locker-test-users.ftl
    #	freemarker-generator-cli/src/app/examples/templates/tsv/fo/transactions.ftl
    #	freemarker-generator-cli/src/app/examples/templates/xml/txt/recipients.ftl
    #	freemarker-generator-cli/src/app/examples/templates/yaml/txt/transform.ftl
    #	freemarker-generator-cli/src/app/scripts/run-examples.bat
    #	freemarker-generator-cli/src/app/scripts/run-examples.sh
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/cat.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/csv/csv/transform.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/csv/html/transform.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/csv/md/transform.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/excel/csv/transform.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/excel/html/transform.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/excel/md/transform.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/info.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/json/yaml/transform.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/lib/commons-csv.ftl
    #	freemarker-generator-cli/src/app/templates/freemarker-generator/yaml/json/transform.ftl
    #	freemarker-generator-cli/src/examples/data/accesslog/combined-access.log
    #	freemarker-generator-cli/src/examples/data/csv/contract.csv
    #	freemarker-generator-cli/src/examples/data/csv/dataframe.csv
    #	freemarker-generator-cli/src/examples/data/csv/excel-export-utf8.csv
    #	freemarker-generator-cli/src/examples/data/csv/locker-test-users.csv
    #	freemarker-generator-cli/src/examples/data/csv/sales-records.csv
    #	freemarker-generator-cli/src/examples/data/csv/transactions.csv
    #	freemarker-generator-cli/src/examples/data/csv/user.csv
    #	freemarker-generator-cli/src/examples/data/excel/test-multiple-sheets.xlsx
    #	freemarker-generator-cli/src/examples/data/excel/test.xls
    #	freemarker-generator-cli/src/examples/data/excel/test.xlsx
    #	freemarker-generator-cli/src/examples/data/ftl/nginx/nginx.conf.ftl
    #	freemarker-generator-cli/src/examples/data/ftl/nginx/nginx.env
    #	freemarker-generator-cli/src/examples/data/html/dependencies.html
    #	freemarker-generator-cli/src/examples/data/json/github-users.json
    #	freemarker-generator-cli/src/examples/data/json/swagger-spec.json
    #	freemarker-generator-cli/src/examples/data/properties/user_0001/user.properties
    #	freemarker-generator-cli/src/examples/data/properties/user_0002/user.properties
    #	freemarker-generator-cli/src/examples/data/properties/user_0003/user.properties
    #	freemarker-generator-cli/src/examples/data/properties/user_0004/user.properties
    #	freemarker-generator-cli/src/examples/data/template/application.properties
    #	freemarker-generator-cli/src/examples/data/template/nginx/nginx.conf.ftl
    #	freemarker-generator-cli/src/examples/data/xml/recipients.xml
    #	freemarker-generator-cli/src/examples/data/yaml/customer.yaml
    #	freemarker-generator-cli/src/examples/data/yaml/swagger-spec.yaml
    #	freemarker-generator-cli/src/examples/templates/accesslog/combined-access.ftl
    #	freemarker-generator-cli/src/examples/templates/csv/csv/gatling-user-credentials.ftl
    #	freemarker-generator-cli/src/examples/templates/csv/fo/transactions.ftl
    #	freemarker-generator-cli/src/examples/templates/csv/fo/transform.ftl
    #	freemarker-generator-cli/src/examples/templates/csv/html/transactions.ftl
    #	freemarker-generator-cli/src/examples/templates/csv/md/filter.ftl
    #	freemarker-generator-cli/src/examples/templates/csv/shell/curl.ftl
    #	freemarker-generator-cli/src/examples/templates/dataframe/example.ftl
    #	freemarker-generator-cli/src/examples/templates/dataframe/html/print.ftl
    #	freemarker-generator-cli/src/examples/templates/demo.ftl
    #	freemarker-generator-cli/src/examples/templates/excel/csv/custom.ftl
    #	freemarker-generator-cli/src/examples/templates/excel/dataframe/transform.ftl
    #	freemarker-generator-cli/src/examples/templates/html/csv/dependencies.ftl
    #	freemarker-generator-cli/src/examples/templates/json/csv/swagger-endpoints.ftl
    #	freemarker-generator-cli/src/examples/templates/json/dataframe/github-users.ftl
    #	freemarker-generator-cli/src/examples/templates/json/md/github-users.ftl
    #	freemarker-generator-cli/src/examples/templates/properties/csv/locker-test-users.ftl
    #	freemarker-generator-cli/src/examples/templates/tsv/fo/transactions.ftl
    #	freemarker-generator-cli/src/examples/templates/xml/txt/recipients.ftl
    #	freemarker-generator-cli/src/examples/templates/yaml/txt/transform.ftl
    #	freemarker-generator-cli/src/main/config/freemarker-cli.properties
    #	freemarker-generator-cli/src/main/config/freemarker-generator.properties
    #	freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
    #	freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplier.java
    #	freemarker-generator-cli/src/scripts/run-examples.bat
    #	freemarker-generator-cli/src/scripts/run-examples.sh
    #	freemarker-generator-cli/src/templates/freemarker-generator/cat.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/csv/csv/transform.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/csv/html/transform.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/csv/md/transform.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/excel/csv/transform.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/excel/html/transform.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/excel/md/transform.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/info.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/json/yaml/transform.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/lib/commons-csv.ftl
    #	freemarker-generator-cli/src/templates/freemarker-generator/yaml/json/transform.ftl
    #	freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/AbstractMainTest.java
    #	freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
    #	freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java
    #	freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java
    #	freemarker-generator-cli/templates/cat.ftl
    #	freemarker-generator-cli/templates/csv/csv/transform.ftl
    #	freemarker-generator-cli/templates/csv/html/transform.ftl
    #	freemarker-generator-cli/templates/csv/md/transform.ftl
    #	freemarker-generator-cli/templates/excel/csv/transform.ftl
    #	freemarker-generator-cli/templates/excel/html/transform.ftl
    #	freemarker-generator-cli/templates/excel/md/transform.ftl
    #	freemarker-generator-cli/templates/info.ftl
    #	freemarker-generator-cli/templates/json/yaml/transform.ftl
    #	freemarker-generator-cli/templates/lib/commons-csv.ftl
    #	freemarker-generator-cli/templates/yaml/json/transform.ftl

 .../generator/base/FreeMarkerConstants.java        |  19 ++++-
 .../template/TemplateTransformationsBuilder.java   |   1 -
 .../template/TemplateSourceFactoryTest.java        |   2 +-
 freemarker-generator-cli/CHANGELOG.md              |   3 +-
 freemarker-generator-cli/pom.xml                   |  12 +--
 .../config/freemarker-generator.properties         |   0
 .../examples/data/accesslog/combined-access.log    |   0
 .../src/{ => app}/examples/data/csv/contract.csv   |   0
 .../src/{ => app}/examples/data/csv/dataframe.csv  |   0
 .../examples/data/csv/excel-export-utf8.csv        |   0
 .../examples/data/csv/locker-test-users.csv        |   0
 .../{ => app}/examples/data/csv/sales-records.csv  |   0
 .../{ => app}/examples/data/csv/transactions.csv   |   0
 .../src/{ => app}/examples/data/csv/user.csv       |   0
 .../examples/data/excel/test-multiple-sheets.xlsx  | Bin
 .../src/{ => app}/examples/data/excel/test.xls     | Bin
 .../src/{ => app}/examples/data/excel/test.xlsx    | Bin
 .../examples/data/ftl/nginx/nginx.conf.ftl         |   0
 .../{ => app}/examples/data/ftl/nginx/nginx.env    |   0
 .../{ => app}/examples/data/html/dependencies.html |   0
 .../{ => app}/examples/data/json/github-users.json |   0
 .../{ => app}/examples/data/json/swagger-spec.json |   0
 .../data/properties/user_0001/user.properties      |   0
 .../data/properties/user_0002/user.properties      |   0
 .../data/properties/user_0003/user.properties      |   0
 .../data/properties/user_0004/user.properties      |   0
 .../examples/data/template/application.properties  |   0
 .../examples/data/template/nginx/nginx.conf.ftl    |   0
 .../src/{ => app}/examples/data/xml/recipients.xml |   0
 .../src/{ => app}/examples/data/yaml/customer.yaml |   0
 .../{ => app}/examples/data/yaml/swagger-spec.yaml |   0
 .../templates/accesslog/combined-access.ftl        |   0
 .../templates/csv/csv/gatling-user-credentials.ftl |   0
 .../examples/templates/csv/fo/transactions.ftl     |   0
 .../examples/templates/csv/fo/transform.ftl        |   0
 .../examples/templates/csv/html/transactions.ftl   |   0
 .../{ => app}/examples/templates/csv/md/filter.ftl |   0
 .../examples/templates/csv/shell/curl.ftl          |   0
 .../examples/templates/dataframe/example.ftl       |   0
 .../examples/templates/dataframe/html/print.ftl    |   0
 .../src/{ => app}/examples/templates/demo.ftl      |   0
 .../examples/templates/excel/csv/custom.ftl        |   0
 .../templates/excel/dataframe/transform.ftl        |   0
 .../examples/templates/html/csv/dependencies.ftl   |   0
 .../examples/templates/html/txt/licence.ftl        |   0
 .../templates/json/csv/swagger-endpoints.ftl       |   0
 .../templates/json/dataframe/github-users.ftl      |   0
 .../examples/templates/json/md/github-users.ftl    |   0
 .../templates/properties/csv/locker-test-users.ftl |   0
 .../examples/templates/tsv/fo/transactions.ftl     |   0
 .../examples/templates/xml/txt/recipients.ftl      |   0
 .../examples/templates/yaml/txt/transform.ftl      |   0
 .../src/{ => app}/scripts/run-examples.bat         |   0
 .../src/{ => app}/scripts/run-examples.sh          |   0
 .../templates/freemarker-generator/cat.ftl         |   0
 .../freemarker-generator/csv/csv/transform.ftl     |   0
 .../freemarker-generator/csv/html/transform.ftl    |   0
 .../freemarker-generator/csv/md/transform.ftl      |   0
 .../freemarker-generator/excel/csv/transform.ftl   |   0
 .../freemarker-generator/excel/html/transform.ftl  |   0
 .../freemarker-generator/excel/md/transform.ftl    |   0
 .../templates/freemarker-generator/info.ftl        |   0
 .../freemarker-generator/json/yaml/transform.ftl   |   0
 .../freemarker-generator/lib/commons-csv.ftl       |   0
 .../freemarker-generator/yaml/json/transform.ftl   |   0
 .../org/apache/freemarker/generator/cli/Main.java  |  26 ++++++-
 .../cli/config/TemplateDirectorySupplier.java      |  48 ++++++------
 .../freemarker/generator/cli/AbstractMainTest.java |  11 ++-
 .../freemarker/generator/cli/ExamplesTest.java     |  84 ++++++++++-----------
 .../generator/cli/TemplateLoadingTest.java         |   2 +-
 .../cli/config/TemplateDirectorySupplierTest.java  |   4 +-
 freemarker-generator-website/pom.xml               |  15 +---
 72 files changed, 129 insertions(+), 98 deletions(-)

diff --cc freemarker-generator-website/pom.xml
index b199bb8,0000000..6f927b2
mode 100644,000000..100644
--- a/freemarker-generator-website/pom.xml
+++ b/freemarker-generator-website/pom.xml
@@@ -1,154 -1,0 +1,145 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +   Licensed to the Apache Software Foundation (ASF) under one or more
 +   contributor license agreements.  See the NOTICE file distributed with
 +   this work for additional information regarding copyright ownership.
 +   The ASF licenses this file to You under the Apache License, Version 2.0
 +   (the "License"); you may not use this file except in compliance with
 +   the License.  You may obtain a copy of the License at
 +
 +       http://www.apache.org/licenses/LICENSE-2.0
 +
 +   Unless required by applicable law or agreed to in writing, software
 +   distributed under the License is distributed on an "AS IS" BASIS,
 +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +   See the License for the specific language governing permissions and
 +   limitations under the License.
 +-->
 +<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/maven-v4_0_0.xsd">
 +
 +    <modelVersion>4.0.0</modelVersion>
 +
 +    <parent>
 +        <groupId>org.apache.freemarker.generator</groupId>
 +        <artifactId>freemarker-generator</artifactId>
 +        <version>0.1.0-SNAPSHOT</version>
 +    </parent>
 +
 +    <artifactId>freemarker-generator-website</artifactId>
 +    <name>Website</name>
 +    <description>Apache FreeMarker Generator Website</description>
 +
 +    <properties>
 +        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 +        <maven.compiler.source>1.8</maven.compiler.source>
 +        <maven.compiler.target>1.8</maven.compiler.target>
 +        
 +        <websiteOutputDirectory>${project.build.directory}/website</websiteOutputDirectory>
 +        <freemarkerGeneratorAppHome>${project.basedir}/../freemarker-generator-cli/target/appassembler</freemarkerGeneratorAppHome>
 +        <docgenInsertedOutputsDirectory>${project.build.directory}/docgen-insertable-outputs</docgenInsertedOutputsDirectory>
 +        <docgenInsertedExampleTemplatesDirectory>${freemarkerGeneratorAppHome}/examples/templates</docgenInsertedExampleTemplatesDirectory>
 +        <docgenInsertedExampleOutputDirectory>${freemarkerGeneratorAppHome}/target/out</docgenInsertedExampleOutputDirectory>
 +        <docgenInsertedTemplatesDirectory>${freemarkerGeneratorAppHome}/templates</docgenInsertedTemplatesDirectory>
 +    </properties>
 +
 +    <dependencies>
 +        <dependency>
 +            <groupId>org.apache.freemarker.generator</groupId>
 +            <artifactId>freemarker-generator-cli</artifactId>
 +            <version>${project.version}</version>
 +        </dependency>
 +    </dependencies>
 +
 +    <build>
 +        <plugins>
 +            <plugin>
 +                <groupId>org.codehaus.mojo</groupId>
 +                <artifactId>exec-maven-plugin</artifactId>
 +                <executions>
 +                    <execution>
 +                        <id>generateCliHelp</id>
 +                        <phase>package</phase>
 +                        <goals>
 +                          <goal>exec</goal>
 +                        </goals>
 +                        <configuration>   
 +                          <executable>java</executable>
 +                          <arguments>
 +                              <argument>-classpath</argument>
 +                              <classpath/>
 +
 +                              <!-- Setting up things without calling the launcher scripts in app/bin: -->
-                               <!-- TODO in freemarker-generator-cli: Ideally, only setting -Dapp.home should be enough. -->
-                               <argument>org.apache.freemarker.generator.cli.Main</argument>
-                               <argument>--config</argument>
-                               <argument>${freemarkerGeneratorAppHome}/config/freemarker-generator.properties</argument>
-                               <argument>--template-dir</argument>
-                               <argument>${freemarkerGeneratorAppHome}/templates</argument>
++                              <argument>-Dapp.home=${freemarkerGeneratorAppHome}</argument>
 +
 +                              <argument>org.apache.freemarker.generator.cli.Main</argument>
 +                              <argument>--help</argument>
 +                          </arguments>
 +                          <outputFile>${docgenInsertedOutputsDirectory}/cli-help-output.txt</outputFile>
 +                        </configuration>
 +                    </execution>
 +                    <execution>
 +                        <id>generateInfoTemplateOutput</id>
 +                        <phase>package</phase>
 +                        <goals>
 +                          <goal>exec</goal>
 +                        </goals>
 +                        <configuration>   
 +                          <executable>java</executable>
 +                          <arguments>
 +                              <argument>-classpath</argument>
 +                              <classpath/>
 +
 +                              <!-- Setting up things without calling the launcher scripts in app/bin: -->
-                               <!-- TODO in freemarker-generator-cli: Ideally, only setting -Dapp.home should be enough. -->
-                               <argument>org.apache.freemarker.generator.cli.Main</argument>
-                               <argument>--config</argument>
-                               <argument>${freemarkerGeneratorAppHome}/config/freemarker-generator.properties</argument>
-                               <argument>--template-dir</argument>
-                               <argument>${freemarkerGeneratorAppHome}/templates</argument>
++                              <argument>-Dapp.home=${freemarkerGeneratorAppHome}</argument>
 +
++                              <argument>org.apache.freemarker.generator.cli.Main</argument>
 +                              <argument>-t</argument>
 +                              <argument>freemarker-generator/info.ftl</argument>
 +                          </arguments>
 +                          <outputFile>${docgenInsertedOutputsDirectory}/info-template-output.txt</outputFile>
 +                        </configuration>
 +                    </execution>
 +                </executions>
 +            </plugin>
 +            <plugin>
 +                <groupId>org.apache.freemarker.docgen</groupId>
 +                <artifactId>freemarker-docgen-maven</artifactId>
 +                <version>0.0.2-SNAPSHOT</version>
 +                <executions>
 +                    <execution>
 +                        <id>docgen-transform</id>
 +                        <phase>package</phase>
 +                        <goals>
 +                            <goal>transform</goal>
 +                        </goals>
 +                    </execution>
 +                </executions>
 +                <configuration>
 +                    <sourceDirectory>src/main/docgen</sourceDirectory>
 +                    <outputDirectory>${websiteOutputDirectory}</outputDirectory>
 +                    <insertableFiles>
 +                        <outputs>${docgenInsertedOutputsDirectory}/**</outputs>
 +                        <templates>${docgenInsertedTemplatesDirectory}/**</templates>
 +                        <exampleTemplates>${docgenInsertedExampleTemplatesDirectory}/**</exampleTemplates>
 +                        <exampleOutputs>${docgenInsertedExampleOutputDirectory}/**</exampleOutputs>
 +                    </insertableFiles>
 +                    <customVariables>
 +                      <version>${project.version}</version>
 +                    </customVariables>
 +                    <!-- TODO set it back to false before release -->
 +                    <offline>true</offline>
 +                </configuration>
 +            </plugin>
 +        </plugins>
 +    </build>
 +    
 +    <repositories>
 +        <!-- This is need this only when we have freemarker-docgen-maven SNAPSHOT dependency -->
 +        <repository>
 +            <id>apache-snapshot-repository</id>
 +            <url>https://repository.apache.org/content/repositories/snapshots/</url>
 +            <releases><enabled>false</enabled></releases>
 +            <snapshots><enabled>true</enabled></snapshots>
 +        </repository>
 +    </repositories>
 +</project>