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 2017/03/01 21:34:13 UTC
svn commit: r1785042 - in /jmeter/trunk: LICENSE build.properties
eclipse.classpath lib/ lib/aareadme.txt licenses/bin/README.txt
res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Author: pmouawad
Date: Wed Mar 1 21:34:13 2017
New Revision: 1785042
URL: http://svn.apache.org/viewvc?rev=1785042&view=rev
Log:
Updated to groovy 2.4.9 (from 2.4.8)
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/licenses/bin/README.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1785042&r1=1785041&r2=1785042&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Wed Mar 1 21:34:13 2017
@@ -220,7 +220,7 @@ The following software is provided under
* commons-math3-3.6.1.jar
* commons-net-3.6.jar
* commons-pool2-2.4.2.jar
-* groovy-all-2.4.8.jar
+* groovy-all-2.4.9.jar
* httpasyncclient-4.1.3.jar
* httpclient-4.5.3.jar
* httpcore-4.4.6.jar
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1785042&r1=1785041&r2=1785042&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Wed Mar 1 21:34:13 2017
@@ -148,10 +148,10 @@ freemarker.jar = freemarke
freemarker.md5 = cbb1cec300ca98eea3c855cf395d4951
# Groovy
-groovy-all.version = 2.4.8
+groovy-all.version = 2.4.9
groovy-all.loc = ${maven2.repo}/org/codehaus/groovy/groovy-all/${groovy-all.version}
groovy-all.jar = groovy-all-${groovy-all.version}.jar
-groovy-all.md5 = f44ff68e2acdd334ab93c6f326192817
+groovy-all.md5 = a80ac304789b0b4863e7902e4fb13e84
# hamcrest-core
hamcrest-core.version = 1.3
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1785042&r1=1785041&r2=1785042&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Wed Mar 1 21:34:13 2017
@@ -62,7 +62,7 @@
<classpathentry kind="lib" path="lib/commons-pool2-2.4.2.jar"/>
<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
<classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
- <classpathentry kind="lib" path="lib/groovy-all-2.4.8.jar"/>
+ <classpathentry kind="lib" path="lib/groovy-all-2.4.9.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/httpasyncclient-4.1.3.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 1 21:34:13 2017
@@ -22,7 +22,7 @@ dnsjava-2.1.8.jar
freemarker-2.3.23.jar
hamcrest-core-1.3.jar
geronimo*.jar
-groovy-all-2.4.8.jar
+groovy-all-2.4.9.jar
httpasyncclient-4.1.3.jar
httpclient-4.5.3.jar
httpcore-4.4.6.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1785042&r1=1785041&r2=1785042&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Wed Mar 1 21:34:13 2017
@@ -81,7 +81,7 @@ dnsjava-2.1.8
http://www.dnsjava.org/download/
- DNSCacheManager
-groovy-all-2.4.8
+groovy-all-2.4.9
----------------------
Advised scripting language for JSR223 Test Elements
Modified: jmeter/trunk/licenses/bin/README.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1785042&r1=1785041&r2=1785042&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Wed Mar 1 21:34:13 2017
@@ -17,7 +17,7 @@ commons-net-3.6.jar
commons-pool2-2.4.2.jar
excalibur-logger-1.1.jar
geronimo-jms_1.1_spec-1.1.1.jar
-groovy-all-2.4.8.jar
+groovy-all-2.4.9.jar
httpclient-4.5.3.jar
httpcore-4.4.6.jar
httpmime-4.5.3.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1785042&r1=1785041&r2=1785042&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed Mar 1 21:34:13 2017
@@ -72,7 +72,7 @@ under the License.
<commons-pool2.version>2.4.2</commons-pool2.version>
<dnsjava.version>2.1.8</dnsjava.version>
<freemarker.version>2.3.23</freemarker.version>
- <groovy-all.version>2.4.8</groovy-all.version>
+ <groovy-all.version>2.4.9</groovy-all.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
<httpasyncclient.version>4.1.3</httpasyncclient.version>
<httpclient.version>4.5.3</httpclient.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1785042&r1=1785041&r2=1785042&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Mar 1 21:34:13 2017
@@ -141,7 +141,7 @@ JMeter now requires Java 8. Ensure you u
<h3>Other samplers</h3>
<ul>
- <li><bug>60740</bug>Support variable for all JMS messages (bytes, object, …) and sources (file, folder), based on <pr>241</pr>. Contributed by Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
+ <li><bug>60740</bug>Support variable for all JMS messages (bytes, object, …) and sources (file, folder), based on <pr>241</pr>. Contributed by Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
<li><bug>60585</bug>JMS Publisher and JMS Subscriber : Allow reconnection on error and pause between errors. Based on <pr>240</pr> from by Logan Mauzaize (logan.mauzaize at gmail.com) and Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
<li><pr>259</pr>Refactored and reformatted SmtpSampler. Contributed by Graham Russell (graham at ham1.co.uk)</li>
</ul>
@@ -192,7 +192,7 @@ JMeter now requires Java 8. Ensure you u
<h3>General</h3>
<ul>
- <li><bug>58164</bug>Check if file already exists on ResultCollector listener before starting the loadtest</li>
+ <li><bug>58164</bug>Check if file already exists on ResultCollector listener before starting the loadtest</li>
<li><bug>54525</bug>Search Feature : Enhance it with ability to replace</li>
<li><bug>60530</bug>Add API to create JMeter threads while test is running. Based on a contribution by Logan Mauzaize (logan.mauzaize at gmail.com) and Maxime Chassagneux (maxime.chassagneux at gmail.com).</li>
<li><bug>60514</bug>Ability to apply a naming convention on Children of a Transaction Controller. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
@@ -216,7 +216,7 @@ JMeter now requires Java 8. Ensure you u
<ul>
<li><bug>60415</bug>Drop support for Java 7.</li>
<li>Updated to dnsjava-2.1.8.jar (from 2.1.7)</li>
- <li>Updated to groovy 2.4.8 (from 2.4.7)</li>
+ <li>Updated to groovy 2.4.9 (from 2.4.7)</li>
<li>Updated to httpcore 4.4.6 (from 4.4.5)</li>
<li>Updated to httpclient 4.5.3 (from 4.5.2)</li>
<li>Updated to jodd 3.8.1 (from 3.8.1.jar)</li>
Re: svn commit: r1785042 - in /jmeter/trunk: LICENSE build.properties
eclipse.classpath lib/ lib/aareadme.txt licenses/bin/README.txt
res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Posted by Philippe Mouawad <ph...@gmail.com>.
Hi. Felix,
It's a merge issue.
Just spaces that differ.
On Thursday, March 2, 2017, Felix Schumacher <
felix.schumacher@internetallee.de> wrote:
>
>
> Am 1. März 2017 22:34:13 MEZ schrieb pmouawad@apache.org <javascript:;>:
> >Author: pmouawad
> >Date: Wed Mar 1 21:34:13 2017
> >New Revision: 1785042
> >
> >URL: http://svn.apache.org/viewvc?rev=1785042&view=rev
> >Log:
> >Updated to groovy 2.4.9 (from 2.4.8)
> >
> >Modified:
> > jmeter/trunk/LICENSE
> > jmeter/trunk/build.properties
> > jmeter/trunk/eclipse.classpath
> > jmeter/trunk/lib/ (props changed)
> > jmeter/trunk/lib/aareadme.txt
> > jmeter/trunk/licenses/bin/README.txt
> > jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> > jmeter/trunk/xdocs/changes.xml
> >
> >Modified: jmeter/trunk/LICENSE
> >URL:
> >http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=
> 1785042&r1=1785041&r2=1785042&view=diff
> >===========================================================
> ===================
> >--- jmeter/trunk/LICENSE [utf-8] (original)
> >+++ jmeter/trunk/LICENSE [utf-8] Wed Mar 1 21:34:13 2017
> >@@ -220,7 +220,7 @@ The following software is provided under
> > * commons-math3-3.6.1.jar
> > * commons-net-3.6.jar
> > * commons-pool2-2.4.2.jar
> >-* groovy-all-2.4.8.jar
> >+* groovy-all-2.4.9.jar
> > * httpasyncclient-4.1.3.jar
> > * httpclient-4.5.3.jar
> > * httpcore-4.4.6.jar
> >
> >Modified: jmeter/trunk/build.properties
> >URL:
> >http://svn.apache.org/viewvc/jmeter/trunk/build.properties?
> rev=1785042&r1=1785041&r2=1785042&view=diff
> >===========================================================
> ===================
> >--- jmeter/trunk/build.properties (original)
> >+++ jmeter/trunk/build.properties Wed Mar 1 21:34:13 2017
> >@@ -148,10 +148,10 @@ freemarker.jar = freemarke
> > freemarker.md5 = cbb1cec300ca98eea3c855cf395d4951
> >
> > # Groovy
> >-groovy-all.version = 2.4.8
> >+groovy-all.version = 2.4.9
> >groovy-all.loc =
> >${maven2.repo}/org/codehaus/groovy/groovy-all/${groovy-all.version}
> > groovy-all.jar = groovy-all-${groovy-all.version}.jar
> >-groovy-all.md5 = f44ff68e2acdd334ab93c6f326192817
> >+groovy-all.md5 = a80ac304789b0b4863e7902e4fb13e84
> >
> > # hamcrest-core
> > hamcrest-core.version = 1.3
> >
> >Modified: jmeter/trunk/eclipse.classpath
> >URL:
> >http://svn.apache.org/viewvc/jmeter/trunk/eclipse.
> classpath?rev=1785042&r1=1785041&r2=1785042&view=diff
> >===========================================================
> ===================
> >--- jmeter/trunk/eclipse.classpath (original)
> >+++ jmeter/trunk/eclipse.classpath Wed Mar 1 21:34:13 2017
> >@@ -62,7 +62,7 @@
> > <classpathentry kind="lib" path="lib/commons-pool2-2.4.2.jar"/>
> > <classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
> > <classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
> >- <classpathentry kind="lib" path="lib/groovy-all-2.4.8.jar"/>
> >+ <classpathentry kind="lib" path="lib/groovy-all-2.4.9.jar"/>
> > <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
> > <classpathentry kind="lib"
> >path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
> > <classpathentry kind="lib" path="lib/httpasyncclient-4.1.3.jar"/>
> >
> >Propchange: jmeter/trunk/lib/
> >-----------------------------------------------------------
> -------------------
> >--- svn:ignore (original)
> >+++ svn:ignore Wed Mar 1 21:34:13 2017
> >@@ -22,7 +22,7 @@ dnsjava-2.1.8.jar
> > freemarker-2.3.23.jar
> > hamcrest-core-1.3.jar
> > geronimo*.jar
> >-groovy-all-2.4.8.jar
> >+groovy-all-2.4.9.jar
> > httpasyncclient-4.1.3.jar
> > httpclient-4.5.3.jar
> > httpcore-4.4.6.jar
> >
> >Modified: jmeter/trunk/lib/aareadme.txt
> >URL:
> >http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?
> rev=1785042&r1=1785041&r2=1785042&view=diff
> >===========================================================
> ===================
> >--- jmeter/trunk/lib/aareadme.txt (original)
> >+++ jmeter/trunk/lib/aareadme.txt Wed Mar 1 21:34:13 2017
> >@@ -81,7 +81,7 @@ dnsjava-2.1.8
> > http://www.dnsjava.org/download/
> > - DNSCacheManager
> >
> >-groovy-all-2.4.8
> >+groovy-all-2.4.9
> > ----------------------
> > Advised scripting language for JSR223 Test Elements
> >
> >
> >Modified: jmeter/trunk/licenses/bin/README.txt
> >URL:
> >http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/
> README.txt?rev=1785042&r1=1785041&r2=1785042&view=diff
> >===========================================================
> ===================
> >--- jmeter/trunk/licenses/bin/README.txt (original)
> >+++ jmeter/trunk/licenses/bin/README.txt Wed Mar 1 21:34:13 2017
> >@@ -17,7 +17,7 @@ commons-net-3.6.jar
> > commons-pool2-2.4.2.jar
> > excalibur-logger-1.1.jar
> > geronimo-jms_1.1_spec-1.1.1.jar
> >-groovy-all-2.4.8.jar
> >+groovy-all-2.4.9.jar
> > httpclient-4.5.3.jar
> > httpcore-4.4.6.jar
> > httpmime-4.5.3.jar
> >
> >Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> >URL:
> >http://svn.apache.org/viewvc/jmeter/trunk/res/maven/
> ApacheJMeter_parent.pom?rev=1785042&r1=1785041&r2=1785042&view=diff
> >===========================================================
> ===================
> >--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
> >+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed Mar 1 21:34:13
> >2017
> >@@ -72,7 +72,7 @@ under the License.
> > <commons-pool2.version>2.4.2</commons-pool2.version>
> > <dnsjava.version>2.1.8</dnsjava.version>
> > <freemarker.version>2.3.23</freemarker.version>
> >- <groovy-all.version>2.4.8</groovy-all.version>
> >+ <groovy-all.version>2.4.9</groovy-all.version>
> > <hamcrest-core.version>1.3</hamcrest-core.version>
> > <httpasyncclient.version>4.1.3</httpasyncclient.version>
> > <httpclient.version>4.5.3</httpclient.version>
> >
> >Modified: jmeter/trunk/xdocs/changes.xml
> >URL:
> >http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.
> xml?rev=1785042&r1=1785041&r2=1785042&view=diff
> >===========================================================
> ===================
> >--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
> >+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Mar 1 21:34:13 2017
> >@@ -141,7 +141,7 @@ JMeter now requires Java 8. Ensure you u
> >
> > <h3>Other samplers</h3>
> > <ul>
> >- <li><bug>60740</bug>Support variable for all JMS messages (bytes,
> >object, …) and sources (file, folder), based on <pr>241</pr>.
> >Contributed by Maxime Chassagneux (maxime.chassagneux at
> >gmail.com).</li>
> >+ <li><bug>60740</bug>Support variable for all JMS messages (bytes,
> >object, …) and sources (file, folder), based on <pr>241</pr>.
>
> What has this to do with groovy?
> Tabs?
>
> >Contributed by Maxime Chassagneux (maxime.chassagneux at
> >gmail.com).</li>
> ><li><bug>60585</bug>JMS Publisher and JMS Subscriber : Allow
> >reconnection on error and pause between errors. Based on <pr>240</pr>
> >from by Logan Mauzaize (logan.mauzaize at gmail.com) and Maxime
> >Chassagneux (maxime.chassagneux at gmail.com).</li>
> ><li><pr>259</pr>Refactored and reformatted SmtpSampler. Contributed by
> >Graham Russell (graham at ham1.co.uk)</li>
> > </ul>
> >@@ -192,7 +192,7 @@ JMeter now requires Java 8. Ensure you u
> >
> > <h3>General</h3>
> > <ul>
> >- <li><bug>58164</bug>Check if file already exists on
> >ResultCollector listener before starting the loadtest</li>
> >+ <li><bug>58164</bug>Check if file already exists on ResultCollector
> >listener before starting the loadtest</li>
>
> Same thing here.
>
> Felix
>
> ><li><bug>54525</bug>Search Feature : Enhance it with ability to
> >replace</li>
> ><li><bug>60530</bug>Add API to create JMeter threads while test is
> >running. Based on a contribution by Logan Mauzaize (logan.mauzaize at
> >gmail.com) and Maxime Chassagneux (maxime.chassagneux at
> >gmail.com).</li>
> ><li><bug>60514</bug>Ability to apply a naming convention on Children of
> >a Transaction Controller. Contributed by Ubik Load Pack (support at
> >ubikloadpack.com)</li>
> >@@ -216,7 +216,7 @@ JMeter now requires Java 8. Ensure you u
> > <ul>
> > <li><bug>60415</bug>Drop support for Java 7.</li>
> > <li>Updated to dnsjava-2.1.8.jar (from 2.1.7)</li>
> >- <li>Updated to groovy 2.4.8 (from 2.4.7)</li>
> >+ <li>Updated to groovy 2.4.9 (from 2.4.7)</li>
> > <li>Updated to httpcore 4.4.6 (from 4.4.5)</li>
> > <li>Updated to httpclient 4.5.3 (from 4.5.2)</li>
> > <li>Updated to jodd 3.8.1 (from 3.8.1.jar)</li>
>
--
Cordialement.
Philippe Mouawad.
Re: svn commit: r1785042 - in /jmeter/trunk: LICENSE build.properties eclipse.classpath lib/ lib/aareadme.txt licenses/bin/README.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Posted by Felix Schumacher <fe...@internetallee.de>.
Am 1. März 2017 22:34:13 MEZ schrieb pmouawad@apache.org:
>Author: pmouawad
>Date: Wed Mar 1 21:34:13 2017
>New Revision: 1785042
>
>URL: http://svn.apache.org/viewvc?rev=1785042&view=rev
>Log:
>Updated to groovy 2.4.9 (from 2.4.8)
>
>Modified:
> jmeter/trunk/LICENSE
> jmeter/trunk/build.properties
> jmeter/trunk/eclipse.classpath
> jmeter/trunk/lib/ (props changed)
> jmeter/trunk/lib/aareadme.txt
> jmeter/trunk/licenses/bin/README.txt
> jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> jmeter/trunk/xdocs/changes.xml
>
>Modified: jmeter/trunk/LICENSE
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1785042&r1=1785041&r2=1785042&view=diff
>==============================================================================
>--- jmeter/trunk/LICENSE [utf-8] (original)
>+++ jmeter/trunk/LICENSE [utf-8] Wed Mar 1 21:34:13 2017
>@@ -220,7 +220,7 @@ The following software is provided under
> * commons-math3-3.6.1.jar
> * commons-net-3.6.jar
> * commons-pool2-2.4.2.jar
>-* groovy-all-2.4.8.jar
>+* groovy-all-2.4.9.jar
> * httpasyncclient-4.1.3.jar
> * httpclient-4.5.3.jar
> * httpcore-4.4.6.jar
>
>Modified: jmeter/trunk/build.properties
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1785042&r1=1785041&r2=1785042&view=diff
>==============================================================================
>--- jmeter/trunk/build.properties (original)
>+++ jmeter/trunk/build.properties Wed Mar 1 21:34:13 2017
>@@ -148,10 +148,10 @@ freemarker.jar = freemarke
> freemarker.md5 = cbb1cec300ca98eea3c855cf395d4951
>
> # Groovy
>-groovy-all.version = 2.4.8
>+groovy-all.version = 2.4.9
>groovy-all.loc =
>${maven2.repo}/org/codehaus/groovy/groovy-all/${groovy-all.version}
> groovy-all.jar = groovy-all-${groovy-all.version}.jar
>-groovy-all.md5 = f44ff68e2acdd334ab93c6f326192817
>+groovy-all.md5 = a80ac304789b0b4863e7902e4fb13e84
>
> # hamcrest-core
> hamcrest-core.version = 1.3
>
>Modified: jmeter/trunk/eclipse.classpath
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1785042&r1=1785041&r2=1785042&view=diff
>==============================================================================
>--- jmeter/trunk/eclipse.classpath (original)
>+++ jmeter/trunk/eclipse.classpath Wed Mar 1 21:34:13 2017
>@@ -62,7 +62,7 @@
> <classpathentry kind="lib" path="lib/commons-pool2-2.4.2.jar"/>
> <classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
> <classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
>- <classpathentry kind="lib" path="lib/groovy-all-2.4.8.jar"/>
>+ <classpathentry kind="lib" path="lib/groovy-all-2.4.9.jar"/>
> <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
> <classpathentry kind="lib"
>path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
> <classpathentry kind="lib" path="lib/httpasyncclient-4.1.3.jar"/>
>
>Propchange: jmeter/trunk/lib/
>------------------------------------------------------------------------------
>--- svn:ignore (original)
>+++ svn:ignore Wed Mar 1 21:34:13 2017
>@@ -22,7 +22,7 @@ dnsjava-2.1.8.jar
> freemarker-2.3.23.jar
> hamcrest-core-1.3.jar
> geronimo*.jar
>-groovy-all-2.4.8.jar
>+groovy-all-2.4.9.jar
> httpasyncclient-4.1.3.jar
> httpclient-4.5.3.jar
> httpcore-4.4.6.jar
>
>Modified: jmeter/trunk/lib/aareadme.txt
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1785042&r1=1785041&r2=1785042&view=diff
>==============================================================================
>--- jmeter/trunk/lib/aareadme.txt (original)
>+++ jmeter/trunk/lib/aareadme.txt Wed Mar 1 21:34:13 2017
>@@ -81,7 +81,7 @@ dnsjava-2.1.8
> http://www.dnsjava.org/download/
> - DNSCacheManager
>
>-groovy-all-2.4.8
>+groovy-all-2.4.9
> ----------------------
> Advised scripting language for JSR223 Test Elements
>
>
>Modified: jmeter/trunk/licenses/bin/README.txt
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1785042&r1=1785041&r2=1785042&view=diff
>==============================================================================
>--- jmeter/trunk/licenses/bin/README.txt (original)
>+++ jmeter/trunk/licenses/bin/README.txt Wed Mar 1 21:34:13 2017
>@@ -17,7 +17,7 @@ commons-net-3.6.jar
> commons-pool2-2.4.2.jar
> excalibur-logger-1.1.jar
> geronimo-jms_1.1_spec-1.1.1.jar
>-groovy-all-2.4.8.jar
>+groovy-all-2.4.9.jar
> httpclient-4.5.3.jar
> httpcore-4.4.6.jar
> httpmime-4.5.3.jar
>
>Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1785042&r1=1785041&r2=1785042&view=diff
>==============================================================================
>--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
>+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed Mar 1 21:34:13
>2017
>@@ -72,7 +72,7 @@ under the License.
> <commons-pool2.version>2.4.2</commons-pool2.version>
> <dnsjava.version>2.1.8</dnsjava.version>
> <freemarker.version>2.3.23</freemarker.version>
>- <groovy-all.version>2.4.8</groovy-all.version>
>+ <groovy-all.version>2.4.9</groovy-all.version>
> <hamcrest-core.version>1.3</hamcrest-core.version>
> <httpasyncclient.version>4.1.3</httpasyncclient.version>
> <httpclient.version>4.5.3</httpclient.version>
>
>Modified: jmeter/trunk/xdocs/changes.xml
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1785042&r1=1785041&r2=1785042&view=diff
>==============================================================================
>--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
>+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Mar 1 21:34:13 2017
>@@ -141,7 +141,7 @@ JMeter now requires Java 8. Ensure you u
>
> <h3>Other samplers</h3>
> <ul>
>- <li><bug>60740</bug>Support variable for all JMS messages (bytes,
>object, …) and sources (file, folder), based on <pr>241</pr>.
>Contributed by Maxime Chassagneux (maxime.chassagneux at
>gmail.com).</li>
>+ <li><bug>60740</bug>Support variable for all JMS messages (bytes,
>object, …) and sources (file, folder), based on <pr>241</pr>.
What has this to do with groovy?
Tabs?
>Contributed by Maxime Chassagneux (maxime.chassagneux at
>gmail.com).</li>
><li><bug>60585</bug>JMS Publisher and JMS Subscriber : Allow
>reconnection on error and pause between errors. Based on <pr>240</pr>
>from by Logan Mauzaize (logan.mauzaize at gmail.com) and Maxime
>Chassagneux (maxime.chassagneux at gmail.com).</li>
><li><pr>259</pr>Refactored and reformatted SmtpSampler. Contributed by
>Graham Russell (graham at ham1.co.uk)</li>
> </ul>
>@@ -192,7 +192,7 @@ JMeter now requires Java 8. Ensure you u
>
> <h3>General</h3>
> <ul>
>- <li><bug>58164</bug>Check if file already exists on
>ResultCollector listener before starting the loadtest</li>
>+ <li><bug>58164</bug>Check if file already exists on ResultCollector
>listener before starting the loadtest</li>
Same thing here.
Felix
><li><bug>54525</bug>Search Feature : Enhance it with ability to
>replace</li>
><li><bug>60530</bug>Add API to create JMeter threads while test is
>running. Based on a contribution by Logan Mauzaize (logan.mauzaize at
>gmail.com) and Maxime Chassagneux (maxime.chassagneux at
>gmail.com).</li>
><li><bug>60514</bug>Ability to apply a naming convention on Children of
>a Transaction Controller. Contributed by Ubik Load Pack (support at
>ubikloadpack.com)</li>
>@@ -216,7 +216,7 @@ JMeter now requires Java 8. Ensure you u
> <ul>
> <li><bug>60415</bug>Drop support for Java 7.</li>
> <li>Updated to dnsjava-2.1.8.jar (from 2.1.7)</li>
>- <li>Updated to groovy 2.4.8 (from 2.4.7)</li>
>+ <li>Updated to groovy 2.4.9 (from 2.4.7)</li>
> <li>Updated to httpcore 4.4.6 (from 4.4.5)</li>
> <li>Updated to httpclient 4.5.3 (from 4.5.2)</li>
> <li>Updated to jodd 3.8.1 (from 3.8.1.jar)</li>