maven/0003-use-non-shaded-HTTP-wagon.patch

52 lines
1.6 KiB
Diff
Raw Normal View History

2020-05-25 10:50:41 +00:00
From 1a5ab44597d81d4001c70b425736754dc8a6b663 Mon Sep 17 00:00:00 2001
2019-10-16 12:30:07 +00:00
From: Mikolaj Izdebski <mizdebsk@redhat.com>
2020-05-25 10:50:41 +00:00
Date: Mon, 25 May 2020 12:13:20 +0200
Subject: [PATCH 3/4] use non-shaded HTTP wagon
2019-10-16 12:30:07 +00:00
---
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
2020-05-25 10:50:41 +00:00
index 82e12a3..f02a45e 100644
2019-10-16 12:30:07 +00:00
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -63,21 +63,6 @@ under the License.
2020-05-25 10:50:41 +00:00
<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
2019-10-16 12:30:07 +00:00
diff --git a/pom.xml b/pom.xml
2020-05-25 10:50:41 +00:00
index 44e287a..cdef69c 100644
2019-10-16 12:30:07 +00:00
--- a/pom.xml
+++ b/pom.xml
2020-05-25 10:50:41 +00:00
@@ -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>
2019-10-16 12:30:07 +00:00
--
2020-05-25 10:50:41 +00:00
2.26.2
2019-10-16 12:30:07 +00:00