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

(-)a/gradle.properties (-1 / +1 lines)
Lines 55-61 bsh.version=2.0b6 Link Here
55
caffeine.version=2.8.0
55
caffeine.version=2.8.0
56
cglib-nodep.version=3.2.12
56
cglib-nodep.version=3.2.12
57
commons-codec.version=1.14
57
commons-codec.version=1.14
58
commons-collections.version=3.2.2
58
commons-collections4.version=4.4
59
commons-dbcp2.version=2.7.0
59
commons-dbcp2.version=2.7.0
60
commons-io.version=2.6
60
commons-io.version=2.6
61
commons-jexl.version=2.1.1
61
commons-jexl.version=2.1.1
(-)a/src/bom/build.gradle.kts (-1 / +1 lines)
Lines 82-88 dependencies { Link Here
82
        apiv("com.sun.activation:javax.activation", "javax.activation")
82
        apiv("com.sun.activation:javax.activation", "javax.activation")
83
        apiv("com.thoughtworks.xstream:xstream")
83
        apiv("com.thoughtworks.xstream:xstream")
84
        apiv("commons-codec:commons-codec")
84
        apiv("commons-codec:commons-codec")
85
        apiv("commons-collections:commons-collections")
85
        apiv("org.apache.commons:commons-collections4")
86
        apiv("commons-io:commons-io")
86
        apiv("commons-io:commons-io")
87
        apiv("commons-lang:commons-lang")
87
        apiv("commons-lang:commons-lang")
88
        apiv("commons-net:commons-net")
88
        apiv("commons-net:commons-net")
(-)a/src/components/build.gradle.kts (-1 / +1 lines)
Lines 53-59 dependencies { Link Here
53
    implementation("org.jsoup:jsoup")
53
    implementation("org.jsoup:jsoup")
54
    implementation("org.apache.commons:commons-lang3")
54
    implementation("org.apache.commons:commons-lang3")
55
    implementation("net.sf.jtidy:jtidy")
55
    implementation("net.sf.jtidy:jtidy")
56
    implementation("commons-collections:commons-collections")
56
    implementation("org.apache.commons:commons-collections4")
57
    implementation("org.apache.commons:commons-math3")
57
    implementation("org.apache.commons:commons-math3")
58
    implementation("commons-io:commons-io") {
58
    implementation("commons-io:commons-io") {
59
        because("IOUtils")
59
        because("IOUtils")
(-)a/src/components/src/main/java/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (-7 / +5 lines)
Lines 35-40 import java.util.HashSet; Link Here
35
import java.util.List;
35
import java.util.List;
36
import java.util.Map;
36
import java.util.Map;
37
import java.util.Set;
37
import java.util.Set;
38
import java.util.concurrent.ArrayBlockingQueue;
38
import java.util.stream.Collectors;
39
import java.util.stream.Collectors;
39
40
40
import javax.swing.BorderFactory;
41
import javax.swing.BorderFactory;
Lines 59-68 import javax.swing.tree.TreeNode; Link Here
59
import javax.swing.tree.TreePath;
60
import javax.swing.tree.TreePath;
60
import javax.swing.tree.TreeSelectionModel;
61
import javax.swing.tree.TreeSelectionModel;
61
62
62
import org.apache.commons.collections.Buffer;
63
import org.apache.commons.collections4.EnumerationUtils;
63
import org.apache.commons.collections.EnumerationUtils;
64
import org.apache.commons.collections.buffer.CircularFifoBuffer;
65
import org.apache.commons.collections.buffer.UnboundedFifoBuffer;
66
import org.apache.commons.lang3.StringUtils;
64
import org.apache.commons.lang3.StringUtils;
67
import org.apache.jmeter.JMeter;
65
import org.apache.jmeter.JMeter;
68
import org.apache.jmeter.assertions.AssertionResult;
66
import org.apache.jmeter.assertions.AssertionResult;
Lines 129-135 implements ActionListener, TreeSelectionListener, Clearable, ItemListener { Link Here
129
    private Object resultsObject = null;
127
    private Object resultsObject = null;
130
    private TreeSelectionEvent lastSelectionEvent;
128
    private TreeSelectionEvent lastSelectionEvent;
131
    private JCheckBox autoScrollCB;
129
    private JCheckBox autoScrollCB;
132
    private Buffer buffer;
130
    private ArrayBlockingQueue buffer;
133
    private boolean dataChanged;
131
    private boolean dataChanged;
134
132
135
    /**
133
    /**
Lines 139-147 implements ActionListener, TreeSelectionListener, Clearable, ItemListener { Link Here
139
        super();
137
        super();
140
        final int maxResults = JMeterUtils.getPropDefault("view.results.tree.max_results", 500);
138
        final int maxResults = JMeterUtils.getPropDefault("view.results.tree.max_results", 500);
141
        if (maxResults > 0) {
139
        if (maxResults > 0) {
142
            buffer = new CircularFifoBuffer(maxResults);
140
            buffer = new ArrayBlockingQueue(maxResults);
143
        } else {
141
        } else {
144
            buffer = new UnboundedFifoBuffer();
142
            buffer = new ArrayBlockingQueue(0);
145
        }
143
        }
146
        init();
144
        init();
147
        new Timer(REFRESH_PERIOD, e -> updateGui()).start();
145
        new Timer(REFRESH_PERIOD, e -> updateGui()).start();
(-)a/src/core/build.gradle.kts (-1 / +1 lines)
Lines 78-84 dependencies { Link Here
78
    implementation("commons-codec:commons-codec") {
78
    implementation("commons-codec:commons-codec") {
79
        because("DigestUtils")
79
        because("DigestUtils")
80
    }
80
    }
81
    implementation("commons-collections:commons-collections")
81
    implementation("org.apache.commons:commons-collections4")
82
    implementation("org.apache.commons:commons-math3") {
82
    implementation("org.apache.commons:commons-math3") {
83
        because("Mean, DescriptiveStatistics")
83
        because("Mean, DescriptiveStatistics")
84
    }
84
    }
(-)a/src/core/src/main/java/org/apache/jmeter/gui/LoggerPanel.java (-6 / +4 lines)
Lines 19-24 package org.apache.jmeter.gui; Link Here
19
19
20
import java.awt.BorderLayout;
20
import java.awt.BorderLayout;
21
import java.awt.Insets;
21
import java.awt.Insets;
22
import java.util.concurrent.ArrayBlockingQueue;
22
23
23
import javax.swing.JPanel;
24
import javax.swing.JPanel;
24
import javax.swing.JScrollPane;
25
import javax.swing.JScrollPane;
Lines 26-34 import javax.swing.JTextArea; Link Here
26
import javax.swing.ScrollPaneConstants;
27
import javax.swing.ScrollPaneConstants;
27
import javax.swing.Timer;
28
import javax.swing.Timer;
28
29
29
import org.apache.commons.collections.Buffer;
30
import org.apache.commons.collections.buffer.CircularFifoBuffer;
31
import org.apache.commons.collections.buffer.UnboundedFifoBuffer;
32
import org.apache.jmeter.gui.logging.GuiLogEventListener;
30
import org.apache.jmeter.gui.logging.GuiLogEventListener;
33
import org.apache.jmeter.gui.logging.LogEventObject;
31
import org.apache.jmeter.gui.logging.LogEventObject;
34
import org.apache.jmeter.gui.util.JSyntaxTextArea;
32
import org.apache.jmeter.gui.util.JSyntaxTextArea;
Lines 57-63 public class LoggerPanel extends JPanel implements GuiLogEventListener { Link Here
57
    private static final int LOGGER_PANEL_REFRESH_PERIOD =
55
    private static final int LOGGER_PANEL_REFRESH_PERIOD =
58
            JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500); // $NON-NLS-1$
56
            JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500); // $NON-NLS-1$
59
57
60
    private final Buffer events;
58
    private final ArrayBlockingQueue events;
61
59
62
    private volatile boolean logChanged = false;
60
    private volatile boolean logChanged = false;
63
61
Lines 66-74 public class LoggerPanel extends JPanel implements GuiLogEventListener { Link Here
66
     */
64
     */
67
    public LoggerPanel() {
65
    public LoggerPanel() {
68
        if (LOGGER_PANEL_MAX_LINES > 0) {
66
        if (LOGGER_PANEL_MAX_LINES > 0) {
69
            events = new CircularFifoBuffer(LOGGER_PANEL_MAX_LINES);
67
            events = new ArrayBlockingQueue(LOGGER_PANEL_MAX_LINES);
70
        } else {
68
        } else {
71
            events = new UnboundedFifoBuffer();
69
            events = new ArrayBlockingQueue(0);
72
        }
70
        }
73
        textArea = init();
71
        textArea = init();
74
    }
72
    }
(-)a/src/core/src/main/java/org/apache/jmeter/save/CSVSaveService.java (-1 / +1 lines)
Lines 38-44 import java.util.List; Link Here
38
38
39
import javax.swing.table.DefaultTableModel;
39
import javax.swing.table.DefaultTableModel;
40
40
41
import org.apache.commons.collections.map.LinkedMap;
41
import org.apache.commons.collections4.map.LinkedMap;
42
import org.apache.commons.lang3.CharUtils;
42
import org.apache.commons.lang3.CharUtils;
43
import org.apache.commons.lang3.StringUtils;
43
import org.apache.commons.lang3.StringUtils;
44
import org.apache.jmeter.reporters.ResultCollector;
44
import org.apache.jmeter.reporters.ResultCollector;
(-)a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java (-1 / +1 lines)
Lines 33-39 import java.util.HashMap; Link Here
33
import java.util.Map;
33
import java.util.Map;
34
import java.util.concurrent.ThreadLocalRandom;
34
import java.util.concurrent.ThreadLocalRandom;
35
35
36
import org.apache.commons.collections.ArrayStack;
36
import org.apache.commons.collections4.ArrayStack;
37
import org.apache.commons.io.input.BOMInputStream;
37
import org.apache.commons.io.input.BOMInputStream;
38
import org.apache.jmeter.gui.JMeterFileFilter;
38
import org.apache.jmeter.gui.JMeterFileFilter;
39
import org.apache.jmeter.save.CSVSaveService;
39
import org.apache.jmeter.save.CSVSaveService;
(-)a/src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (-1 / +1 lines)
Lines 38-44 import java.util.ResourceBundle; Link Here
38
38
39
import javax.swing.JPopupMenu;
39
import javax.swing.JPopupMenu;
40
40
41
import org.apache.commons.collections.map.LRUMap;
41
import org.apache.commons.collections4.map.LRUMap;
42
import org.apache.jmeter.assertions.Assertion;
42
import org.apache.jmeter.assertions.Assertion;
43
import org.apache.jmeter.assertions.gui.AbstractAssertionGui;
43
import org.apache.jmeter.assertions.gui.AbstractAssertionGui;
44
import org.apache.jmeter.config.ConfigElement;
44
import org.apache.jmeter.config.ConfigElement;
(-)a/src/core/src/main/java/org/apache/jmeter/util/JSR223TestElement.java (-1 / +1 lines)
Lines 34-40 import javax.script.ScriptEngineManager; Link Here
34
import javax.script.ScriptException;
34
import javax.script.ScriptException;
35
35
36
import org.apache.commons.codec.digest.DigestUtils;
36
import org.apache.commons.codec.digest.DigestUtils;
37
import org.apache.commons.collections.map.LRUMap;
37
import org.apache.commons.collections4.map.LRUMap;
38
import org.apache.commons.lang3.StringUtils;
38
import org.apache.commons.lang3.StringUtils;
39
import org.apache.jmeter.samplers.SampleResult;
39
import org.apache.jmeter.samplers.SampleResult;
40
import org.apache.jmeter.samplers.Sampler;
40
import org.apache.jmeter.samplers.Sampler;
(-)a/src/dist/build.gradle.kts (-1 / +1 lines)
Lines 80-86 dependencies { Link Here
80
    buildDocs(platform(project(":src:bom")))
80
    buildDocs(platform(project(":src:bom")))
81
    buildDocs("org.apache.velocity:velocity")
81
    buildDocs("org.apache.velocity:velocity")
82
    buildDocs("commons-lang:commons-lang")
82
    buildDocs("commons-lang:commons-lang")
83
    buildDocs("commons-collections:commons-collections")
83
    buildDocs("org.apache.commons:commons-collections4")
84
    buildDocs("org.jdom:jdom")
84
    buildDocs("org.jdom:jdom")
85
}
85
}
86
86
(-)a/src/jorphan/build.gradle.kts (-1 / +1 lines)
Lines 22-28 dependencies { Link Here
22
    api("org.slf4j:slf4j-api")
22
    api("org.slf4j:slf4j-api")
23
23
24
    implementation("commons-io:commons-io")
24
    implementation("commons-io:commons-io")
25
    implementation("commons-collections:commons-collections")
25
    implementation("org.apache.commons:commons-collections4")
26
    implementation("org.apache.commons:commons-lang3")
26
    implementation("org.apache.commons:commons-lang3")
27
    implementation("org.apache.commons:commons-math3")
27
    implementation("org.apache.commons:commons-math3")
28
    implementation("org.apache.commons:commons-text")
28
    implementation("org.apache.commons:commons-text")
(-)a/src/jorphan/src/main/java/org/apache/jorphan/util/XMLBuffer.java (-1 / +1 lines)
Lines 17-23 Link Here
17
17
18
package org.apache.jorphan.util;
18
package org.apache.jorphan.util;
19
19
20
import org.apache.commons.collections.ArrayStack;
20
import org.apache.commons.collections4.ArrayStack;
21
21
22
// @see org.apache.jorphan.util.TestXMLBuffer for unit tests
22
// @see org.apache.jorphan.util.TestXMLBuffer for unit tests
23
23
(-)a/src/protocol/build.gradle.kts (-1 / +1 lines)
Lines 70-76 project("http") { Link Here
70
        implementation("org.jodd:jodd-lagarto")
70
        implementation("org.jodd:jodd-lagarto")
71
        implementation("org.jsoup:jsoup")
71
        implementation("org.jsoup:jsoup")
72
        implementation("oro:oro")
72
        implementation("oro:oro")
73
        implementation("commons-collections:commons-collections")
73
        implementation("org.apache.commons:commons-collections4")
74
        implementation("commons-net:commons-net")
74
        implementation("commons-net:commons-net")
75
        implementation("com.helger:ph-commons") {
75
        implementation("com.helger:ph-commons") {
76
            // We don't really need to use/distribute jsr305
76
            // We don't really need to use/distribute jsr305
(-)a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/CacheManager.java (-1 / +1 lines)
Lines 31-37 import java.util.List; Link Here
31
import java.util.Map;
31
import java.util.Map;
32
import java.util.Set;
32
import java.util.Set;
33
33
34
import org.apache.commons.collections.map.LRUMap;
34
import org.apache.commons.collections4.map.LRUMap;
35
import org.apache.commons.lang3.StringUtils;
35
import org.apache.commons.lang3.StringUtils;
36
import org.apache.commons.lang3.tuple.ImmutablePair;
36
import org.apache.commons.lang3.tuple.ImmutablePair;
37
import org.apache.commons.lang3.tuple.Pair;
37
import org.apache.commons.lang3.tuple.Pair;
(-)a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestCssParser.java (-1 / +1 lines)
Lines 27-33 import java.net.URL; Link Here
27
import java.nio.charset.StandardCharsets;
27
import java.nio.charset.StandardCharsets;
28
import java.util.List;
28
import java.util.List;
29
29
30
import org.apache.commons.collections.IteratorUtils;
30
import org.apache.commons.collections4.IteratorUtils;
31
import org.apache.jmeter.junit.JMeterTestCase;
31
import org.apache.jmeter.junit.JMeterTestCase;
32
import org.hamcrest.CoreMatchers;
32
import org.hamcrest.CoreMatchers;
33
import org.junit.jupiter.api.Test;
33
import org.junit.jupiter.api.Test;

Return to bug 63809