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 ba8f32b340564a9315a67451b8e9655e509cb12f Merge: b1beff7 77d7991 Author: ddekany <[email protected]> AuthorDate: Sun Sep 12 00:02:54 2021 +0200 Merge remote-tracking branch 'origin/master' into FREEMARKER-154 README.md | 2 +- freemarker-generator-base/pom.xml | 1 + .../generator/base/datasource/DataSource.java | 16 +-- .../datasource/loader/FileDataSourceLoader.java | 1 - .../freemarker/generator/base/uri/NamedUri.java | 1 - .../src/site/markdown/index.md | 3 +- .../datasource/DataSourceFactoryTest.java | 2 +- .../generator/datasource/DataSourceLoaderTest.java | 25 ++++- freemarker-generator-cli/CHANGELOG.md | 5 + freemarker-generator-cli/README.md | 2 +- freemarker-generator-cli/pom.xml | 2 + .../src/app/examples/data/logs/server.01.log | 14 +++ .../src/app/examples/data/logs/server.02.log | 13 +++ .../templates/accesslog/combined-access.ftl | 4 +- .../templates/logs/csv/serverlog-to-csv.ftl | 50 +++++++++ .../src/app/scripts/examples-win.args | 109 +++++++++++++++++++ .../src/app/scripts/examples.args | 109 +++++++++++++++++++ .../src/app/scripts/run-examples.bat | 9 +- .../src/app/scripts/run-examples.sh | 3 + .../cli/config/ConfigurationSupplier.java | 2 +- .../cli/picocli/OutputGeneratorDefinition.java | 1 - .../src/site/markdown/cli/concepts/data-sources.md | 4 +- .../src/site/markdown/cli/concepts/named-uris.md | 2 +- .../src/site/markdown/cli/concepts/passing-data.md | 2 +- .../site/markdown/cli/concepts/transformation.md | 23 ++-- .../site/markdown/cli/usage/parsing-with-grok.md | 121 +++++++++++++++++++++ .../site/markdown/cli/usage/running-examples.md | 65 +---------- .../src/site/markdown/index.md | 1 + .../freemarker/generator/cli/ExamplesTest.java | 1 + .../cli/config/DataModelSupplierTest.java | 14 +-- freemarker-generator-maven-plugin-sample/README.md | 2 +- .../freemarker/generator/maven/UnitTestHelper.java | 5 +- freemarker-generator-tools/pom.xml | 10 +- .../tools/dataframe/impl/ConverterUtils.java | 7 +- .../generator/tools/freemarker/FreeMarkerTool.java | 2 +- .../freemarker/generator/tools/grok/GrokTool.java | 49 +++++++-- .../generator/tools/grok/impl/GrokWrapper.java | 42 ------- .../generator/tools/grok/GrokToolTest.java | 35 +++++- .../tools/javafaker/JavaFakerToolTest.java | 43 ++++++++ pom.xml | 14 ++- travis.sh | 1 + 41 files changed, 635 insertions(+), 182 deletions(-) diff --cc freemarker-generator-cli/src/app/scripts/run-examples.bat index 5ddfbd7,6512dca..5467382 --- a/freemarker-generator-cli/src/app/scripts/run-examples.bat +++ b/freemarker-generator-cli/src/app/scripts/run-examples.bat @@@ -35,11 -35,11 +35,11 @@@ REM Dem REM ========================================================================= echo "examples\templates\demo.ftl" -%FREEMARKER_CMD% -t examples\templates\demo.ftl README.md --output-encoding CP1252 > target\out\demo.txt +%FREEMARKER_CMD% -t examples\templates\demo.ftl --output-encoding CP1252 -DfreemarkerGenerator.examples.deductSensitiveInformation=true README.md > target\out\demo.txt - ############################################################################# - # DataSources - ############################################################################# + REM ========================================================================= + REM DataSources + REM ========================================================================= echo "examples\templates\datasources.ftl" %FREEMARKER_CMD% -t examples\templates\datasources.ftl -s :data=examples/data > target\out\datasources-01.txt
