[FLINK-23722][fs] Downgrade shaded hadoop to 3.2.2 to avoid HADOOP-17…

…771.

flink-filesystems/flink-azure-fs-hadoop/src/main/resources/META-INF/NOTICE

@@ -9,11 +9,10 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.fasterxml.jackson.core:jackson-annotations:2.12.1
 - com.fasterxml.jackson.core:jackson-core:2.12.1
 - com.fasterxml.jackson.core:jackson-databind:2.12.1
-- com.google.guava:guava:20.0
+- com.google.guava:guava:27.0-jre
 - commons-codec:commons-codec:1.13
 - commons-logging:commons-logging:1.1.3
-- org.apache.hadoop:hadoop-azure:3.3.1
-- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
+- org.apache.hadoop:hadoop-azure:3.2.2
 - org.apache.httpcomponents:httpclient:4.5.13
 - org.apache.httpcomponents:httpcore:4.4.14
 - org.codehaus.jackson:jackson-mapper-asl:1.9.13
@@ -25,4 +24,4 @@ This project bundles the following dependencies under the Apache Software Licens
 This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)
 
 - com.microsoft.azure:azure-keyvault-core:1.0.0
-- com.microsoft.azure:azure-storage:7.0.1
+- com.microsoft.azure:azure-storage:7.0.0

flink-filesystems/flink-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE

@@ -6,20 +6,13 @@ The Apache Software Foundation (http://www.apache.org/).
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- org.apache.hadoop:hadoop-annotations:3.3.1
-- org.apache.hadoop:hadoop-auth:3.3.1
-- org.apache.hadoop:hadoop-common:3.3.1
-- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
-- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
+- org.apache.hadoop:hadoop-annotations:3.2.2
+- org.apache.hadoop:hadoop-auth:3.2.2
+- org.apache.hadoop:hadoop-common:3.2.2
 - org.apache.htrace:htrace-core4:4.1.0-incubating
-- org.apache.kerby:kerb-core:1.0.1
-- org.apache.kerby:kerby-pkix:1.0.1
-- org.apache.kerby:kerby-asn1:1.0.1
-- org.apache.kerby:kerby-util:1.0.1
 - org.apache.commons:commons-configuration2:2.1.1
 - org.apache.commons:commons-lang3:3.3.2
 - org.apache.commons:commons-text:1.4
-- org.xerial.snappy:snappy-java:1.1.8.3
 - commons-lang:commons-lang:2.6
 - commons-collections:commons-collections:3.2.2
 - commons-io:commons-io:2.8.0
@@ -32,7 +25,7 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.fasterxml.jackson.core:jackson-annotations:2.12.1
 - com.fasterxml.jackson.core:jackson-core:2.12.1
 - com.fasterxml.jackson.core:jackson-databind:2.12.1
-- com.fasterxml.woodstox:woodstox-core:5.3.0
+- com.fasterxml.woodstox:woodstox-core:5.0.3
 
 This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)
 
@@ -52,9 +45,9 @@ See bundled license files for details.
 This project bundles the following dependencies under BSD License (https://opensource.org/licenses/bsd-license.php).
 See bundled license files for details.
 
-- org.codehaus.woodstox:stax2-api:4.2.1 (https://github.com/FasterXML/stax2-api/tree/stax2-api-4.2.1)
+- org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4)
 
-This project bundles org.apache.hadoop:*:3.3.1 from which it inherits the following notices:
+This project bundles org.apache.hadoop:*:3.2.2 from which it inherits the following notices:
 
 The Apache Hadoop project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these

flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE

@@ -13,7 +13,7 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.aliyun:aliyun-java-sdk-sts:3.0.0
 - commons-codec:commons-codec:1.13
 - commons-logging:commons-logging:1.1.3
-- org.apache.hadoop:hadoop-aliyun:3.3.1
+- org.apache.hadoop:hadoop-aliyun:3.2.2
 - org.apache.httpcomponents:httpclient:4.5.13
 - org.apache.httpcomponents:httpcore:4.4.14
 - org.codehaus.jettison:jettison:1.1

flink-filesystems/flink-s3-fs-hadoop/src/main/java/org/apache/flink/fs/s3hadoop/HadoopS3AccessHelper.java

@@ -30,13 +30,10 @@
 import com.amazonaws.services.s3.model.UploadPartRequest;
 import com.amazonaws.services.s3.model.UploadPartResult;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
-import org.apache.hadoop.fs.s3a.S3AInstrumentation;
 import org.apache.hadoop.fs.s3a.S3AUtils;
 import org.apache.hadoop.fs.s3a.WriteOperationHelper;
-import org.apache.hadoop.fs.s3a.statistics.impl.BondedS3AStatisticsContext;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -55,22 +52,8 @@ public class HadoopS3AccessHelper implements S3AccessHelper {
     private final InternalWriteOperationHelper s3accessHelper;
 
     public HadoopS3AccessHelper(S3AFileSystem s3a, Configuration conf) {
-        FileSystem.Statistics statistics = new FileSystem.Statistics(s3a.getScheme());
-        BondedS3AStatisticsContext statisticsContext =
-                new BondedS3AStatisticsContext(
-                        new BondedS3AStatisticsContext.S3AFSStatisticsSource() {
-                            public S3AInstrumentation getInstrumentation() {
-                                return s3a.getInstrumentation();
-                            }
-
-                            public FileSystem.Statistics getInstanceStatistics() {
-                                return statistics;
-                            }
-                        });
-
         this.s3accessHelper =
-                new InternalWriteOperationHelper(
-                        checkNotNull(s3a), checkNotNull(conf), statisticsContext);
+                new InternalWriteOperationHelper(checkNotNull(s3a), checkNotNull(conf));
         this.s3a = s3a;
     }
 
@@ -161,11 +144,8 @@ public ObjectMetadata getObjectMetadata(String key) throws IOException {
      */
     private static final class InternalWriteOperationHelper extends WriteOperationHelper {
 
-        InternalWriteOperationHelper(
-                S3AFileSystem owner,
-                Configuration conf,
-                BondedS3AStatisticsContext statisticsContext) {
-            super(owner, conf, statisticsContext);
+        InternalWriteOperationHelper(S3AFileSystem owner, Configuration conf) {
+            super(owner, conf);
         }
     }
 }

flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE

@@ -13,7 +13,7 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.fasterxml.jackson.core:jackson-core:2.12.1
 - com.fasterxml.jackson.core:jackson-databind:2.12.1
 - com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.1
-- com.fasterxml.woodstox:woodstox-core:5.3.0
+- com.fasterxml.woodstox:woodstox-core:5.0.3
 - com.google.guava:failureaccess:1.0
 - com.google.guava:guava:27.0-jre
 - com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
@@ -28,20 +28,15 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.commons:commons-configuration2:2.1.1
 - org.apache.commons:commons-lang3:3.3.2
 - org.apache.commons:commons-text:1.4
-- org.apache.hadoop:hadoop-auth:3.3.1
-- org.apache.hadoop:hadoop-annotations:3.3.1
-- org.apache.hadoop:hadoop-aws:3.3.1
-- org.apache.hadoop:hadoop-common:3.3.1
+- org.apache.hadoop:hadoop-auth:3.2.2
+- org.apache.hadoop:hadoop-annotations:3.2.2
+- org.apache.hadoop:hadoop-aws:3.2.2
+- org.apache.hadoop:hadoop-common:3.2.2
 - org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
 - org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
 - org.apache.htrace:htrace-core4:4.1.0-incubating
 - org.apache.httpcomponents:httpclient:4.5.13
 - org.apache.httpcomponents:httpcore:4.4.14
-- org.apache.kerby:kerb-core:1.0.1
-- org.apache.kerby:kerby-pkix:1.0.1
-- org.apache.kerby:kerby-asn1:1.0.1
-- org.apache.kerby:kerby-util:1.0.1
-- org.xerial.snappy:snappy-java:1.1.8.3
 - org.wildfly.openssl:wildfly-openssl:1.0.7.Final
 - software.amazon.ion:ion-java:1.0.2
 
@@ -68,4 +63,4 @@ See bundled license files for details.
 This project bundles the following dependencies under BSD License (https://opensource.org/licenses/bsd-license.php).
 See bundled license files for details.
 
-- org.codehaus.woodstox:stax2-api:4.2.1 (https://github.com/FasterXML/stax2-api/tree/stax2-api-4.2.1)
+- org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4)

flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE

@@ -27,7 +27,7 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.fasterxml.jackson.core:jackson-core:2.12.1
 - com.fasterxml.jackson.core:jackson-databind:2.12.1
 - com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.1
-- com.fasterxml.woodstox:woodstox-core:5.3.0
+- com.fasterxml.woodstox:woodstox-core:5.0.3
 - com.google.guava:guava:26.0-jre
 - com.google.inject:guice:4.2.2
 - com.facebook.airlift:configuration:0.201
@@ -49,11 +49,6 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.htrace:htrace-core4:4.1.0-incubating
 - org.apache.httpcomponents:httpclient:4.5.13
 - org.apache.httpcomponents:httpcore:4.4.14
-- org.apache.kerby:kerby-asn1:1.0.1
-- org.apache.kerby:kerb-core:1.0.1
-- org.apache.kerby:kerby-pkix:1.0.1
-- org.apache.kerby:kerby-util:1.0.1
-- org.xerial.snappy:snappy-java:1.1.8.3
 - org.weakref:jmxutils:1.19
 - org.wildfly.openssl:wildfly-openssl:1.0.7.Final
 - software.amazon.ion:ion-java:1.0.2
@@ -81,7 +76,7 @@ See bundled license files for details.
 This project bundles the following dependencies under BSD License (https://opensource.org/licenses/bsd-license.php).
 See bundled license files for details.
 
-- org.codehaus.woodstox:stax2-api:4.2.1 (https://github.com/FasterXML/stax2-api/tree/stax2-api-4.2.1)
+- org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4)
 
 This project bundles the following dependencies under the Public Domain.
 See bundled license files for details.

flink-filesystems/pom.xml

@@ -35,7 +35,7 @@ under the License.
 	<packaging>pom</packaging>
 
 	<properties>
-		<fs.hadoopshaded.version>3.3.1</fs.hadoopshaded.version>
+		<fs.hadoopshaded.version>3.2.2</fs.hadoopshaded.version>
 	</properties>
 
 	<modules>