You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.6 KiB
52 lines
1.6 KiB
From c8933d155694ce37b1d4be59a744c8f7cbde6bb5 Mon Sep 17 00:00:00 2001
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Date: Mon, 1 Jul 2019 09:51:56 +0200
|
|
Subject: [PATCH 4/4] Use non-shaded HTTP wagon
|
|
|
|
---
|
|
apache-maven/pom.xml | 15 ---------------
|
|
pom.xml | 1 -
|
|
2 files changed, 16 deletions(-)
|
|
|
|
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
|
|
index 82e12a3..f02a45e 100644
|
|
--- a/apache-maven/pom.xml
|
|
+++ b/apache-maven/pom.xml
|
|
@@ -63,21 +63,6 @@ under the License.
|
|
<dependency>
|
|
<groupId>org.apache.maven.wagon</groupId>
|
|
<artifactId>wagon-http</artifactId>
|
|
- <classifier>shaded</classifier>
|
|
- <exclusions>
|
|
- <exclusion>
|
|
- <groupId>org.apache.httpcomponents</groupId>
|
|
- <artifactId>httpclient</artifactId>
|
|
- </exclusion>
|
|
- <exclusion>
|
|
- <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>
|
|
<!-- this is included in Wagon Http
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 44e287a..cdef69c 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -328,7 +328,6 @@ under the License.
|
|
<groupId>org.apache.maven.wagon</groupId>
|
|
<artifactId>wagon-http</artifactId>
|
|
<version>${wagonVersion}</version>
|
|
- <classifier>shaded</classifier>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>commons-logging</groupId>
|
|
--
|
|
2.24.1
|
|
|