You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2020/07/07 13:55:53 UTC

[freemarker-generator] branch FREEMARKER-148 updated (981c3af -> 0f8b0f7)

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

sgoeschl pushed a change to branch FREEMARKER-148
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git.


    from 981c3af  FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like
     add 8ef281b  FREEMARKER-151 Ensure that build and and examples are running on Windows (#19)
     add 0f8b0f7  FREEMARKER-148 Merge with master

No new revisions were added by this update.

Summary of changes:
 .../generator/base/file/RecursiveFileSupplier.java |   4 +-
 .../base/mime/MimetypesFileTypeMapFactory.java     |   2 +-
 .../freemarker/generator/base/util/UriUtils.java   |   8 +-
 .../datasource/DataSourceFactoryTest.java          |  14 +-
 .../generator/datasource/DataSourceTest.java       |   2 +-
 .../datasource/DataSourcesSupplierTest.java        |   5 +-
 .../template/TemplateSourceFactoryTest.java        |   8 +-
 .../generator/uri/NamedUriStringParserTest.java    |  13 +-
 freemarker-generator-cli/CHANGELOG.md              |   4 +-
 .../examples/templates/demo.ftl                    |   5 -
 freemarker-generator-cli/pom.xml                   |   1 +
 freemarker-generator-cli/run-examples.bat          | 171 +++++++++++++++++++++
 .../src/main/scripts/run-examples.bat              | 171 +++++++++++++++++++++
 .../src/main/scripts/run-examples.sh               |   4 +-
 .../cli/config/DataModelSupplierTest.java          |  24 +--
 freemarker-generator-maven-plugin/CHANGELOG.md     |   4 +
 .../generator/maven/FreeMarkerMojoTest.java        |  26 +++-
 .../maven/JsonPropertiesProviderTest.java          |   4 +-
 .../generator/maven/OperatingSystem.java           |  24 +++
 .../generator/maven/OutputGeneratorTest.java       |   3 +-
 .../tools/commonsexec/CommonsExecToolTest.java     |  23 +--
 .../generator/tools/gson/GsonToolTest.java         |   1 -
 travis.bat                                         |  25 +++
 travis.sh                                          |   3 +-
 24 files changed, 478 insertions(+), 71 deletions(-)
 create mode 100644 freemarker-generator-cli/run-examples.bat
 create mode 100644 freemarker-generator-cli/src/main/scripts/run-examples.bat
 create mode 100644 freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/OperatingSystem.java
 create mode 100755 travis.bat