This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-168 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 404373595ed452d606326c33d3bc7a3f19b96263 Author: Siegfried Goeschl <[email protected]> AuthorDate: Sun Nov 29 20:29:13 2020 +0100 FREEMARKER-168 Upgrade dependencies of freemarker-generator --- freemarker-generator-cli/CHANGELOG.md | 4 +++- freemarker-generator-tools/pom.xml | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/freemarker-generator-cli/CHANGELOG.md b/freemarker-generator-cli/CHANGELOG.md index 7b72c15..2b564b3 100644 --- a/freemarker-generator-cli/CHANGELOG.md +++ b/freemarker-generator-cli/CHANGELOG.md @@ -41,6 +41,7 @@ All notable changes to this project will be documented in this file. We try to a ### Internal * [FREEMARKER-164] Use default unsafe FreeMarker configuration * [FREEMARKER-153] FreeMarker Generator release preparations +* [FREEMARKER-168] Upgrade dependencies of freemarker-generator [FREEMARKER-127]: https://issues.apache.org/jira/browse/FREEMARKER-127 [FREEMARKER-128]: https://issues.apache.org/jira/browse/FREEMARKER-128 @@ -60,4 +61,5 @@ All notable changes to this project will be documented in this file. We try to a [FREEMARKER-153]: https://issues.apache.org/jira/browse/FREEMARKER-153 [FREEMARKER-155]: https://issues.apache.org/jira/browse/FREEMARKER-155 [FREEMARKER-163]: https://issues.apache.org/jira/browse/FREEMARKER-163 -[FREEMARKER-164]: https://issues.apache.org/jira/browse/FREEMARKER-164 \ No newline at end of file +[FREEMARKER-164]: https://issues.apache.org/jira/browse/FREEMARKER-164 +[FREEMARKER-168]: https://issues.apache.org/jira/browse/FREEMARKER-168 \ No newline at end of file diff --git a/freemarker-generator-tools/pom.xml b/freemarker-generator-tools/pom.xml index c533a6d..97a2dfd 100644 --- a/freemarker-generator-tools/pom.xml +++ b/freemarker-generator-tools/pom.xml @@ -98,6 +98,12 @@ <groupId>com.github.javafaker</groupId> <artifactId>javafaker</artifactId> <version>1.0.2</version> + <exclusions> + <exclusion> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + </exclusion> + </exclusions> </dependency> <!-- JsonPath Tool --> <dependency> @@ -115,7 +121,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.26</version> + <version>1.27</version> </dependency> <!-- Testing --> <dependency>
