Attachment #36253 for bug #62893

View | Details | Raw Unified | Return to bug 62893
Collapse All | Expand All

Lines 140-145 Link Here

(-)build.properties (+5 lines)
140	commons-pool2.loc = ${maven2.repo}/org/apache/commons/commons-pool2/${commons-pool2.version}	140	commons-pool2.loc = ${maven2.repo}/org/apache/commons/commons-pool2/${commons-pool2.version}
141	commons-pool2.sha512 = C31D44FF2D527DEC5189BAF8AE1D888C37A53A60283C58CBEACD723C773DB8219DD54E0FCA15F29F781E0AF66E60E894254D6AAC80178207B51DD2F9DCC972C3	141	commons-pool2.sha512 = C31D44FF2D527DEC5189BAF8AE1D888C37A53A60283C58CBEACD723C773DB8219DD54E0FCA15F29F781E0AF66E60E894254D6AAC80178207B51DD2F9DCC972C3
142		142
		143	commons-text.version = 1.6
		144	commons-text.jar = commons-text-${commons-text.version}.jar
		145	commons-text.loc = ${maven2.repo}/org/apache/commons/commons-text/${commons-text.version}
		146	commons-text.sha512 = a0c077e33c075ffd2a9bf6776c1c27f6d19b451dd6f9a26cc06aed586bd746e5dadefee72e130f0d43768f8e3f24cddabe79b1e94abf227fbc8e8c58db0c6504
		147
143	darcula.version = e208efb96f70e4be9dc362fbb46f6e181ef501dd	148	darcula.version = e208efb96f70e4be9dc362fbb46f6e181ef501dd
144	darcula.jar = darcula.jar	149	darcula.jar = darcula.jar
145	darcula.loc = https://github.com/bulenkov/Darcula/raw/${darcula.version}/build	150	darcula.loc = https://github.com/bulenkov/Darcula/raw/${darcula.version}/build




    <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}"/>

    <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}"/>

    <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"/>

Lines 60-65 Link Here

(-)eclipse.classpath (+1 lines)
60	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>	60	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
61	<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>	61	<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>
62	<classpathentry kind="lib" path="lib/commons-pool2-2.6.0.jar"/>	62	<classpathentry kind="lib" path="lib/commons-pool2-2.6.0.jar"/>
		63	<classpathentry kind="lib" path="lib/commons-text-1.6.jar"/>
63	<classpathentry kind="lib" path="lib/darcula.jar"/>	64	<classpathentry kind="lib" path="lib/darcula.jar"/>
64	<classpathentry kind="lib" path="lib/dec-0.1.2.jar"/>	65	<classpathentry kind="lib" path="lib/dec-0.1.2.jar"/>
65	<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>	66	<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>

Lines 15-20 Link Here

(-)licenses/bin/README.txt (+1 lines)
15	commons-math3-3.5.jar	15	commons-math3-3.5.jar
16	commons-net-3.6.jar	16	commons-net-3.6.jar
17	commons-pool2-2.5.0.jar	17	commons-pool2-2.5.0.jar
		18	commons-text-1.6.jar
18	excalibur-logger-1.1.jar	19	excalibur-logger-1.1.jar
19	geronimo-jms_1.1_spec-1.1.1.jar	20	geronimo-jms_1.1_spec-1.1.1.jar
20	groovy-all-2.4.15.jar	21	groovy-all-2.4.15.jar

Lines 71-76 Link Here

(-)res/maven/ApacheJMeter_parent.pom (+6 lines)
71	<commons-math3.version>3.6.1</commons-math3.version>	71	<commons-math3.version>3.6.1</commons-math3.version>
72	<commons-net.version>3.6</commons-net.version>	72	<commons-net.version>3.6</commons-net.version>
73	<commons-pool2.version>2.6.0</commons-pool2.version>	73	<commons-pool2.version>2.6.0</commons-pool2.version>
		74	<commons-text.version>1.6</commons-text.version>
74	<dnsjava.version>2.1.8</dnsjava.version>	75	<dnsjava.version>2.1.8</dnsjava.version>
75	<freemarker.version>2.3.28</freemarker.version>	76	<freemarker.version>2.3.28</freemarker.version>
76	<groovy-all.version>2.4.15</groovy-all.version>	77	<groovy-all.version>2.4.15</groovy-all.version>
Lines 221-226 Link Here
221	<version>${commons-pool2.version}</version>	222	<version>${commons-pool2.version}</version>
222	</dependency>	223	</dependency>
223	<dependency>	224	<dependency>
		225	<groupId>org.apache.commons</groupId>
		226	<artifactId>commons-text</artifactId>
		227	<version>${commons-text.version}</version>
		228	</dependency>
		229	<dependency>
224	<groupId>dnsjava</groupId>	230	<groupId>dnsjava</groupId>
225	<artifactId>dnsjava</artifactId>	231	<artifactId>dnsjava</artifactId>
226	<version>${dnsjava.version}</version>	232	<version>${dnsjava.version}</version>

Lines 26-33 Link Here

(-)src/components/org/apache/jmeter/extractor/BoundaryExtractor.java (-1 / +1 lines)
26	import java.util.stream.Collectors;	26	import java.util.stream.Collectors;
27	import java.util.stream.Stream;	27	import java.util.stream.Stream;
28		28
29	import org.apache.commons.lang3.StringEscapeUtils;
30	import org.apache.commons.lang3.StringUtils;	29	import org.apache.commons.lang3.StringUtils;
		30	import org.apache.commons.text.StringEscapeUtils;
31	import org.apache.jmeter.processor.PostProcessor;	31	import org.apache.jmeter.processor.PostProcessor;
32	import org.apache.jmeter.samplers.SampleResult;	32	import org.apache.jmeter.samplers.SampleResult;
33	import org.apache.jmeter.testelement.AbstractScopedTestElement;	33	import org.apache.jmeter.testelement.AbstractScopedTestElement;

Lines 23-29 Link Here

(-)src/components/org/apache/jmeter/extractor/RegexExtractor.java (-1 / +1 lines)
23	import java.util.Collections;	23	import java.util.Collections;
24	import java.util.List;	24	import java.util.List;
25		25
26	import org.apache.commons.lang3.StringEscapeUtils;	26	import org.apache.commons.text.StringEscapeUtils;
27	import org.apache.jmeter.processor.PostProcessor;	27	import org.apache.jmeter.processor.PostProcessor;
28	import org.apache.jmeter.samplers.SampleResult;	28	import org.apache.jmeter.samplers.SampleResult;
29	import org.apache.jmeter.testelement.AbstractScopedTestElement;	29	import org.apache.jmeter.testelement.AbstractScopedTestElement;

Lines 27-35 Link Here

(-)src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java (-1 / +1 lines)
27	import java.util.regex.PatternSyntaxException;	27	import java.util.regex.PatternSyntaxException;
28		28
29	import org.apache.commons.io.FileUtils;	29	import org.apache.commons.io.FileUtils;
30	import org.apache.commons.lang3.StringEscapeUtils;
31	import org.apache.commons.lang3.StringUtils;	30	import org.apache.commons.lang3.StringUtils;
32	import org.apache.commons.lang3.Validate;	31	import org.apache.commons.lang3.Validate;
		32	import org.apache.commons.text.StringEscapeUtils;
33	import org.apache.jmeter.JMeter;	33	import org.apache.jmeter.JMeter;
34	import org.apache.jmeter.report.config.ConfigurationException;	34	import org.apache.jmeter.report.config.ConfigurationException;
35	import org.apache.jmeter.report.config.ExporterConfiguration;	35	import org.apache.jmeter.report.config.ExporterConfiguration;

Lines 17-24 Link Here

(-)src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java (-1 / +1 lines)
17	*/	17	*/
18	package org.apache.jmeter.report.processor;	18	package org.apache.jmeter.report.processor;
19		19
20	import org.apache.commons.lang3.StringEscapeUtils;
21	import org.apache.commons.lang3.StringUtils;	20	import org.apache.commons.lang3.StringUtils;
		21	import org.apache.commons.text.StringEscapeUtils;
22	import org.apache.jmeter.report.core.Sample;	22	import org.apache.jmeter.report.core.Sample;
23	import org.apache.jmeter.report.utils.MetricUtils;	23	import org.apache.jmeter.report.utils.MetricUtils;
24	import org.apache.jmeter.samplers.SampleSaveConfiguration;	24	import org.apache.jmeter.samplers.SampleSaveConfiguration;

Lines 22-28 Link Here

(-)src/functions/org/apache/jmeter/functions/EscapeHtml.java (-1 / +1 lines)
22	import java.util.LinkedList;	22	import java.util.LinkedList;
23	import java.util.List;	23	import java.util.List;
24		24
25	import org.apache.commons.lang3.StringEscapeUtils;	25	import org.apache.commons.text.StringEscapeUtils;
26	import org.apache.jmeter.engine.util.CompoundVariable;	26	import org.apache.jmeter.engine.util.CompoundVariable;
27	import org.apache.jmeter.samplers.SampleResult;	27	import org.apache.jmeter.samplers.SampleResult;
28	import org.apache.jmeter.samplers.Sampler;	28	import org.apache.jmeter.samplers.Sampler;

Lines 22-28 Link Here

(-)src/functions/org/apache/jmeter/functions/EscapeXml.java (-1 / +1 lines)
22	import java.util.LinkedList;	22	import java.util.LinkedList;
23	import java.util.List;	23	import java.util.List;
24		24
25	import org.apache.commons.lang3.StringEscapeUtils;	25	import org.apache.commons.text.StringEscapeUtils;
26	import org.apache.jmeter.engine.util.CompoundVariable;	26	import org.apache.jmeter.engine.util.CompoundVariable;
27	import org.apache.jmeter.samplers.SampleResult;	27	import org.apache.jmeter.samplers.SampleResult;
28	import org.apache.jmeter.samplers.Sampler;	28	import org.apache.jmeter.samplers.Sampler;

Lines 23-29 Link Here

(-)src/functions/org/apache/jmeter/functions/UnEscape.java (-1 / +1 lines)
23	import java.util.LinkedList;	23	import java.util.LinkedList;
24	import java.util.List;	24	import java.util.List;
25		25
26	import org.apache.commons.lang3.StringEscapeUtils;	26	import org.apache.commons.text.StringEscapeUtils;
27	import org.apache.jmeter.engine.util.CompoundVariable;	27	import org.apache.jmeter.engine.util.CompoundVariable;
28	import org.apache.jmeter.samplers.SampleResult;	28	import org.apache.jmeter.samplers.SampleResult;
29	import org.apache.jmeter.samplers.Sampler;	29	import org.apache.jmeter.samplers.Sampler;

Lines 23-29 Link Here

(-)src/functions/org/apache/jmeter/functions/UnEscapeHtml.java (-2 / +2 lines)
23	import java.util.LinkedList;	23	import java.util.LinkedList;
24	import java.util.List;	24	import java.util.List;
25		25
26	import org.apache.commons.lang3.StringEscapeUtils;	26	import org.apache.commons.text.StringEscapeUtils;
27	import org.apache.jmeter.engine.util.CompoundVariable;	27	import org.apache.jmeter.engine.util.CompoundVariable;
28	import org.apache.jmeter.samplers.SampleResult;	28	import org.apache.jmeter.samplers.SampleResult;
29	import org.apache.jmeter.samplers.Sampler;	29	import org.apache.jmeter.samplers.Sampler;
Lines 40-46 Link Here
40	* If an entity is unrecognized, it is left alone, and inserted verbatim into the result string.	40	* If an entity is unrecognized, it is left alone, and inserted verbatim into the result string.
41	* e.g. "&gt;&zzzz;x" will become ">&zzzz;x".	41	* e.g. "&gt;&zzzz;x" will become ">&zzzz;x".
42	* </p>	42	* </p>
43	* @see org.apache.commons.lang3.StringEscapeUtils#unescapeHtml4(String)	43	* @see StringEscapeUtils#unescapeHtml4(String)
44	* @since 2.3.3	44	* @since 2.3.3
45	*/	45	*/
46	public class UnEscapeHtml extends AbstractFunction {	46	public class UnEscapeHtml extends AbstractFunction {

Lines 23-30 Link Here

(-)src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java (-1 / +1 lines)
23	import java.util.Collection;	23	import java.util.Collection;
24	import java.util.Iterator;	24	import java.util.Iterator;
25		25
26	import org.apache.commons.lang3.StringEscapeUtils;
27	import org.apache.commons.lang3.Validate;	26	import org.apache.commons.lang3.Validate;
		27	import org.apache.commons.text.StringEscapeUtils;
28	import org.apache.jmeter.protocol.http.util.ConversionUtils;	28	import org.apache.jmeter.protocol.http.util.ConversionUtils;
29	import org.slf4j.Logger;	29	import org.slf4j.Logger;
30	import org.slf4j.LoggerFactory;	30	import org.slf4j.LoggerFactory;

Lines 39-45 Link Here

(-)src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java (-1 / +1 lines)
39	import javax.naming.directory.ModificationItem;	39	import javax.naming.directory.ModificationItem;
40	import javax.naming.directory.SearchResult;	40	import javax.naming.directory.SearchResult;
41		41
42	import org.apache.commons.lang3.StringEscapeUtils;	42	import org.apache.commons.text.StringEscapeUtils;
43	import org.apache.jmeter.config.Argument;	43	import org.apache.jmeter.config.Argument;
44	import org.apache.jmeter.config.Arguments;	44	import org.apache.jmeter.config.Arguments;
45	import org.apache.jmeter.config.ConfigTestElement;	45	import org.apache.jmeter.config.ConfigTestElement;

Return to bug 62893

Lines 407-412 Link Here

(-)build.xml (+3 lines)
407	<include name="${lib.dir}/${commons-math3.jar}"/>	407	<include name="${lib.dir}/${commons-math3.jar}"/>
408	<include name="${lib.dir}/${commons-net.jar}"/>	408	<include name="${lib.dir}/${commons-net.jar}"/>
409	<include name="${lib.dir}/${commons-pool2.jar}"/>	409	<include name="${lib.dir}/${commons-pool2.jar}"/>
		410	<include name="${lib.dir}/${commons-text.jar}"/>
410	<include name="${lib.dir}/${darcula.jar}"/>	411	<include name="${lib.dir}/${darcula.jar}"/>
411	<include name="${lib.dir}/${dnsjava.jar}"/>	412	<include name="${lib.dir}/${dnsjava.jar}"/>
412	<include name="${lib.dir}/${freemarker.jar}"/>	413	<include name="${lib.dir}/${freemarker.jar}"/>
Lines 493-498 Link Here
493	<pathelement location="${lib.dir}/${commons-math3.jar}"/>	494	<pathelement location="${lib.dir}/${commons-math3.jar}"/>
494	<pathelement location="${lib.dir}/${commons-net.jar}"/>	495	<pathelement location="${lib.dir}/${commons-net.jar}"/>
495	<pathelement location="${lib.dir}/${commons-pool2.jar}"/>	496	<pathelement location="${lib.dir}/${commons-pool2.jar}"/>
		497	<pathelement location="${lib.dir}/${commons-text.jar}"/>
496	<pathelement location="${lib.dir}/${darcula.jar}"/>	498	<pathelement location="${lib.dir}/${darcula.jar}"/>
497	<pathelement location="${lib.dir}/${dnsjava.jar}"/>	499	<pathelement location="${lib.dir}/${dnsjava.jar}"/>
498	<pathelement location="${lib.dir}/${freemarker.jar}"/>	500	<pathelement location="${lib.dir}/${freemarker.jar}"/>
Lines 3368-3373 Link Here
3368	<process_jarfile jarname="commons-math3"/>	3370	<process_jarfile jarname="commons-math3"/>
3369	<process_jarfile jarname="commons-net"/>	3371	<process_jarfile jarname="commons-net"/>
3370	<process_jarfile jarname="commons-pool2"/>	3372	<process_jarfile jarname="commons-pool2"/>
		3373	<process_jarfile jarname="commons-text"/>
3371	<process_jarfile jarname="darcula"/>	3374	<process_jarfile jarname="darcula"/>
3372	<process_jarfile jarname="dnsjava"/>	3375	<process_jarfile jarname="dnsjava"/>
3373	<process_jarfile jarname="freemarker"/>	3376	<process_jarfile jarname="freemarker"/>