From e18edfe1610f09990f8f2ffa19ce2ff73fc68ebe Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 16 Feb 2021 12:51:44 -0600
Subject: [PATCH] Exclude all apache httpcomponents

---
 app/build.gradle.kts              |  2 +-
 app/licenses.yml                  |  5 -----
 app/src/main/assets/licenses.json | 13 -------------
 deps_fdroid.txt                   |  1 -
 deps_googleplay.txt               |  1 -
 5 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e6552d33e..067ca175c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -132,7 +132,7 @@ configure<CheckstyleExtension> {
 }
 
 configurations.all {
-    exclude(group = "org.apache.httpcomponents", module = "httpclient")
+    exclude(group = "org.apache.httpcomponents")
     exclude(group = "org.checkerframework")
     exclude(group = "com.google.code.findbugs")
     exclude(group = "com.google.errorprone")
diff --git a/app/licenses.yml b/app/licenses.yml
index 1eb7d54db..288d55ce9 100644
--- a/app/licenses.yml
+++ b/app/licenses.yml
@@ -540,11 +540,6 @@
   copyrightHolder: Android Open Source Project
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: org.apache.httpcomponents:httpcore:+
-  name: Apache HttpCore
-  copyrightHolder: The Apache Software Foundation
-  license: The Apache Software License, Version 2.0
-  url: http://hc.apache.org/httpcomponents-core-ga
 - artifact: androidx.databinding:viewbinding:+
   name: viewbinding
   copyrightHolder: Android Open Source Project
diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json
index 72c706a8c..6c0c8dc1f 100644
--- a/app/src/main/assets/licenses.json
+++ b/app/src/main/assets/licenses.json
@@ -1285,19 +1285,6 @@
       "normalizedLicense": "apache2",
       "libraryName": "databinding-runtime"
     },
-    {
-      "artifactId": {
-        "name": "httpcore",
-        "group": "org.apache.httpcomponents",
-        "version": "+"
-      },
-      "copyrightHolder": "The Apache Software Foundation",
-      "copyrightStatement": "Copyright &copy; The Apache Software Foundation. All rights reserved.",
-      "license": "The Apache Software License, Version 2.0",
-      "normalizedLicense": "apache2",
-      "url": "http://hc.apache.org/httpcomponents-core-ga",
-      "libraryName": "Apache HttpCore"
-    },
     {
       "artifactId": {
         "name": "viewbinding",
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index bbf86a1e3..da810c0f4 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -321,7 +321,6 @@
 +|    \--- com.google.api-client:google-api-client:1.31.1
 +|         +--- com.google.oauth-client:google-oauth-client:1.31.2
 +|         |    +--- com.google.http-client:google-http-client:1.38.0 -> 1.38.1
-+|         |    |    +--- org.apache.httpcomponents:httpcore:4.4.14
 +|         |    |    +--- com.google.guava:guava:30.1-android
 +|         |    |    |    +--- com.google.guava:failureaccess:1.0.1
 +|         |    |    |    \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 44c113a3c..5a6f17f94 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -452,7 +452,6 @@
 +|    \--- com.google.api-client:google-api-client:1.31.1
 +|         +--- com.google.oauth-client:google-oauth-client:1.31.2
 +|         |    +--- com.google.http-client:google-http-client:1.38.0 -> 1.38.1
-+|         |    |    +--- org.apache.httpcomponents:httpcore:4.4.14
 +|         |    |    +--- com.google.guava:guava:30.1-android
 +|         |    |    |    +--- com.google.guava:failureaccess:1.0.1
 +|         |    |    |    \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava