Author: pmouawad
Date: Sat Oct  8 07:53:25 2016
New Revision: 1763862

URL: http://svn.apache.org/viewvc?rev=1763862&view=rev
Log:
Bug 60225 - Drop deprecated __jexl function and dependency on commons-jexl 
Bugzilla Id: 60225

Removed:
    jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    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
    jmeter/trunk/xdocs/usermanual/functions.xml

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Oct  8 07:53:25 2016
@@ -110,11 +110,6 @@ commons-io.jar              = commons-io
 commons-io.loc              = ${maven2.repo}/commons-io/commons-io/${commons-io.version}
 commons-io.md5              = e2d74794fba570ec2115fb9d5b05dc9b
 
-commons-jexl.version        = 1.1
-commons-jexl.jar            = commons-jexl-${commons-jexl.version}.jar
-commons-jexl.loc            = ${maven2.repo}/commons-jexl/commons-jexl/${commons-jexl.version}
-commons-jexl.md5            = 3F7735D20FCE1DBE05F62FF7A7B178DC
-
 commons-jexl2.version       = 2.1.1
 commons-jexl2.jar           = commons-jexl-${commons-jexl2.version}.jar
 commons-jexl2.loc           = ${maven2.repo}/org/apache/commons/commons-jexl/${commons-jexl2.version}

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Oct  8 07:53:25 2016
@@ -381,7 +381,6 @@
     <include name="${lib.dir}/${commons-dbcp2.jar}"/>
     <include name="${lib.dir}/${commons-httpclient.jar}"/>
     <include name="${lib.dir}/${commons-io.jar}"/>
-    <include name="${lib.dir}/${commons-jexl.jar}"/>
     <include name="${lib.dir}/${commons-jexl2.jar}"/>
     <include name="${lib.dir}/${commons-jexl3.jar}"/>
     <include name="${lib.dir}/${commons-lang3.jar}"/>
@@ -458,7 +457,6 @@
     <pathelement location="${lib.dir}/${commons-dbcp2.jar}"/>
     <pathelement location="${lib.dir}/${commons-httpclient.jar}"/>
     <pathelement location="${lib.dir}/${commons-io.jar}"/>
-    <pathelement location="${lib.dir}/${commons-jexl.jar}"/>
     <pathelement location="${lib.dir}/${commons-jexl2.jar}"/>
     <pathelement location="${lib.dir}/${commons-jexl3.jar}"/>
     <pathelement location="${lib.dir}/${commons-lang3.jar}"/>
@@ -2967,7 +2965,6 @@ run JMeter unless all the JMeter jars ar
     <process_jarfile jarname="commons-dbcp2"/>
     <process_jarfile jarname="commons-httpclient"/>
     <process_jarfile jarname="commons-io"/>
-    <process_jarfile jarname="commons-jexl"/>
     <process_jarfile jarname="commons-jexl2"/>
     <process_jarfile jarname="commons-jexl3"/>
     <process_jarfile jarname="commons-lang3"/>

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Oct  8 07:53:25 2016
@@ -54,7 +54,6 @@
 	<classpathentry kind="lib" path="lib/commons-dbcp2-2.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.5.jar"/>
-	<classpathentry kind="lib" path="lib/commons-jexl-1.1.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-lang3-3.4.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Oct  8 07:53:25 2016
@@ -12,7 +12,6 @@ commons-collections-3.2.2.jar
 commons-dbcp2-2.1.1.jar
 commons-httpclient-3.1.jar
 commons-io-2.5.jar
-commons-jexl-1.1.jar
 commons-jexl-2.1.1.jar
 commons-jexl3-3.0.jar
 commons-lang3-3.4.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sat Oct  8 07:53:25 2016
@@ -59,7 +59,7 @@ commons-io-2.5
 http://commons.apache.org/downloads/download_io.cgi
 - FTPSampler
 
-commons-jexl-1.1, commons-jexl-2.1.1, commons-jexl3-3.0
+commons-jexl-2.1.1, commons-jexl3-3.0
 ----------------
 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=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Sat Oct  8 07:53:25 2016
@@ -10,7 +10,6 @@ commons-collections-3.2.2.jar
 commons-dbcp2-2.1.1.jar
 commons-httpclient-3.1.jar
 commons-io-2.5.jar
-commons-jexl-1.1.jar
 commons-jexl-2.1.1.jar
 commons-jexl3-3.0.jar
 commons-lang3-3.4.jar

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Oct  8 07:53:25 2016
@@ -65,7 +65,6 @@ under the License.
       <commons-dbcp2.version>2.1.1</commons-dbcp2.version>
       <commons-httpclient.version>3.1</commons-httpclient.version>
       <commons-io.version>2.5</commons-io.version>
-      <commons-jexl.version>1.1</commons-jexl.version>
       <commons-jexl2.version>2.1.1</commons-jexl2.version>
       <commons-jexl3.version>3.0</commons-jexl3.version>
       <commons-lang3.version>3.4</commons-lang3.version>
@@ -179,11 +178,6 @@ under the License.
         <version>${commons-io.version}</version>
       </dependency>
       <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
-        <version>${commons-jexl.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-jexl</artifactId>
         <version>${commons-jexl2.version}</version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Oct  8 07:53:25 2016
@@ -77,10 +77,11 @@ Summary
     <li>Since 3.1 version, CSV DataSet now trims variable names to avoid issues due to spaces between variables names when configuring CSV DataSet. This should not have any impact for you unless you use space at the begining or end of your variable names. See <bugzilla>60221</bugzilla></li>
 </ul>
 
-<h3>Deprecated and removed elements</h3>
+<h3>Deprecated and removed elements or functions</h3>
 <ul>
     <li><bug>60222</bug>Remove deprecated elements Distribution Graph, Spline Visualizer</li>
-    <li><bug>60224</bug>Deprecate <code><a href="./usermanual/component_reference.html#Monitor_Results_(DEPRECATED)">Monitor Results</a></code> listener</li>
+    <li><bug>60224</bug>Deprecate <code><a href="./usermanual/component_reference.html#Monitor_Results_(DEPRECATED)">Monitor Results</a></code> listener. It will be dropped in next version</li>
+    <li><bug>60225</bug>Drop deprecated <code>__jexl</code> function and dependency on <code>commons-jexl-1.1.jar</code> This function can be easily replaced with <code><a href="./usermanual/functions.html#__jexl3">__jexl3</a></code> function</li>
 </ul>
 
 <!-- =================== Improvements =================== -->

Modified: jmeter/trunk/xdocs/usermanual/functions.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1763862&r1=1763861&r2=1763862&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jmeter/trunk/xdocs/usermanual/functions.xml Sat Oct  8 07:53:25 2016
@@ -128,7 +128,6 @@ Alternatively, just use <code>/</code> i
         <tr><td>Scripting</td><td> <a href="#__groovy">groovy</a></td><td>run a Groovy script</td><td>3.1</td></tr>
         <tr><td>Scripting</td><td> <a href="#__BeanShell">BeanShell</a></td><td>run a BeanShell script</td><td>1.X</td></tr>
         <tr><td>Scripting</td><td> <a href="#__javaScript">javaScript</a></td><td>process JavaScript (Mozilla Rhino)</td><td>1.9</td></tr>
-        <tr><td>Scripting</td><td> <a href="#__jexl">jexl</a></td><td>evaluate a Commons Jexl expression. This function is DEPRECATED as of JMeter 3.0, it will be removed in 3.1 version.</td><td>jexl1(1.1)</td></tr>
         <tr><td>Scripting</td><td> <a href="#__jexl2">jexl2</a></td><td>evaluate a Commons Jexl2 expression</td><td>jexl2(2.1.1)</td></tr>
         <tr><td>Scripting</td><td> <a href="#__jexl3">jexl3</a></td><td>evaluate a Commons Jexl3 expression</td><td>jexl3 (3.0)</td></tr>
         <tr><td>Properties</td><td> <a href="#__property">property</a> </td><td>read a property</td><td>2.0</td></tr>
@@ -1075,58 +1074,6 @@ The following shorthand aliases are prov
 </p>
 </component>
 
-<component index="&sect-num;.5.18" name="__jexl">
-<description>
-    <p>The jexl function returns the result of evaluating a 
-    <a href="http://commons.apache.org/jexl">Commons JEXL expression</a>. 
-    See links below for more information on JEXL expressions.
-    </p>
-    <p>The <code>__jexl</code> function uses Commons JEXL</p>
-    <ul>
-    <li><a href="http://commons.apache.org/proper/commons-jexl/reference/syntax.html">JEXL syntax description</a></li>
-    <li><a href="http://commons.apache.org/proper/commons-jexl/reference/examples.html#Example_Expressions">JEXL examples</a></li>
-    </ul>
-    <note>THIS FUNCTION IS DEPRECATED and should not be used, it will be dropped in next JMeter version</note>
-    </description>
-
-<properties>
-        <property name="Expression" required="Yes">
-        The expression to be evaluated. For example, <code>6*(5+2)</code>
-        </property>
-        <property name="Name of variable" required="No">The name of the variable to set.</property>
-</properties>
-<p>
-The following variables are made available to the script:
-</p>
-<ul>
-<li><code>log</code> - the <a href="http://excalibur.apache.org/apidocs/org/apache/log/Logger.html">Logger</a> for the function</li>
-<li><code>ctx</code> - <a href="../api/org/apache/jmeter/threads/JMeterContext.html">JMeterContext</a> object</li>
-<li><code>vars</code> - <a href="../api/org/apache/jmeter/threads/JMeterVariables.html">JMeterVariables</a> object</li>
-<li><code>props</code> - JMeterProperties (class <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html"><code>java.util.Properties</code></a>) object</li>
-<li><code>threadName</code> - String containing the current thread name</li>
-<li><code>sampler</code> - current <a href="../api/org/apache/jmeter/samplers/Sampler.html">Sampler</a> object (if any)</li>
-<li><code>sampleResult</code> - previous <a href="../api/org/apache/jmeter/samplers/SampleResult.html">SampleResult</a> object (if any)</li>
-<li><code>OUT</code> - System.out - e.g. <code>OUT.println("message")</code></li>
-</ul>
-    <p>
-    Jexl can also create classes and call methods on them, for example:
-    </p>
-    <p>
-    <source>
-Systemclass=log.class.forName("java.lang.System");
-now=Systemclass.currentTimeMillis();
-</source>
-    Note that the Jexl documentation on the web-site wrongly suggests that "<code>div</code>" does integer division.
-    In fact "<code>div</code>" and "<code>/</code>" both perform normal division. One can get the same effect
-    as follows:
-    <source>
-i= 5 / 2;
-i.intValue(); // or use i.longValue()
-</source>
-    </p>
-    <note>JMeter allows the expression to contain multiple statements.</note>
-</component>
-
 <component index="&sect-num;.5.18" name="__jexl2">
 <description>
     <p>The jexl function returns the result of evaluating a