From 23b5fcffa75b89e5c3141be5269840d6cd70fe12 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Tue, 31 Jan 2017 16:14:31 +0100
Subject: [PATCH] [MNG-6137] Clean up duplicate dependencies caused by
 incomplete Wagon HTTP Provider exclusions

JCL over SLF4J has been added also as a runtime dependency because the
bundled HttpClient still uses Commons Logging and we want our version
of SLF4J enforced.
---
 apache-maven/pom.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ba7fda3943..e7d5608057 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -65,10 +65,6 @@ under the License.
       <artifactId>wagon-http</artifactId>
       <classifier>shaded</classifier>
       <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven.wagon</groupId>
-          <artifactId>wagon-http-shared4</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>
@@ -77,8 +73,18 @@ under the License.
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpcore</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-http-shared</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${slf4jVersion}</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>