From 34d7fc45d8c50f924cbfb8ebd8adea37d32af21c Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@cloudera.com>
Date: Tue, 21 Jun 2022 15:17:00 +0100
Subject: [PATCH] HADOOP-18307. Remove hadoop-cos as a dependency of
 hadoop-cloud-storage.

Workaround for HADOOP-18159; this ensures that projects declaring
a dependency on hadoop-cloud-storage do _not_ have their s3 http
connections broken by an out of date mozilla/public-suffix-list.txt
resource on the classpath.

Contributed by Steve Loughran

Change-Id: Ib90d07f1ebe1ceaf91263e4d2aa09218e6d4e518
---
 .../hadoop-cloud-storage/pom.xml                         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
index 3d269e03636..895f3d901f2 100644
--- a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
@@ -128,10 +128,19 @@
       <artifactId>hadoop-openstack</artifactId>
       <scope>compile</scope>
     </dependency>
+<!--
+
+    This dependency has been cut from this release because
+    the cos library dependency broke the s3a client from interacting
+    with some AWS regions.
+    See HADOOP-18307.
+
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-cos</artifactId>
       <scope>compile</scope>
     </dependency>
+
+-->
   </dependencies>
 </project>