fixes

Author: original-brownbear

distribution/tools/geoip-cli/build.gradle

@@ -18,5 +18,4 @@ dependencies {
   compileOnly project(":libs:elasticsearch-x-content")
   testImplementation project(":test:framework")
   testImplementation "org.apache.commons:commons-compress:1.26.1"
-  testImplementation "commons-io:commons-io:2.15.1"
 }

modules/ingest-attachment/build.gradle

@@ -80,7 +80,6 @@ dependencies {
   api "org.apache.tika:tika-parser-xmp-commons:${versions.tika}"
   api "org.apache.tika:tika-parser-zip-commons:${versions.tika}"
   api "org.tukaani:xz:${versions.xz}"
-  api "commons-io:commons-io:${versions.commonsIo}"
 
   // character set detection
   api "com.googlecode.juniversalchardet:juniversalchardet:${versions.juniversalchardet}"

plugins/repository-hdfs/build.gradle

@@ -43,7 +43,6 @@ dependencies {
   api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
   api 'commons-cli:commons-cli:1.2'
   api "commons-codec:commons-codec:${versions.commonscodec}"
-  api 'commons-io:commons-io:2.8.0'
   api 'org.apache.commons:commons-lang3:3.11'
   api 'javax.servlet:javax.servlet-api:3.1.0'
   api "org.slf4j:slf4j-api:${versions.slf4j}"

plugins/repository-hdfs/licenses/commons-io-LICENSE.txt

@@ -60,6 +60,7 @@ dependencies {
   // utilities
   api project(":libs:elasticsearch-cli")
   implementation 'com.carrotsearch:hppc:0.8.1'
+  api "commons-io:commons-io:2.15.1"
 
   // precentil ranks aggregation
   api 'org.hdrhistogram:HdrHistogram:2.1.9'

plugins/repository-hdfs/licenses/commons-io-NOTICE.txt

@@ -56,6 +56,7 @@
     requires org.apache.lucene.queryparser;
     requires org.apache.lucene.sandbox;
     requires org.apache.lucene.suggest;
+    requires org.apache.commons.io;
 
     exports org.elasticsearch;
     exports org.elasticsearch.action;

server/build.gradle

@@ -8,11 +8,11 @@
 
 package org.elasticsearch.common.compress;
 
+import org.apache.commons.io.input.UnsynchronizedBufferedInputStream;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.InputStreamStreamInput;
 import org.elasticsearch.common.io.stream.StreamInput;
 
-import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -26,7 +26,12 @@ public interface Compressor {
      */
     default StreamInput threadLocalStreamInput(InputStream in) throws IOException {
         // wrap stream in buffer since InputStreamStreamInput doesn't do any buffering itself but does a lot of small reads
-        return new InputStreamStreamInput(new BufferedInputStream(threadLocalInputStream(in), DeflateCompressor.BUFFER_SIZE));
+        return new InputStreamStreamInput(
+            UnsynchronizedBufferedInputStream.builder()
+                .setInputStream(threadLocalInputStream(in))
+                .setBufferSize(DeflateCompressor.BUFFER_SIZE)
+                .get()
+        );
     }
 
     /**

modules/ingest-attachment/licenses/commons-io-LICENSE.txt renamed to server/licenses/commons-io-LICENSE.txt

@@ -19,7 +19,6 @@ dependencies {
   implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
   implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
   implementation "org.apache.commons:commons-compress:1.26.1"
-  implementation "commons-io:commons-io:2.15.1"
   implementation "org.apache.commons:commons-lang3:${versions.commons_lang3}"
 }
 

modules/ingest-attachment/licenses/commons-io-NOTICE.txt renamed to server/licenses/commons-io-NOTICE.txt

@@ -91,7 +91,6 @@ dependencies {
   testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
 
   // Test dependencies for Kerberos (MiniKdc)
-  testImplementation('commons-io:commons-io:2.5')
   testImplementation('org.apache.kerby:kerb-simplekdc:1.1.1')
   testImplementation('org.apache.kerby:kerb-client:1.1.1')
   testImplementation('org.apache.kerby:kerby-config:1.1.1')