Author: pmouawad
Date: Sun May 28 20:05:15 2017
New Revision: 1796530
URL: http://svn.apache.org/viewvc?rev=1796530&view=rev
Log:
Update commons-jexl3 to 3.1 from 3.0 and fix failures due to licenses
Added:
jmeter/trunk/licenses/bin/caffeine-2.5.1.txt
- copied unchanged from r1796494,
jmeter/trunk/licenses/bin/caffeine-2.4.0.txt
jmeter/trunk/licenses/bin/dec-0.1.2.txt
- copied unchanged from r1796494, jmeter/trunk/licenses/bin/dec-0.1.1.txt
Removed:
jmeter/trunk/licenses/bin/caffeine-2.4.0.txt
jmeter/trunk/licenses/bin/dec-0.1.1.txt
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=1796530&r1=1796529&r2=1796530&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun May 28 20:05:15 2017
@@ -215,7 +215,7 @@ The following software is provided under
* commons-dbcp2-2.1.1.jar
* commons-io-2.5.jar
* commons-jexl2-2.1.1.jar
-* commons-jexl3-3.0.jar
+* commons-jexl3-3.1.jar
* commons-lang3-3.5.jar
* commons-math3-3.6.1.jar
* commons-net-3.6.jar
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1796530&r1=1796529&r2=1796530&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun May 28 20:05:15 2017
@@ -115,10 +115,10 @@ commons-jexl2.jar = commons-je
commons-jexl2.loc =
${maven2.repo}/org/apache/commons/commons-jexl/${commons-jexl2.version}
commons-jexl2.md5 = 4ad8f5c161dd3a50e190334555675db9
-commons-jexl3.version = 3.0
+commons-jexl3.version = 3.1
commons-jexl3.jar = commons-jexl3-${commons-jexl3.version}.jar
commons-jexl3.loc =
${maven2.repo}/org/apache/commons/commons-jexl3/${commons-jexl3.version}
-commons-jexl3.md5 = 81041b5b058a2ccff0046386bc7e23f8
+commons-jexl3.md5 = d59fed0ea84b84a1574b023eacd47f1a
commons-lang3.version = 3.5
commons-lang3.jar = commons-lang3-${commons-lang3.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1796530&r1=1796529&r2=1796530&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun May 28 20:05:15 2017
@@ -55,7 +55,7 @@
<classpathentry kind="lib" path="lib/commons-dbcp2-2.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-2.1.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-jexl3-3.0.jar"/>
+ <classpathentry kind="lib" path="lib/commons-jexl3-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang3-3.5.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 28 20:05:15 2017
@@ -13,7 +13,7 @@ commons-dbcp2-2.1.1.jar
commons-httpclient-3.1.jar
commons-io-2.5.jar
commons-jexl-2.1.1.jar
-commons-jexl3-3.0.jar
+commons-jexl3-3.1.jar
commons-lang3-3.5.jar
commons-math3-3.6.1.jar
commons-net-3.6.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1796530&r1=1796529&r2=1796530&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun May 28 20:05:15 2017
@@ -57,7 +57,7 @@ commons-io-2.5
http://commons.apache.org/downloads/download_io.cgi
- FTPSampler
-commons-jexl-2.1.1, commons-jexl3-3.0
+commons-jexl-2.1.1, commons-jexl3-3.1
----------------
http://commons.apache.org/downloads/download_jexl.cgi
- Jexl function and BSF test elements
Modified: jmeter/trunk/licenses/bin/README.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1796530&r1=1796529&r2=1796530&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Sun May 28 20:05:15 2017
@@ -10,7 +10,7 @@ commons-collections-3.2.2.jar
commons-dbcp2-2.1.1.jar
commons-io-2.5.jar
commons-jexl-2.1.1.jar
-commons-jexl3-3.0.jar
+commons-jexl3-3.1.jar
commons-lang3-3.5.jar
commons-math3-3.5.jar
commons-net-3.6.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1796530&r1=1796529&r2=1796530&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun May 28 20:05:15 2017
@@ -66,7 +66,7 @@ under the License.
<commons-dbcp2.version>2.1.1</commons-dbcp2.version>
<commons-io.version>2.5</commons-io.version>
<commons-jexl2.version>2.1.1</commons-jexl2.version>
- <commons-jexl3.version>3.0</commons-jexl3.version>
+ <commons-jexl3.version>3.1</commons-jexl3.version>
<commons-lang3.version>3.5</commons-lang3.version>
<commons-math3.version>3.6.1</commons-math3.version>
<commons-net.version>3.6</commons-net.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1796530&r1=1796529&r2=1796530&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun May 28 20:05:15 2017
@@ -128,6 +128,7 @@ Summary
<ul>
<li>Updated to groovy 2.4.11 (from 2.4.10)</li>
<li>Updated to caffeine 2.5.1 (from 2.4.0)</li>
+ <li>Updated to commons-jexl3 3.1 (from 3.0)</li>
</ul>
<!-- =================== Bug fixes =================== -->
