You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/05/12 06:58:05 UTC
[maven-mvnd] 02/03: Fix distribution
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch build-cache
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 96649f347e71fa9939205352ab1fb659eaa01197
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri May 6 17:57:27 2022 +0200
Fix distribution
---
dist/pom.xml | 20 +++++++++++++++++++-
dist/src/main/provisio/maven-distro.xml | 10 +++++++++-
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dist/pom.xml b/dist/pom.xml
index ebf2641..22514d9 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -50,10 +50,28 @@
<dependency>
<groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId>
- <version>${maven.build.cache.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-http</artifactId>
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.extensions</groupId>
+ <artifactId>maven-build-cache-extension</artifactId>
+ <version>${maven.build.cache.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-http</artifactId>
+ <version>${maven.resolver.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
diff --git a/dist/src/main/provisio/maven-distro.xml b/dist/src/main/provisio/maven-distro.xml
index 5328206..f09e4ff 100644
--- a/dist/src/main/provisio/maven-distro.xml
+++ b/dist/src/main/provisio/maven-distro.xml
@@ -32,6 +32,7 @@
<artifact id="org.apache.maven.resolver:maven-resolver-spi"/>
<artifact id="org.apache.maven.resolver:maven-resolver-util"/>
<artifact id="org.apache.maven.resolver:maven-resolver-connector-basic"/>
+ <artifact id="org.apache.maven.resolver:maven-resolver-transport-http"/>
<artifact id="org.apache.maven.resolver:maven-resolver-transport-wagon"/>
</artifactSet>
@@ -58,10 +59,14 @@
<exclusion id="*:maven-resolver-impl"/>
<exclusion id="*:maven-resolver-provider"/>
<exclusion id="*:maven-resolver-spi"/>
+ <exclusion id="*:maven-resolver-transport-http"/>
<exclusion id="*:maven-resolver-util"/>
<exclusion id="*:maven-settings"/>
<exclusion id="*:maven-settings-builder"/>
<exclusion id="*:maven-shared-utils"/>
+ <exclusion id="*:wagon-http"/>
+ <exclusion id="*:wagon-http-shared"/>
+ <exclusion id="*:wagon-provider-api"/>
<exclusion id="*:org.eclipse.sisu.inject"/>
<exclusion id="*:org.eclipse.sisu.plexus"/>
<exclusion id="*:plexus-cipher"/>
@@ -76,7 +81,10 @@
</artifact>
<artifact id="org.mvndaemon.mvnd:mvnd-agent:${project.version}"/>
<artifact id="org.mvndaemon.mvnd:mvnd-helper-agent:${project.version}"/>
- <artifact id="org.apache.maven.extensions:maven-build-cache-extension:${maven.build.cache.version}"/>
+ <artifact id="org.apache.maven.extensions:maven-build-cache-extension">
+ <exclusion id="org.apache.maven.resolver:*"/>
+ <exclusion id="org.apache.maven.wagon:*"/>
+ </artifact>
</artifactSet>
<fileSet to="/">