This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 365ddd29a7 fix(deps): update dependency commons-io:commons-io to
v2.12.0
365ddd29a7 is described below
commit 365ddd29a7091eea59f3648d32895a349fb5bd80
Author: Renovate Bot <[email protected]>
AuthorDate: Wed May 17 15:50:10 2023 +0000
fix(deps): update dependency commons-io:commons-io to v2.12.0
Closes https://github.com/apache/jmeter/pull/5924
---
src/bom-thirdparty/build.gradle.kts | 2 +-
src/core/src/main/java/org/apache/jmeter/services/FileServer.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index 37e21d3991..6ceb04daf0 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
api("com.thoughtworks.xstream:xstream:1.4.20")
api("commons-codec:commons-codec:1.15")
api("commons-collections:commons-collections:3.2.2")
- api("commons-io:commons-io:2.11.0")
+ api("commons-io:commons-io:2.12.0")
api("commons-lang:commons-lang:2.6")
api("commons-logging:commons-logging:1.2")
api("commons-net:commons-net:3.9.0")
diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index c6db700e0a..3b7e94326d 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -423,6 +423,9 @@ public class FileServer {
if (!fileEntry.file.canRead() || !fileEntry.file.isFile()) {
throw new IllegalArgumentException("File "+
fileEntry.file.getName()+ " must exist and be readable");
}
+ // TODO: figure out the proper way to use BOMInputStream.builder()
+ // See https://issues.apache.org/jira/browse/IO-792
+ @SuppressWarnings("deprecation")
BOMInputStream fis = new
BOMInputStream(Files.newInputStream(fileEntry.file.toPath())); //NOSONAR
InputStreamReader isr = null;
// If file encoding is specified, read using that encoding, otherwise
use default platform encoding
