mirror of
https://github.com/apache/maven-mvnd.git
synced 2025-10-14 14:10:52 +00:00
Cleanup (#650)
* Improve reproducibility of builds by using digest on docker images * Inline the manifest Multi-Release entry * Remove unused files * Switch the groupId to org.apache.maven.daemon and use maven parent pom * Fix distribution * Fix ITs * Fix native build for windows
This commit is contained in:
17
dist/pom.xml
vendored
17
dist/pom.xml
vendored
@@ -20,7 +20,7 @@
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.mvndaemon.mvnd</groupId>
|
||||
<groupId>org.apache.maven.daemon</groupId>
|
||||
<artifactId>mvnd</artifactId>
|
||||
<version>0.8.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
@@ -30,21 +30,26 @@
|
||||
<packaging>pom</packaging>
|
||||
<name>Maven Daemon - Distribution</name>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.mvndaemon.mvnd</groupId>
|
||||
<groupId>org.apache.maven.daemon</groupId>
|
||||
<artifactId>mvnd-agent</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mvndaemon.mvnd</groupId>
|
||||
<groupId>org.apache.maven.daemon</groupId>
|
||||
<artifactId>mvnd-helper-agent</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mvndaemon.mvnd</groupId>
|
||||
<groupId>org.apache.maven.daemon</groupId>
|
||||
<artifactId>mvnd-client</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mvndaemon.mvnd</groupId>
|
||||
<groupId>org.apache.maven.daemon</groupId>
|
||||
<artifactId>mvnd-daemon</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@@ -62,7 +67,7 @@
|
||||
<goal>provision</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</outputDirectory>
|
||||
<outputDirectory>${project.build.directory}/maven-mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
|
8
dist/src/main/provisio/maven-distro.xml
vendored
8
dist/src/main/provisio/maven-distro.xml
vendored
@@ -36,7 +36,7 @@
|
||||
</artifactSet>
|
||||
|
||||
<artifactSet to="/mvn/lib/ext">
|
||||
<artifact id="org.mvndaemon.mvnd:mvnd-daemon:${project.version}">
|
||||
<artifact id="org.apache.maven.daemon:mvnd-daemon:${project.version}">
|
||||
<exclusion id="org.codehaus.plexus:plexus-classworlds"/>
|
||||
<exclusion id="*:cdi-api"/>
|
||||
<exclusion id="*:commons-cli"/>
|
||||
@@ -71,11 +71,11 @@
|
||||
<exclusion id="*:plexus-utils"/>
|
||||
<exclusion id="*:plexus-container-default"/>
|
||||
</artifact>
|
||||
<artifact id="org.mvndaemon.mvnd:mvnd-client:${project.version}">
|
||||
<artifact id="org.apache.maven.daemon:mvnd-client:${project.version}">
|
||||
<exclusion id="*:*"/>
|
||||
</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.daemon:mvnd-agent:${project.version}"/>
|
||||
<artifact id="org.apache.maven.daemon:mvnd-helper-agent:${project.version}"/>
|
||||
</artifactSet>
|
||||
|
||||
<fileSet to="/">
|
||||
|
Reference in New Issue
Block a user