This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-153 by this push:
new f9826b6 FREEMARKER-153 Use individual BSD licence files for
"antlr4-runtime", "asm", "curvesapi",and "hamcrest".
f9826b6 is described below
commit f9826b6995926299a9b0b33b34bd7dd0394f7dc2
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Mon Aug 3 19:58:23 2020 +0200
FREEMARKER-153 Use individual BSD licence files for "antlr4-runtime",
"asm", "curvesapi",and "hamcrest".
---
.travis.yml | 5 +-
freemarker-generator-cli/LICENSE | 8 +-
.../examples/templates/html/txt/licence.ftl | 29 ++--
freemarker-generator-cli/run-examples.bat | 174 -------------------
freemarker-generator-cli/run-examples.sh | 193 ---------------------
...{LICENCE_BSD.txt => LICENCE_antlr4-runtime.txt} | 0
licences/LICENCE_asm.txt | 27 +++
licences/LICENCE_curvesapi.txt | 28 +++
licences/LICENCE_hamcrest.txt | 27 +++
travis.bat | 4 +-
travis.sh | 4 +-
11 files changed, 109 insertions(+), 390 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b3680d5..ab9907e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,10 @@ jdk:
- openjdk11
- openjdk12
- openjdk13
+ - openjdk14
script:
- mvn clean install
- - cd ./freemarker-generator-cli
+ - cd ./freemarker-generator-cli/target/appassembler/
- sh ./run-examples.sh
- - cd ../freemarker-generator-maven-plugin-sample
+ - cd ../../../freemarker-generator-maven-plugin-sample
- mvn clean package
\ No newline at end of file
diff --git a/freemarker-generator-cli/LICENSE b/freemarker-generator-cli/LICENSE
index 91b283c..caca01c 100644
--- a/freemarker-generator-cli/LICENSE
+++ b/freemarker-generator-cli/LICENSE
@@ -229,7 +229,7 @@ See licences/LICENCE_MIT.txt for more information ...
Binary distributions of this product bundles curvesapi which
is available under BSD License.
-See licences/LICENCE_BSD.txt for more information ...
+See licences/LICENCE_curvesapi.txt for more information ...
==============================================================================
@@ -289,7 +289,7 @@ See licencens/LICENSE_ASL-2.0.txt for more information ...
Binary distributions of this product bundles antlr4-runtime which
is available under The BSD License.
-See licences/LICENCE_BSD.txt for more information ...
+See licences/LICENCE_antlr4-runtime.txt for more information ...
==============================================================================
@@ -373,12 +373,10 @@ See licences/LICENCE_MIT.txt for more information ...
Binary distributions of this product bundles asm which
is available under BSD.
-See licences/LICENCE_BSD.txt for more information ...
+See licences/LICENCE_asm.txt for more information ...
==============================================================================
Binary distributions of this product bundles snakeyaml which
is available under Apache License Version 2.0.
See licencens/LICENSE_ASL-2.0.txt for more information ...
-
-
diff --git a/freemarker-generator-cli/examples/templates/html/txt/licence.ftl
b/freemarker-generator-cli/examples/templates/html/txt/licence.ftl
index 8fc9a4e..2807493 100644
--- a/freemarker-generator-cli/examples/templates/html/txt/licence.ftl
+++ b/freemarker-generator-cli/examples/templates/html/txt/licence.ftl
@@ -14,6 +14,9 @@
specific language governing permissions and limitations
under the License.
-->
+<#--
+FreeMarker template to create a LICENCE file.
+-->
<#assign dataSource = dataSources?values[0]>
<#assign html = tools.jsoup.parse(dataSource)>
<#assign dataframe = tools.dataframe.create()
@@ -29,8 +32,9 @@
<@parseDependencies dataframe "Project_Transitive_Dependencies_provided"/>
<@writeApacheLicence/>
<#list dataframe.iterator() as dependency>
+<#assign artifactId = dependency.get("ArtifactId")>
<#assign licence = dependency.get("License")>
-<#assign file = getLicenceFile(licence)>
+<#assign file = getLicenceFile(licence, artifactId)>
==============================================================================
Binary distributions of this product bundles ${dependency.get("ArtifactId")}
which
@@ -47,29 +51,30 @@ See ${file} for more information ...
<#list rows as row>
<#if !row?is_first>
<#assign groupId = row.child(0).text()>
- <#assign artificatId = row.child(1).text()>
+ <#assign artifactId = row.child(1).text()>
<#assign version = row.child(2).text()>
<#assign type = row.child(3).text()>
<#assign licence = row.child(4).text()?replace(",", "")>
- <#assign temp = dataframe.append(groupId, artificatId,
version, type, licence)>
+ <#assign temp = dataframe.append(groupId, artifactId, version,
type, licence)>
</#if>
</#list>
</#if>
</#macro>
-<#function getLicenceFile licence>
- <#if (licence)?contains("BSD")>
- <#return "licences/LICENCE_BSD.txt">
- <#elseif (licence)?contains("Apache")>
+<#function getLicenceFile licence artifactId>
+ <#assign bsdArtifactId=["antlr4-runtime", "asm", "curvesapi", "hamcrest"]>
+ <#if licence?contains("BSD")>
+ <#if bsdArtifactId?seq_contains(artifactId)>
+ <#return "licences/LICENCE_${artifactId}.txt">
+ </#if>
+ <#elseif licence?contains("Apache")>
<#return "licencens/LICENSE_ASL-2.0.txt">
- <#elseif (licence)?contains("COMMON DEVELOPMENT AND DISTRIBUTION")>
+ <#elseif licence?contains("COMMON DEVELOPMENT AND DISTRIBUTION")>
<#return "licences/LICENCE_CDDL-1.0.txt">
- <#elseif (licence)?contains("MIT")>
+ <#elseif licence?contains("MIT")>
<#return "licences/LICENCE_MIT.txt">
- <#elseif (licence)?contains("Eclipse Public License 1.0")>
+ <#elseif licence?contains("Eclipse Public License 1.0")>
<#return "licences/LICENCE_EPL-1.0.txt">
- <#else>
- <#return "???">
</#if>
</#function>
diff --git a/freemarker-generator-cli/run-examples.bat
b/freemarker-generator-cli/run-examples.bat
deleted file mode 100644
index b8ba172..0000000
--- a/freemarker-generator-cli/run-examples.bat
+++ /dev/null
@@ -1,174 +0,0 @@
-@ECHO OFF
-REM
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements. See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License. You may obtain a copy of the License at
-REM
-REM http:\\www.apache.org\licenses\LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM
-
-REM Run all the samples being documented
-
-mkdir target 2>NULL
-mkdir target\out 2>NULL
-
-SET FREEMARKER_CMD=CALL target\appassembler\bin\freemarker-cli.bat
-
-REM =========================================================================
-REM Info
-REM =========================================================================
-
-echo "templates\info.ftl"
-%FREEMARKER_CMD% -t templates\info.ftl README.md > target\out\info.txt
-
-REM =========================================================================
-REM Demo
-REM =========================================================================
-
-echo "examples\templates\demo.ftl"
-%FREEMARKER_CMD% -t examples\templates\demo.ftl README.md --output-encoding
CP1252 > target\out\demo.txt
-
-REM =========================================================================
-REM Interactive Mode
-REM =========================================================================
-
-%FREEMARKER_CMD% -i
'${tools.jsonpath.parse(dataSources?values[0]).read("""$.info.title""")}'
examples\data\json\swagger-spec.json > target\out\interactive-json.txt
-%FREEMARKER_CMD% -i
'${tools.xml.parse(dataSources?values[0])["""recipients/person[1]/name"""]}'
examples\data\xml\recipients.xml > target\out\interactive-xml.txt
-%FREEMARKER_CMD% -i
'${tools.jsoup.parse(dataSources?values[0]).select("""a""")[0]}'
examples\data\html\dependencies.html > target\out\interactive-html.txt
-%FREEMARKER_CMD% -i
'${tools.gson.toJson(tools.yaml.parse(dataSources?values[0]))}'
examples\data\yaml\swagger-spec.yaml > target\out\interactive-swagger.json
-%FREEMARKER_CMD% -i
'${tools.yaml.toYaml(tools.gson.parse(dataSources?values[0]))}'
examples\data\json\swagger-spec.json > target\out\interactive-swagger.yaml
-%FREEMARKER_CMD% -i
'${tools.dataframe.print(tools.dataframe.fromMaps(tools.gson.parse(dataSources?values[0])))}'
examples\data\json\github-users.json > target\out\interactive-dataframe.txt
-
-REM =========================================================================
-REM CSV
-REM =========================================================================
-
-echo "templates\csv\html\transform.ftl"
-%FREEMARKER_CMD% -t templates\csv\html\transform.ftl
examples\data\csv\contract.csv > target\out\contract.html
-
-echo "templates\csv\md\transform.ftl"
-%FREEMARKER_CMD% -t templates\csv\md\transform.ftl
examples\data\csv\contract.csv > target\out\contract.md
-
-echo "examples\templates\csv\shell\curl.ftl"
-%FREEMARKER_CMD% -t .\examples\templates\csv\shell\curl.ftl
examples\data\csv\user.csv > target\out\curl.sh
-
-echo "examples\templates\csv\md\filter.ftl"
-%FREEMARKER_CMD% -e UTF-8 -l de_AT -Pcolumn="Order ID"
-Pvalues=226939189,957081544 -Pformat=DEFAULT -Pdelimiter=COMMA -t
examples\templates\csv\md\filter.ftl examples\data\csv\sales-records.csv >
target\out\sales-records.md
-
-REM =========================================================================
-REM CSV To XML-FO & PDF
-REM =========================================================================
-
-echo "examples\templates\csv\fo\transform.ftl"
-%FREEMARKER_CMD% -t examples\templates\csv\fo\transform.ftl
examples\data\csv\locker-test-users.csv > target\out\locker-test-users.fo
-
-echo "examples\templates\csv\fo\transactions.ftl"
-%FREEMARKER_CMD% -t examples\templates\csv\fo\transactions.ftl
examples\data\csv\transactions.csv > target\out\transactions.fo
-
-REM =========================================================================
-REM CSV to HTML & PDF
-REM =========================================================================
-
-echo "templates\csv\html\transform.ftl"
-%FREEMARKER_CMD% -t examples\templates\csv\html\transactions.ftl
examples\data\csv\transactions.csv > target\out\transactions.html
-
-REM =========================================================================
-REM DataFrame
-REM =========================================================================
-
-echo "examples\templates\dataframe\example.ftl"
-%FREEMARKER_CMD% -PCSV_SOURCE_DELIMITER=SEMICOLON
-PCSV_SOURCE_WITH_HEADER=true -t examples\templates\dataframe\example.ftl
examples\data\csv\dataframe.csv > target\out\dataframe.txt
-
-REM =========================================================================
-REM Grok
-REM =========================================================================
-
-echo "examples\templates\accesslog\combined-access.ftl"
-%FREEMARKER_CMD% -t examples\templates\accesslog\combined-access.ftl
examples\data\accesslog\combined-access.log > target\out\combined-access.log.txt
-
-REM =========================================================================
-REM Excel
-REM =========================================================================
-
-echo "examples\templates\excel\dataframe\transform.ftl"
-%FREEMARKER_CMD% -t examples\templates\excel\dataframe\transform.ftl
examples\data\excel\test.xls > target\out\test.xls.dataframe.txt
-
-echo "templates\excel\html\transform.ftl"
-%FREEMARKER_CMD% -t templates\excel\html\transform.ftl
examples\data\excel\test.xls > target\out\test.xls.html
-%FREEMARKER_CMD% -t templates\excel\html\transform.ftl
examples\data\excel\test.xlsx > target\out\test.xslx.html
-%FREEMARKER_CMD% -t templates\excel\html\transform.ftl
examples\data\excel\test-multiple-sheets.xlsx >
target\out\test-multiple-sheets.xlsx.html
-
-echo "templates\excel\md\transform.ftl"
-%FREEMARKER_CMD% -t templates\excel\md\transform.ftl
examples\data\excel\test-multiple-sheets.xlsx >
target\out\test-multiple-sheets.xlsx.md
-
-echo "templates\excel\csv\transform.ftl"
-%FREEMARKER_CMD% -t templates\excel\csv\transform.ftl
examples\data\excel\test-multiple-sheets.xlsx >
target\out\test-multiple-sheets.xlsx.csv
-
-echo "examples\templates\excel\csv\custom.ftl"
-%FREEMARKER_CMD% -t examples\templates\excel\csv\custom.ftl -Pcsv.format=MYSQL
examples\data\excel\test.xls > target\out\test-transform-xls.csv
-
-REM =========================================================================
-REM HTML
-REM =========================================================================
-
-echo "examples\templates\html\csv\dependencies.ftl"
-%FREEMARKER_CMD% -t examples\templates\html\csv\dependencies.ftl
examples\data\html\dependencies.html > target\out\dependencies.csv
-
-echo "examples\templates\html\txt\licence.ftl"
-%FREEMARKER_CMD% -t examples\templates\html\txt\licence.ftl
examples\data\html\dependencies.html > target\out\licence.txt
-
-REM =========================================================================
-REM JSON
-REM =========================================================================
-
-echo "examples\templates\json\csv\swagger-endpoints.ftl"
-%FREEMARKER_CMD% -t examples\templates\json\csv\swagger-endpoints.ftl
examples\data\json\swagger-spec.json > target\out\swagger-spec.csv
-
-echo "templates\json\yaml\transform.ftl"
-%FREEMARKER_CMD% -t templates\json\yaml\transform.ftl
examples\data\json\swagger-spec.json > target\out\swagger-spec.yaml
-
-echo "examples\templates\json\md\github-users.ftl"
-%FREEMARKER_CMD% -t examples\templates\json\md\github-users.ftl
examples\data\json\github-users.json > target\out\github-users.md
-
-REM =========================================================================
-REM Properties
-REM =========================================================================
-
-echo "examples\templates\properties\csv\locker-test-users.ftl"
-%FREEMARKER_CMD% -t examples\templates\properties\csv\locker-test-users.ftl
examples\data\properties > target\out\locker-test-users.csv
-
-REM =========================================================================
-REM Template Directory
-REM =========================================================================
-
-echo "examples\data\template"
-%FREEMARKER_CMD% -t examples\data\template -PNGINX_HOSTNAME=localhost -o
target\out\template
-
-REM =========================================================================
-REM YAML
-REM =========================================================================
-
-echo "examples\templates\yaml\txt\transform.ftl"
-%FREEMARKER_CMD% -t examples\templates\yaml\txt\transform.ftl
examples\data\yaml\customer.yaml > target\out\customer.txt
-
-echo "templates\yaml\json\transform.ftl"
-%FREEMARKER_CMD% -t templates\yaml\json\transform.ftl
examples\data\yaml\swagger-spec.yaml > target\out\swagger-spec.json
-
-REM =========================================================================
-REM XML
-REM =========================================================================
-
-echo "examples\templates\xml\txt\recipients.ftl"
-%FREEMARKER_CMD% -t .\examples\templates\xml\txt\recipients.ftl
examples\data\xml\recipients.xml > target\out\recipients.txt
-
-echo "Created the following sample files in .\target\out"
-dir .\target\out
\ No newline at end of file
diff --git a/freemarker-generator-cli/run-examples.sh
b/freemarker-generator-cli/run-examples.sh
deleted file mode 100755
index ff8c2e9..0000000
--- a/freemarker-generator-cli/run-examples.sh
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/sh
-#
-# 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.
-
-# Check that java is on the path
-
-hash java 2>/dev/null || { echo >&2 "I require JDK but it's not installed.
Aborting."; exit 1; }
-
-# Run all the samples being documented
-
-mkdir target 2>/dev/null
-mkdir target/out 2>/dev/null
-
-FREEMARKER_CMD="target/appassembler/bin/freemarker-cli"
-# FREEMARKER_CMD="java -jar
target/freemarker-cli-2.0.0-BETA-4-SNAPSHOT-jar-with-dependencies.jar"
-
-#############################################################################
-# Info
-#############################################################################
-
-echo "templates/info.ftl"
-$FREEMARKER_CMD -t templates/info.ftl README.md > target/out/info.txt || {
echo >&2 "Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# Demo
-#############################################################################
-
-echo "examples/templates/demo.ftl"
-$FREEMARKER_CMD -t examples/templates/demo.ftl README.md > target/out/demo.txt
|| { echo >&2 "Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# Interactive Mode
-#############################################################################
-
-$FREEMARKER_CMD -i
'${tools.jsonpath.parse(dataSources?values[0]).read("$.info.title")}'
examples/data/json/swagger-spec.json > target/out/interactive-json.txt || {
echo >&2 "Test failed. Aborting."; exit 1; }
-$FREEMARKER_CMD -i
'${tools.xml.parse(dataSources?values[0])["recipients/person[1]/name"]}'
examples/data/xml/recipients.xml > target/out/interactive-xml.txt || { echo >&2
"Test failed. Aborting."; exit 1; }
-$FREEMARKER_CMD -i
'${tools.jsoup.parse(dataSources?values[0]).select("a")[0]}'
examples/data/html/dependencies.html > target/out/interactive-html.txt || {
echo >&2 "Test failed. Aborting."; exit 1; }
-$FREEMARKER_CMD -i
'${tools.gson.toJson(tools.yaml.parse(dataSources?values[0]))}'
examples/data/yaml/swagger-spec.yaml > target/out/interactive-swagger.json || {
echo >&2 "Test failed. Aborting."; exit 1; }
-$FREEMARKER_CMD -i
'${tools.yaml.toYaml(tools.gson.parse(dataSources?values[0]))}'
examples/data/json/swagger-spec.json > target/out/interactive-swagger.yaml || {
echo >&2 "Test failed. Aborting."; exit 1; }
-$FREEMARKER_CMD -i
'${tools.dataframe.print(tools.dataframe.fromMaps(tools.gson.parse(dataSources?values[0])))}'
examples/data/json/github-users.json > target/out/interactive-dataframe.txt ||
{ echo >&2 "Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# CSV
-#############################################################################
-
-echo "templates/csv/html/transform.ftl"
-$FREEMARKER_CMD -t templates/csv/html/transform.ftl
examples/data/csv/contract.csv > target/out/contract.html || { echo >&2 "Test
failed. Aborting."; exit 1; }
-
-echo "templates/csv/md/transform.ftl"
-$FREEMARKER_CMD -t templates/csv/md/transform.ftl
examples/data/csv/contract.csv > target/out/contract.md || { echo >&2 "Test
failed. Aborting."; exit 1; }
-
-echo "examples/templates/csv/shell/curl.ftl"
-$FREEMARKER_CMD -t ./examples/templates/csv/shell/curl.ftl
examples/data/csv/user.csv > target/out/curl.sh || { echo >&2 "Test failed.
Aborting."; exit 1; }
-
-echo "examples/templates/csv/md/filter.ftl"
-$FREEMARKER_CMD -e UTF-8 -l de_AT -Pcolumn="Order ID"
-Pvalues=226939189,957081544 -Pformat=DEFAULT -Pdelimiter=COMMA -t
examples/templates/csv/md/filter.ftl examples/data/csv/sales-records.csv >
target/out/sales-records.md || { echo >&2 "Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# CSV To XML-FO & PDF
-#############################################################################
-
-echo "examples/templates/csv/fo/transform.ftl"
-$FREEMARKER_CMD -t examples/templates/csv/fo/transform.ftl
examples/data/csv/locker-test-users.csv > target/out/locker-test-users.fo || {
echo >&2 "Test failed. Aborting."; exit 1; }
-
-if hash fop 2>/dev/null; then
- echo "fop -fo target/out/locker-test-users.fo
target/out/locker-test-users.pdf"
- fop -fo target/out/locker-test-users.fo target/out/locker-test-users.pdf
2>/dev/null || { echo >&2 "Test failed. Aborting."; exit 1; }
-fi
-
-echo "examples/templates/csv/fo/transactions.ftl"
-$FREEMARKER_CMD -t examples/templates/csv/fo/transactions.ftl
examples/data/csv/transactions.csv > target/out/transactions.fo || { echo >&2
"Test failed. Aborting."; exit 1; }
-
-if hash fop 2>/dev/null; then
- echo "fop -fo target/out/transactions.fo target/out/transactions-fo.pdf"
- fop -fo target/out/transactions.fo target/out/transactions-fo.pdf
2>/dev/null || { echo >&2 "Test failed. Aborting."; exit 1; }
-fi
-
-#############################################################################
-# CSV to HTML & PDF
-#############################################################################
-
-echo "templates/csv/html/transform.ftl"
-$FREEMARKER_CMD -t examples/templates/csv/html/transactions.ftl
examples/data/csv/transactions.csv > target/out/transactions.html || { echo >&2
"Test failed. Aborting."; exit 1; }
-
-if hash wkhtmltopdf 2>/dev/null; then
- echo "wkhtmltopdf -O landscape target/out/transactions.html
target/out/transactions-html.pdf"
- wkhtmltopdf -O landscape target/out/transactions.html
target/out/transactions-html.pdf 2>/dev/null || { echo >&2 "Test failed.
Aborting."; exit 1; }
-fi
-
-#############################################################################
-# DataFrame
-#############################################################################
-
-echo "examples/templates/dataframe/example.ftl"
-$FREEMARKER_CMD -PCSV_SOURCE_DELIMITER=SEMICOLON -PCSV_SOURCE_WITH_HEADER=true
-t examples/templates/dataframe/example.ftl examples/data/csv/dataframe.csv >
target/out/dataframe.txt || { echo >&2 "Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# Grok
-#############################################################################
-
-echo "examples/templates/accesslog/combined-access.ftl"
-$FREEMARKER_CMD -t examples/templates/accesslog/combined-access.ftl
examples/data/accesslog/combined-access.log >
target/out/combined-access.log.txt || { echo >&2 "Test failed. Aborting.";
exit 1; }
-
-#############################################################################
-# Excel
-#############################################################################
-
-echo "examples/templates/excel/dataframe/transform.ftl"
-$FREEMARKER_CMD -t examples/templates/excel/dataframe/transform.ftl
examples/data/excel/test.xls > target/out/test.xls.dataframe.txt || { echo >&2
"Test failed. Aborting."; exit 1; }
-
-echo "templates/excel/html/transform.ftl"
-$FREEMARKER_CMD -t templates/excel/html/transform.ftl
examples/data/excel/test.xls > target/out/test.xls.html || { echo >&2 "Test
failed. Aborting."; exit 1; }
-$FREEMARKER_CMD -t templates/excel/html/transform.ftl
examples/data/excel/test.xlsx > target/out/test.xslx.html || { echo >&2 "Test
failed. Aborting."; exit 1; }
-$FREEMARKER_CMD -t templates/excel/html/transform.ftl
examples/data/excel/test-multiple-sheets.xlsx >
target/out/test-multiple-sheets.xlsx.html || { echo >&2 "Test failed.
Aborting."; exit 1; }
-
-echo "templates/excel/md/transform.ftl"
-$FREEMARKER_CMD -t templates/excel/md/transform.ftl
examples/data/excel/test-multiple-sheets.xlsx >
target/out/test-multiple-sheets.xlsx.md || { echo >&2 "Test failed.
Aborting."; exit 1; }
-
-echo "templates/excel/csv/transform.ftl"
-$FREEMARKER_CMD -t templates/excel/csv/transform.ftl
examples/data/excel/test-multiple-sheets.xlsx >
target/out/test-multiple-sheets.xlsx.csv || { echo >&2 "Test failed.
Aborting."; exit 1; }
-
-echo "examples/templates/excel/csv/custom.ftl"
-$FREEMARKER_CMD -t examples/templates/excel/csv/custom.ftl -Pcsv.format=MYSQL
examples/data/excel/test.xls > target/out/test-transform-xls.csv || { echo >&2
"Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# HTML
-#############################################################################
-
-echo "examples/templates/html/csv/dependencies.ftl"
-$FREEMARKER_CMD -t examples/templates/html/csv/dependencies.ftl
examples/data/html/dependencies.html > target/out/dependencies.csv || { echo
>&2 "Test failed. Aborting."; exit 1; }
-
-echo "examples/templates/html/txt/licence.ftl"
-$FREEMARKER_CMD -t examples/templates/html/txt/licence.ftl
examples/data/html/dependencies.html > target/out/licence.txt || { echo >&2
"Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# JSON
-#############################################################################
-
-echo "examples/templates/json/csv/swagger-endpoints.ftl"
-$FREEMARKER_CMD -t examples/templates/json/csv/swagger-endpoints.ftl
examples/data/json/swagger-spec.json > target/out/swagger-spec.csv || { echo
>&2 "Test failed. Aborting."; exit 1; }
-
-echo "templates/json/yaml/transform.ftl"
-$FREEMARKER_CMD -t templates/json/yaml/transform.ftl
examples/data/json/swagger-spec.json > target/out/swagger-spec.yaml || { echo
>&2 "Test failed. Aborting."; exit 1; }
-
-echo "examples/templates/json/md/github-users.ftl"
-$FREEMARKER_CMD -t examples/templates/json/md/github-users.ftl
examples/data/json/github-users.json > target/out/github-users.md || { echo >&2
"Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# Properties
-#############################################################################
-
-echo "examples/templates/properties/csv/locker-test-users.ftl"
-$FREEMARKER_CMD -t examples/templates/properties/csv/locker-test-users.ftl
examples/data/properties > target/out/locker-test-users.csv || { echo >&2 "Test
failed. Aborting."; exit 1; }
-
-#############################################################################
-# Template Directory
-#############################################################################
-
-echo "examples/data/template"
-$FREEMARKER_CMD -t examples/data/template -PNGINX_HOSTNAME=localhost -o
target/out/template || { echo >&2 "Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# YAML
-#############################################################################
-
-echo "examples/templates/yaml/txt/transform.ftl"
-$FREEMARKER_CMD -t examples/templates/yaml/txt/transform.ftl
examples/data/yaml/customer.yaml > target/out/customer.txt || { echo >&2 "Test
failed. Aborting."; exit 1; }
-
-echo "templates/yaml/json/transform.ftl"
-$FREEMARKER_CMD -t templates/yaml/json/transform.ftl
examples/data/yaml/swagger-spec.yaml > target/out/swagger-spec.json || { echo
>&2 "Test failed. Aborting."; exit 1; }
-
-#############################################################################
-# XML
-#############################################################################
-
-echo "examples/templates/xml/txt/recipients.ftl"
-$FREEMARKER_CMD -t ./examples/templates/xml/txt/recipients.ftl
examples/data/xml/recipients.xml > target/out/recipients.txt || { echo >&2
"Test failed. Aborting."; exit 1; }
-
-echo "Created the following sample files in ./target/out"
-ls -l ./target/out
\ No newline at end of file
diff --git a/licences/LICENCE_BSD.txt b/licences/LICENCE_antlr4-runtime.txt
similarity index 100%
rename from licences/LICENCE_BSD.txt
rename to licences/LICENCE_antlr4-runtime.txt
diff --git a/licences/LICENCE_asm.txt b/licences/LICENCE_asm.txt
new file mode 100644
index 0000000..631ee53
--- /dev/null
+++ b/licences/LICENCE_asm.txt
@@ -0,0 +1,27 @@
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/licences/LICENCE_curvesapi.txt b/licences/LICENCE_curvesapi.txt
new file mode 100644
index 0000000..22df7b1
--- /dev/null
+++ b/licences/LICENCE_curvesapi.txt
@@ -0,0 +1,28 @@
+Copyright (c) 2005, Graph Builder
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+-Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+-Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+-Neither the name of Graph Builder nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/licences/LICENCE_hamcrest.txt b/licences/LICENCE_hamcrest.txt
new file mode 100644
index 0000000..0bf6264
--- /dev/null
+++ b/licences/LICENCE_hamcrest.txt
@@ -0,0 +1,27 @@
+BSD License
+
+Copyright (c) 2000-2015 www.hamcrest.org
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
list of
+conditions and the following disclaimer. Redistributions in binary form must
reproduce
+the above copyright notice, this list of conditions and the following
disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of Hamcrest nor the names of its contributors may be used to
endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
\ No newline at end of file
diff --git a/travis.bat b/travis.bat
index eb3f41d..9e033a6 100755
--- a/travis.bat
+++ b/travis.bat
@@ -18,8 +18,8 @@ REM under the License.
REM
REM Simulate the Travis build locally
CALL mvn clean install site site:stage
-cd .\freemarker-generator-cli
+cd .\freemarker-generator-cli\target\appassembler\
CALL .\run-examples.bat
-cd ..\freemarker-generator-maven-plugin-sample
+cd ..\..\..\freemarker-generator-maven-plugin-sample
mvn clean package
cd ..
\ No newline at end of file
diff --git a/travis.sh b/travis.sh
index cba6671..61d2161 100755
--- a/travis.sh
+++ b/travis.sh
@@ -18,8 +18,8 @@
#
# Simulate the Travis build locally
mvn clean install site site:stage
-cd ./freemarker-generator-cli
+cd ./freemarker-generator-cli/target/appassembler/
sh ./run-examples.sh
-cd ../freemarker-generator-maven-plugin-sample
+cd ../../../freemarker-generator-maven-plugin-sample
mvn clean package
cd ..
