You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2019/09/29 20:03:19 UTC

[jmeter] branch master updated: Updated to freemarker 2.3.29 (from 2.3.28)

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

pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new de97a94  Updated to freemarker 2.3.29 (from 2.3.28)
de97a94 is described below

commit de97a94a7c3f5303435b82d9869826bbac72e755
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Sun Sep 29 22:03:10 2019 +0200

    Updated to freemarker 2.3.29 (from 2.3.28)
---
 gradle.properties | 2 +-
 lib/aareadme.txt  | 2 +-
 xdocs/changes.xml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c872243..f61ac94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -54,7 +54,7 @@ darcula.version=e208efb96f70e4be9dc362fbb46f6e181ef501dd
 dec.version=0.1.2
 dnsjava.version=2.1.9
 equalsverifier.version=3.1.9
-freemarker.version=2.3.28
+freemarker.version=2.3.29
 ftplet-api.version=1.1.1
 ftpserver-core.version=1.1.1
 geronimo-jms_1.1_spec.version=1.1.1
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index a706d16..8f043d3 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -111,7 +111,7 @@ hamcrest-core-1.3
 - unit tests, JUnit sampler
 https://github.com/hamcrest/JavaHamcrest
 
-freemarker-2.3.28.jar
+freemarker-2.3.29.jar
 ----------------------
 - used by Report/Dashboard feature
 
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3aaa465..914e39c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -140,6 +140,7 @@ to view the last release notes of version 5.1.1.
     <li>Updated to commons-lang3 3.9 (from 3.8.1)</li>
     <li>Updated to commons-pool 2.7 (from 2.6)</li>
     <li>Updated to commons-text 1.8 (from 1.6)</li>
+    <li>Updated to freemarker 2.3.29 (from 2.3.28)</li>
     <li><bug>63396</bug>JSR223 Test Elements: Description of Parameters is misleading, same for Script</li>
     <li><bug>63480</bug>XPathAssertion and XPathAssertion2: Improve test coverage for input coming from variable. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>63452</bug>Tools / Import from cURL: Complete coverage of all command line options that are valid in JMeter use case. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>