You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2018/11/10 12:57:13 UTC
svn commit: r1846303 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/
src/components/org/apache/jmeter/extractor/
src/core/org/apache/jmeter/report/dashboard/
src/core/org/apache/jmeter/report/processor/
src/functions/org/apache/jmeter/functions/ s...
Author: fschumacher
Date: Sat Nov 10 12:57:12 2018
New Revision: 1846303
URL: http://svn.apache.org/viewvc?rev=1846303&view=rev
Log:
Use StringEscapeUtils from commons-text (version 1.6) instead of the deprecated ones from commons-lang3
Bugzilla Id: 62893
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/licenses/bin/README.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeXml.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Nov 10 12:57:12 2018
@@ -140,6 +140,11 @@ commons-pool2.jar = commons-
commons-pool2.loc = ${maven2.repo}/org/apache/commons/commons-pool2/${commons-pool2.version}
commons-pool2.sha512 = C31D44FF2D527DEC5189BAF8AE1D888C37A53A60283C58CBEACD723C773DB8219DD54E0FCA15F29F781E0AF66E60E894254D6AAC80178207B51DD2F9DCC972C3
+commons-text.version = 1.6
+commons-text.jar = commons-text-${commons-text.version}.jar
+commons-text.loc = ${maven2.repo}/org/apache/commons/commons-text/${commons-text.version}
+commons-text.sha512 = a0c077e33c075ffd2a9bf6776c1c27f6d19b451dd6f9a26cc06aed586bd746e5dadefee72e130f0d43768f8e3f24cddabe79b1e94abf227fbc8e8c58db0c6504
+
darcula.version = e208efb96f70e4be9dc362fbb46f6e181ef501dd
darcula.jar = darcula.jar
darcula.loc = https://github.com/bulenkov/Darcula/raw/${darcula.version}/build
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Nov 10 12:57:12 2018
@@ -407,6 +407,7 @@
<include name="${lib.dir}/${commons-math3.jar}"/>
<include name="${lib.dir}/${commons-net.jar}"/>
<include name="${lib.dir}/${commons-pool2.jar}"/>
+ <include name="${lib.dir}/${commons-text.jar}"/>
<include name="${lib.dir}/${darcula.jar}"/>
<include name="${lib.dir}/${dnsjava.jar}"/>
<include name="${lib.dir}/${freemarker.jar}"/>
@@ -493,6 +494,7 @@
<pathelement location="${lib.dir}/${commons-math3.jar}"/>
<pathelement location="${lib.dir}/${commons-net.jar}"/>
<pathelement location="${lib.dir}/${commons-pool2.jar}"/>
+ <pathelement location="${lib.dir}/${commons-text.jar}"/>
<pathelement location="${lib.dir}/${darcula.jar}"/>
<pathelement location="${lib.dir}/${dnsjava.jar}"/>
<pathelement location="${lib.dir}/${freemarker.jar}"/>
@@ -3368,6 +3370,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="commons-math3"/>
<process_jarfile jarname="commons-net"/>
<process_jarfile jarname="commons-pool2"/>
+ <process_jarfile jarname="commons-text"/>
<process_jarfile jarname="darcula"/>
<process_jarfile jarname="dnsjava"/>
<process_jarfile jarname="freemarker"/>
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Nov 10 12:57:12 2018
@@ -60,6 +60,7 @@
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>
<classpathentry kind="lib" path="lib/commons-pool2-2.6.0.jar"/>
+ <classpathentry kind="lib" path="lib/commons-text-1.6.jar"/>
<classpathentry kind="lib" path="lib/darcula.jar"/>
<classpathentry kind="lib" path="lib/dec-0.1.2.jar"/>
<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov 10 12:57:12 2018
@@ -19,7 +19,7 @@ commons-lang3-3.8.jar
commons-math3-3.6.1.jar
commons-net-3.6.jar
commons-pool2-2.6.0.jar
-commons-text-1.1.jar
+commons-text-1.6.jar
darcula.jar
dec-0.1.2.jar
dnsjava-2.1.8.jar
Modified: jmeter/trunk/licenses/bin/README.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Sat Nov 10 12:57:12 2018
@@ -15,6 +15,7 @@ commons-lang3-3.7.jar
commons-math3-3.5.jar
commons-net-3.6.jar
commons-pool2-2.5.0.jar
+commons-text-1.6.jar
excalibur-logger-1.1.jar
geronimo-jms_1.1_spec-1.1.1.jar
groovy-all-2.4.15.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Nov 10 12:57:12 2018
@@ -71,6 +71,7 @@ under the License.
<commons-math3.version>3.6.1</commons-math3.version>
<commons-net.version>3.6</commons-net.version>
<commons-pool2.version>2.6.0</commons-pool2.version>
+ <commons-text.version>1.6</commons-text.version>
<dnsjava.version>2.1.8</dnsjava.version>
<freemarker.version>2.3.28</freemarker.version>
<groovy-all.version>2.4.15</groovy-all.version>
@@ -221,6 +222,11 @@ under the License.
<version>${commons-pool2.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons-text.version}</version>
+ </dependency>
+ <dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>${dnsjava.version}</version>
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java Sat Nov 10 12:57:12 2018
@@ -26,8 +26,8 @@ import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractScopedTestElement;
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Sat Nov 10 12:57:12 2018
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractScopedTestElement;
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java Sat Nov 10 12:57:12 2018
@@ -27,9 +27,9 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.JMeter;
import org.apache.jmeter.report.config.ConfigurationException;
import org.apache.jmeter.report.config.ExporterConfiguration;
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java Sat Nov 10 12:57:12 2018
@@ -17,8 +17,8 @@
*/
package org.apache.jmeter.report.processor;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.report.core.Sample;
import org.apache.jmeter.report.utils.MetricUtils;
import org.apache.jmeter.samplers.SampleSaveConfiguration;
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java Sat Nov 10 12:57:12 2018
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeXml.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeXml.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeXml.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeXml.java Sat Nov 10 12:57:12 2018
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java Sat Nov 10 12:57:12 2018
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java Sat Nov 10 12:57:12 2018
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
@@ -40,7 +40,7 @@ import org.apache.jmeter.util.JMeterUtil
* If an entity is unrecognized, it is left alone, and inserted verbatim into the result string.
* e.g. "&gt;&zzzz;x" will become ">&zzzz;x".
* </p>
- * @see org.apache.commons.lang3.StringEscapeUtils#unescapeHtml4(String)
+ * @see StringEscapeUtils#unescapeHtml4(String)
* @since 2.3.3
*/
public class UnEscapeHtml extends AbstractFunction {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java Sat Nov 10 12:57:12 2018
@@ -23,8 +23,8 @@ import java.net.URL;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.Validate;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.protocol.http.util.ConversionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java (original)
+++ jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java Sat Nov 10 12:57:12 2018
@@ -39,7 +39,7 @@ import javax.naming.directory.DirContext
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchResult;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1846303&r1=1846302&r2=1846303&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Nov 10 12:57:12 2018
@@ -131,6 +131,7 @@ of previous time slot as a base. Startin
<li><pr>408</pr>Log an informational message instead of an stack trace, when JavaFX is not found for the <code>RenderInBrowser</code> component.</li>
<li><pr>412</pr>Update Chinese translation. Contributed by 刘士 (liushilive at outlook.com).</li>
<li><pr>406</pr>Add a short paragraph on how to use a security manager with JMeter.</li>
+ <li><bug>62893</bug>Use StringEscapeUtils from commons-text (version 1.6) instead of the deprecated ones from commons-lang3.</li>
</ul>
<!-- =================== Bug fixes =================== -->