This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-161 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 68df50cad0117b5dabf8e92bcc3842d2b8c7b600 Merge: e73f23d d32e630 Author: Siegfried Goeschl <[email protected]> AuthorDate: Tue Dec 22 13:23:05 2020 +0100 Merge branch 'master' into FREEMARKER-161 freemarker-generator-cli/CHANGELOG.md | 7 ++++- .../cli/config/ConfigurationSupplier.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 | 8 ++++- .../generator/tools/commonscsv/CommonsCSVTool.java | 6 ++++ .../generator/tools/excel/ExcelTool.java | 8 +++++ .../freemarker/generator/tools/gson/GsonTool.java | 15 +++++++++ .../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 ++++++++++++++++- .../generator/tools/jsoup/JsoupToolTest.java | 2 -- 15 files changed, 109 insertions(+), 81 deletions(-)
