maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject [2/4] maven git commit: [MNG-6137] Clean up duplicate dependencies caused by incomplete Wagon HTTP Provider exclusions
Date Tue, 31 Jan 2017 21:30:20 GMT
[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.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/23b5fcff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/23b5fcff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/23b5fcff

Branch: refs/heads/MNG-2199-IT
Commit: 23b5fcffa75b89e5c3141be5269840d6cd70fe12
Parents: ce93bb4
Author: Michael Osipov <michaelo@apache.org>
Authored: Tue Jan 31 16:14:31 2017 +0100
Committer: Michael Osipov <michaelo@apache.org>
Committed: Tue Jan 31 16:14:31 2017 +0100

----------------------------------------------------------------------
 apache-maven/pom.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/23b5fcff/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ba7fda3..e7d5608 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -66,10 +66,6 @@ under the License.
       <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>
         </exclusion>
@@ -77,9 +73,19 @@ 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>
     </dependency>


Mime
View raw message