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 383a931bc1573d07ee25c2e122684f964151ab4f
Merge: 073ede0 d32e630
Author: ddekany <[email protected]>
AuthorDate: Wed Dec 16 13:49:07 2020 +0100

    Merge remote-tracking branch 'origin/master' into FREEMARKER-154

 freemarker-generator-cli/CHANGELOG.md              |  9 ++-
 .../src/app/config/freemarker-generator.properties |  3 +-
 .../examples/templates/javafaker/csv/testdata.ftl  | 45 +++++++++++++++
 .../src/app/scripts/run-examples.bat               |  6 ++
 .../src/app/scripts/run-examples.sh                |  7 +++
 .../cli/config/ConfigurationSupplier.java          |  5 --
 .../markdown/cli/introduction/getting-started.md   | 61 ++++++++------------
 .../site/markdown/cli/usage/generating-testdata.md | 66 ++++++++++++++++++++++
 .../src/site/markdown/index.md                     |  1 +
 .../freemarker/generator/cli/ExamplesTest.java     |  5 ++
 .../generator/cli/SecurityRelatedTest.java         | 36 ------------
 .../src/test/templates/security/api.ftl            | 17 ------
 .../src/test/templates/security/new.ftl            | 17 ------
 freemarker-generator-tools/pom.xml                 | 14 ++++-
 .../generator/tools/commonscsv/CommonsCSVTool.java |  6 ++
 .../generator/tools/excel/ExcelTool.java           |  8 +++
 .../freemarker/generator/tools/gson/GsonTool.java  | 15 +++++
 .../generator/tools/javafaker/JavaFakerTool.java   | 63 +++++++++++++++++++++
 .../generator/tools/jsonpath/JsonPathTool.java     | 13 ++++-
 .../generator/tools/properties/PropertiesTool.java |  9 +++
 .../generator/tools/snakeyaml/SnakeYamlTool.java   |  9 +++
 .../freemarker/generator/tools/xml/XmlTool.java    |  9 +++
 .../generator/tools/gson/GsonToolTest.java         | 29 +++++++++-
 .../tools/javafaker/JavaFakerToolTest.java         | 60 ++++++++++++++++++++
 .../generator/tools/jsoup/JsoupToolTest.java       |  2 -
 25 files changed, 395 insertions(+), 120 deletions(-)


Reply via email to