From commits-return-6018-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Oct 8 07:53:30 2016 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B689019A0D for ; Sat, 8 Oct 2016 07:53:30 +0000 (UTC) Received: (qmail 9285 invoked by uid 500); 8 Oct 2016 07:53:30 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 9249 invoked by uid 500); 8 Oct 2016 07:53:30 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 9240 invoked by uid 99); 8 Oct 2016 07:53:30 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Oct 2016 07:53:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 2445CC230C for ; Sat, 8 Oct 2016 07:53:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id Mas8fEs44tXc for ; Sat, 8 Oct 2016 07:53:27 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 329265F19B for ; Sat, 8 Oct 2016 07:53:27 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 5065EE0425 for ; Sat, 8 Oct 2016 07:53:26 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 4D0D53A0046 for ; Sat, 8 Oct 2016 07:53:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1763862 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/ src/functions/org/apache/jmeter/functions/ xdocs/ xdocs/usermanual/ Date: Sat, 08 Oct 2016 07:53:26 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161008075326.4D0D53A0046@svn01-us-west.apache.org> 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 @@ - @@ -458,7 +457,6 @@ - @@ -2967,7 +2965,6 @@ run JMeter unless all the JMeter jars ar - 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 @@ - 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. 2.1.1 3.1 2.5 - 1.1 2.1.1 3.0 3.4 @@ -179,11 +178,6 @@ under the License. ${commons-io.version} - commons-jexl - commons-jexl - ${commons-jexl.version} - - org.apache.commons commons-jexl ${commons-jexl2.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
  • 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 60221
    • -

    Deprecated and removed elements

    +

    Deprecated and removed elements or functions

    • 60222Remove deprecated elements Distribution Graph, Spline Visualizer
      • -
    • 60224Deprecate Monitor Results listener
      • +
    • 60224Deprecate Monitor Results listener. It will be dropped in next version
      • +
    • 60225Drop deprecated __jexl function and dependency on commons-jexl-1.1.jar This function can be easily replaced with __jexl3 function
    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 / i Scripting groovyrun a Groovy script3.1 Scripting BeanShellrun a BeanShell script1.X Scripting javaScriptprocess JavaScript (Mozilla Rhino)1.9 - Scripting jexlevaluate a Commons Jexl expression. This function is DEPRECATED as of JMeter 3.0, it will be removed in 3.1 version.jexl1(1.1) Scripting jexl2evaluate a Commons Jexl2 expressionjexl2(2.1.1) Scripting jexl3evaluate a Commons Jexl3 expressionjexl3 (3.0) Properties property read a property2.0 @@ -1075,58 +1074,6 @@ The following shorthand aliases are prov

    - - -

    The jexl function returns the result of evaluating a - Commons JEXL expression. - See links below for more information on JEXL expressions. -

    -

    The __jexl function uses Commons JEXL

    - - THIS FUNCTION IS DEPRECATED and should not be used, it will be dropped in next JMeter version -     - - - - The expression to be evaluated. For example, 6*(5+2) - - The name of the variable to set. - -

    -The following variables are made available to the script: -

    - -

    - Jexl can also create classes and call methods on them, for example: -

    -

    - -Systemclass=log.class.forName("java.lang.System"); -now=Systemclass.currentTimeMillis(); - - Note that the Jexl documentation on the web-site wrongly suggests that "div" does integer division. - In fact "div" and "/" both perform normal division. One can get the same effect - as follows: - -i= 5 / 2; -i.intValue(); // or use i.longValue() - -

    - JMeter allows the expression to contain multiple statements. -     -

    The jexl function returns the result of evaluating a