apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-10-13 13:44:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Upgrade to Maven 4.0.0-beta-1 (#974)

Browse Source
This commit is contained in:
Guillaume Nodet
2024-05-03 21:10:04 +02:00
committed by GitHub
parent 8d5d25006a
commit 42b230c10c
41 changed files with 1047 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
integration-tests/pom.xml
View File

@@ -30,8 +30,8 @@
<name>Maven Daemon - Integration Tests</name>
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<mvnd.home>${project.basedir}/../dist/target/maven-mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
<preinstall.artifacts>org/apache/maven/surefire/surefire-providers/${surefire.version}
org/apache/maven/surefire/surefire-junit-platform/${surefire.version}
@@ -103,31 +103,16 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<rerunFailingTestsCount>4</rerunFailingTestsCount>
<systemPropertyVariables>
<mvnd.home>${mvnd.home}</mvnd.home>
<project.version>${project.version}</project.version>
<mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
<os.detected.name>${os.detected.name}</os.detected.name>
<os.detected.arch>${os.detected.arch}</os.detected.arch>
<mvnd.test.hostLocalMavenRepo>${settings.localRepository}</mvnd.test.hostLocalMavenRepo>
<preinstall.artifacts>${preinstall.artifacts}</preinstall.artifacts>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<id>default-test</id>
<phase>none</phase>
</execution>
<execution>
<id>mvn-39</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
<configuration>
<systemPropertyVariables>
<mvnd.home>${mvnd.home}</mvnd.home>
<project.version>${project.version}</project.version>
<mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
<os.detected.name>${os.detected.name}</os.detected.name>
<os.detected.arch>${os.detected.arch}</os.detected.arch>
<mvnd.test.hostLocalMavenRepo>${settings.localRepository}</mvnd.test.hostLocalMavenRepo>
<preinstall.artifacts>${preinstall.artifacts}</preinstall.artifacts>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

2
integration-tests/src/test/java/org/mvndaemon/mvnd/it/MaxHeapNativeIT.java
View File

@@ -30,8 +30,8 @@ import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.logging.slf4j.MvndSimpleLogger;
import org.slf4j.LoggerFactory;
import org.slf4j.impl.MvndSimpleLogger;
import org.slf4j.spi.LocationAwareLogger;
import static org.junit.jupiter.api.Assertions.assertTrue;

12
integration-tests/src/test/projects/daemon-crash/plugin/pom.xml
View File

@@ -43,4 +43,16 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>mvnd-its</goalPrefix>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
integration-tests/src/test/projects/exec-output/pom.xml
View File

@@ -34,7 +34,7 @@
<maven-install-plugin.version>3.1.0</maven-install-plugin.version>
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
<maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
</properties>
<build>

12
integration-tests/src/test/projects/extension-with-api/plugin/pom.xml
View File

@@ -60,4 +60,16 @@
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>mvnd-its</goalPrefix>
</configuration>
</plugin>
</plugins>
</build>
</project>

9
integration-tests/src/test/projects/invoker/pom.xml
View File

@@ -82,9 +82,16 @@
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>mvnd-its</goalPrefix>
</configuration>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.1</version>
<version>3.6.1</version>
<configuration>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>

2
integration-tests/src/test/projects/invoker/src/it/invoke-hello/verify.groovy
View File

@@ -21,4 +21,4 @@ Path helloPath = basePath.resolve('target/hello.txt')
assert Files.exists(helloPath)
assert helloPath.text.equals('Hello')
assert Files.readString(helloPath).equals('Hello')

12
integration-tests/src/test/projects/module-and-plugin/plugin/pom.xml
View File

@@ -43,4 +43,16 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>mvnd-its</goalPrefix>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
integration-tests/src/test/projects/type-description/pom.xml
View File

@@ -42,7 +42,7 @@
<tar.long.file.mode>gnu</tar.long.file.mode>
<!-- Quarkus Version -->
<quarkus.version>2.14.1.Final</quarkus.version>
<quarkus.version>3.10.0</quarkus.version>
<!-- Jandex -->
<jandex.version>3.0.3</jandex.version>

8
integration-tests/src/test/projects/type-description/server/src/main/java/org/mvndaemon/mvnd/test/type/description/server/domain/AbstractEntity.java
View File

@@ -15,10 +15,10 @@
*/
package org.mvndaemon.mvnd.test.type.description.server.domain;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.MappedSuperclass;
import java.io.Serializable;
/**

10
integration-tests/src/test/projects/type-description/server/src/main/java/org/mvndaemon/mvnd/test/type/description/server/domain/Image.java
View File

@@ -15,11 +15,11 @@
*/
package org.mvndaemon.mvnd.test.type.description.server.domain;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Lob;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import javax.sql.rowset.serial.SerialBlob;
import java.io.IOException;
import java.io.InputStream;