Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ under the License.
</distributionManagement>

<properties>
<mavenVersion>4.0.0-rc-4</mavenVersion>
<mavenVersion>4.1.0-SNAPSHOT</mavenVersion>
<javaVersion>17</javaVersion>

<guiceVersion>7.0.0</guiceVersion>
<mavenFilteringVersion>4.0.0-beta-1</mavenFilteringVersion>
<mavenFilteringVersion>4.0.0-beta-2-SNAPSHOT</mavenFilteringVersion>
<mavenPluginPluginVersion>4.0.0-beta-2</mavenPluginPluginVersion>
<mavenPluginTestingVersion>4.0.0-beta-4</mavenPluginTestingVersion>
<plexusBuildApiVersion>0.0.7</plexusBuildApiVersion>
Expand Down Expand Up @@ -139,11 +139,6 @@ under the License.
<artifactId>maven-filtering</artifactId>
<version>${mavenFilteringVersion}</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
<version>${plexusBuildApiVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
Expand Down
33 changes: 0 additions & 33 deletions src/main/java/org/apache/maven/plugins/resources/Providers.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.maven.api.ProjectScope;
import org.apache.maven.api.Session;
import org.apache.maven.api.SourceRoot;
import org.apache.maven.api.build.context.BuildContext;
import org.apache.maven.api.di.Inject;
import org.apache.maven.api.plugin.Log;
import org.apache.maven.api.plugin.MojoException;
Expand Down Expand Up @@ -291,10 +292,14 @@ public class ResourcesMojo implements org.apache.maven.api.plugin.Mojo {
@Inject
private Log logger;

@Inject
protected BuildContext buildContext;

/** {@inheritDoc} */
public void execute() throws MojoException {
if (isSkip()) {
getLog().info("Skipping the execution.");
buildContext.markSkipExecution();
return;
}
if (resources == null) {
Expand All @@ -303,6 +308,10 @@ public void execute() throws MojoException {
.map(ResourcesMojo::newResource)
.toList();
}

// Incremental build support is handled by maven-filtering:
// it registers inputs with the BuildContext, processes only changed files,
// and associates outputs for stale cleanup.
doExecute();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,22 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap;

import org.apache.maven.api.Project;
import org.apache.maven.api.build.context.BuildContext;
import org.apache.maven.api.di.Priority;
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.di.Singleton;
import org.apache.maven.api.plugin.testing.Basedir;
import org.apache.maven.api.plugin.testing.InjectMojo;
import org.apache.maven.api.plugin.testing.MojoTest;
import org.apache.maven.api.plugin.testing.stubs.SessionMock;
import org.apache.maven.api.services.PathMatcherFactory;
import org.apache.maven.impl.DefaultPathMatcherFactory;
import org.apache.maven.impl.InternalSession;
import org.apache.maven.internal.build.context.impl.DefaultBuildContext;
import org.apache.maven.internal.build.context.impl.FilesystemWorkspace;
import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
import org.apache.maven.shared.filtering.Resource;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -76,4 +83,19 @@ private static InternalSession getMockSession() {
private static Project createProject(ExtensionContext context) throws Exception {
return new MavenProjectResourcesStub();
}

@Provides
@Priority(10)
@SuppressWarnings("unused")
private static PathMatcherFactory pathMatcherFactory() {
return new DefaultPathMatcherFactory();
}

@Provides
@Priority(10)
@SuppressWarnings("unused")
private static BuildContext buildContext() {
return new DefaultBuildContext(
new FilesystemWorkspace(), null, new HashMap<>(), null, new DefaultPathMatcherFactory());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,25 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;

import org.apache.maven.api.Project;
import org.apache.maven.api.build.context.BuildContext;
import org.apache.maven.api.di.Priority;
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.di.Singleton;
import org.apache.maven.api.plugin.testing.Basedir;
import org.apache.maven.api.plugin.testing.InjectMojo;
import org.apache.maven.api.plugin.testing.MojoTest;
import org.apache.maven.api.plugin.testing.stubs.SessionMock;
import org.apache.maven.api.services.PathMatcherFactory;
import org.apache.maven.impl.DefaultPathMatcherFactory;
import org.apache.maven.impl.InternalSession;
import org.apache.maven.internal.build.context.impl.DefaultBuildContext;
import org.apache.maven.internal.build.context.impl.FilesystemWorkspace;
import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
import org.apache.maven.shared.filtering.Resource;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -630,6 +637,21 @@ private static Project createProject() throws Exception {
return new MavenProjectResourcesStub();
}

@Provides
@Priority(10)
@SuppressWarnings("unused")
private static PathMatcherFactory pathMatcherFactory() {
return new DefaultPathMatcherFactory();
}

@Provides
@Priority(10)
@SuppressWarnings("unused")
private static BuildContext buildContext() {
return new DefaultBuildContext(
new FilesystemWorkspace(), null, new HashMap<>(), null, new DefaultPathMatcherFactory());
}

static List<Resource> getResources(MavenProjectResourcesStub project) {
return project.getBuild().getResources().stream()
.map(ResourcesMojoTest::newResource)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,23 @@
import java.io.File;
import java.nio.file.Paths;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;

import org.apache.maven.api.Project;
import org.apache.maven.api.build.context.BuildContext;
import org.apache.maven.api.di.Priority;
import org.apache.maven.api.di.Provides;
import org.apache.maven.api.di.Singleton;
import org.apache.maven.api.plugin.testing.Basedir;
import org.apache.maven.api.plugin.testing.InjectMojo;
import org.apache.maven.api.plugin.testing.MojoTest;
import org.apache.maven.api.plugin.testing.stubs.SessionMock;
import org.apache.maven.api.services.PathMatcherFactory;
import org.apache.maven.impl.DefaultPathMatcherFactory;
import org.apache.maven.impl.InternalSession;
import org.apache.maven.internal.build.context.impl.DefaultBuildContext;
import org.apache.maven.internal.build.context.impl.FilesystemWorkspace;
import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
import org.apache.maven.shared.filtering.Resource;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -106,6 +113,21 @@ private static Project createProject() throws Exception {
return new MavenProjectResourcesStub();
}

@Provides
@Priority(10)
@SuppressWarnings("unused")
private static PathMatcherFactory pathMatcherFactory() {
return new DefaultPathMatcherFactory();
}

@Provides
@Priority(10)
@SuppressWarnings("unused")
private static BuildContext buildContext() {
return new DefaultBuildContext(
new FilesystemWorkspace(), null, new HashMap<>(), null, new DefaultPathMatcherFactory());
}

private static List<Resource> getResources(MavenProjectResourcesStub project) {
return ResourcesMojoTest.getResources(project);
}
Expand Down
Loading