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

Upgrade to Maven 4.0.0-beta-5 (#1187)

Browse Source
This commit is contained in:
Guillaume Nodet
2024-11-07 19:11:26 +01:00
committed by GitHub
parent 0a94aa1884
commit 72b7365e21
9 changed files with 15 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build-plugin/pom.xml
View File

@@ -54,6 +54,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<configuration> <configuration>
<requiredMavenVersion>${required-maven.version}</requiredMavenVersion>
<goalPrefix>mvnd-build</goalPrefix> <goalPrefix>mvnd-build</goalPrefix>
<mojoDependencies> <mojoDependencies>
<dep>org.apache.maven:maven-plugin-api</dep> <dep>org.apache.maven:maven-plugin-api</dep>

5
build-plugin/src/main/java/org/mvndaemon/mvnd/plugin/doc/DocMojo.java
View File

@@ -37,7 +37,6 @@ import java.util.TreeSet;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.Parameter;
@@ -73,10 +72,10 @@ public class DocMojo extends AbstractMojo {
boolean skip; boolean skip;
@Override @Override
@SuppressWarnings("deprecation")
public void execute() throws MojoExecutionException, MojoFailureException { public void execute() throws MojoExecutionException, MojoFailureException {
final Log log = getLog();
if (skip) { if (skip) {
log.info(getClass().getSimpleName() + " skipped per skip parameter"); getLog().info(getClass().getSimpleName() + " skipped per skip parameter");
return; return;
} }

4
client/pom.xml
View File

@@ -35,6 +35,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.daemon</groupId> <groupId>org.apache.maven.daemon</groupId>
<artifactId>mvnd-common</artifactId> <artifactId>mvnd-common</artifactId>

5
common/pom.xml
View File

@@ -55,11 +55,6 @@
<artifactId>junit-jupiter</artifactId> <artifactId>junit-jupiter</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

15
daemon/pom.xml
View File

@@ -70,20 +70,6 @@
<artifactId>takari-smart-builder</artifactId> <artifactId>takari-smart-builder</artifactId>
</dependency> </dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jline</groupId> <groupId>org.jline</groupId>
<artifactId>jline-terminal</artifactId> <artifactId>jline-terminal</artifactId>
@@ -97,6 +83,7 @@
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<classifier>classes</classifier>
</dependency> </dependency>
<dependency> <dependency>

1
dist/pom.xml vendored
View File

@@ -59,6 +59,7 @@
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<classifier>classes</classifier>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

5
integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java
View File

@@ -28,7 +28,6 @@ import java.util.Locale;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.apache.log4j.Logger;
import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback;
@@ -39,13 +38,15 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.common.DaemonRegistry; import org.mvndaemon.mvnd.common.DaemonRegistry;
import org.mvndaemon.mvnd.common.Environment; import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.TimeUtils; import org.mvndaemon.mvnd.common.TimeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.mvndaemon.mvnd.junit.TestParameters.TEST_MIN_THREADS; import static org.mvndaemon.mvnd.junit.TestParameters.TEST_MIN_THREADS;
import static org.mvndaemon.mvnd.junit.TestUtils.deleteDir; import static org.mvndaemon.mvnd.junit.TestUtils.deleteDir;
public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback { public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback {
private static final Logger LOG = Logger.getLogger(MvndTestExtension.class); private static final Logger LOG = LoggerFactory.getLogger(MvndTestExtension.class);
/** A placeholder to replace with a temporary directory outside of the current source tree */ /** A placeholder to replace with a temporary directory outside of the current source tree */
public static final String TEMP_EXTERNAL = "${temp.external}"; public static final String TEMP_EXTERNAL = "${temp.external}";

81
logging/pom.xml
View File

@@ -31,91 +31,10 @@
<name>Maven Daemon - Logging</name> <name>Maven Daemon - Logging</name>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-jline</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-logging</artifactId> <artifactId>maven-logging</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>extract</id>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.maven</groupId>
<artifactId>maven-slf4j-wrapper</artifactId>
<version>${maven.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<includes>org/apache/maven/logwrapper/*.java</includes>
<outputDirectory>${project.build.directory}/generated-sources/unpack</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-unpacked-source-dir</id>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/unpack</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>

4
pom.xml
View File

@@ -83,7 +83,8 @@
<groovy.version>4.0.23</groovy.version> <groovy.version>4.0.23</groovy.version>
<jansi.version>2.4.1</jansi.version> <jansi.version>2.4.1</jansi.version>
<jline.version>3.27.1</jline.version> <jline.version>3.27.1</jline.version>
<maven.version>4.0.0-beta-5-SNAPSHOT</maven.version> <maven.version>4.0.0-beta-5</maven.version>
<required-maven.version>3.9.9</required-maven.version>
<!-- Keep in sync with Maven --> <!-- Keep in sync with Maven -->
<maven.resolver.version>2.0.2</maven.resolver.version> <maven.resolver.version>2.0.2</maven.resolver.version>
@@ -306,6 +307,7 @@
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<version>6.0.0</version> <version>6.0.0</version>
<classifier>classes</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>