Skip to content

Fix #12774: skip consumer POM re-attachment on repeated task segments #12956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gnodet merged 1 commit into from
Aug 30, 2026
+58 −10
Merged

Fix #12774: skip consumer POM re-attachment on repeated task segments #12956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions ...in/java/org/apache/maven/internal/transformation/impl/ConsumerPomArtifactTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,22 @@ public void injectTransformedArtifacts(RepositorySystemSession session, MavenPro
return;
}
if (Features.consumerPom(session.getConfigProperties())) {
Path buildDir =
project.getBuild() != null ? Paths.get(project.getBuild().getDirectory()) : null;
if (buildDir != null) {
Files.createDirectories(buildDir);
}
Path consumer = buildDir != null
? Files.createTempFile(buildDir, CONSUMER_POM_CLASSIFIER + "-", ".pom")
: Files.createTempFile(CONSUMER_POM_CLASSIFIER + "-", ".pom");
deferDeleteFile(consumer);
boolean alreadyAttached = project.getAttachedArtifacts().stream()
.anyMatch(a -> CONSUMER_POM_CLASSIFIER.equals(a.getClassifier()) && "pom".equals(a.getType()));
if (!alreadyAttached) {
Path buildDir = project.getBuild() != null
? Paths.get(project.getBuild().getDirectory())
: null;
if (buildDir != null) {
Files.createDirectories(buildDir);
}
Path consumer = buildDir != null
? Files.createTempFile(buildDir, CONSUMER_POM_CLASSIFIER + "-", ".pom")
: Files.createTempFile(CONSUMER_POM_CLASSIFIER + "-", ".pom");
deferDeleteFile(consumer);

project.addAttachedArtifact(createConsumerPomArtifact(project, consumer, session));
project.addAttachedArtifact(createConsumerPomArtifact(project, consumer, session));
}
} else if (project.getModel().getDelegate().isRoot()) {
throw new IllegalStateException(
"The use of the root attribute on the model requires the buildconsumer feature to be active");
Expand Down
43 changes: 43 additions & 0 deletions ...ava/org/apache/maven/internal/transformation/impl/ConsumerPomArtifactTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import org.apache.maven.api.Constants;
import org.apache.maven.api.services.Sources;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.v4.MavenStaxReader;
import org.apache.maven.project.MavenProject;
Expand All @@ -39,6 +40,7 @@
import org.eclipse.aether.deployment.DeployRequest;
import org.eclipse.aether.installation.InstallRequest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Diff;
Expand Down Expand Up @@ -279,4 +281,45 @@ private DeployRequest createDeployRequestWithoutConsumerPom() {
request.setArtifacts(artifacts);
return request;
}

@Test
void injectTransformedArtifactsTwiceShouldNotDuplicate(@TempDir Path tempDir) throws IOException {
// Set up a minimal POM file
Path pomFile = tempDir.resolve("pom.xml");
Files.writeString(
pomFile,
"<project><modelVersion>4.0.0</modelVersion>"
+ "<groupId>test</groupId><artifactId>test</artifactId>"
+ "<version>1.0</version></project>");

// Create project with the POM file and a build directory
Model model = new Model();
model.setGroupId("test");
model.setArtifactId("test");
model.setVersion("1.0");
Build build = new Build();
build.setDirectory(tempDir.resolve("target").toString());
model.setBuild(build);
MavenProject project = new MavenProject(model);
project.setFile(pomFile.toFile());

// Mock session with consumer POM feature enabled (default for Maven 4)
RepositorySystemSession session = Mockito.mock(RepositorySystemSession.class);
SessionData sessionData = Mockito.mock(SessionData.class);
when(session.getData()).thenReturn(sessionData);
when(session.getConfigProperties()).thenReturn(Map.of());

ConsumerPomArtifactTransformer transformer =
new ConsumerPomArtifactTransformer((s, p, src) -> p.getModel().getDelegate());

// First invocation should attach the consumer POM
transformer.injectTransformedArtifacts(session, project);
assertEquals(1, project.getAttachedArtifacts().size());
assertEquals("consumer", project.getAttachedArtifacts().get(0).getClassifier());
assertEquals("pom", project.getAttachedArtifacts().get(0).getType());

// Second invocation should be a no-op (not duplicate the artifact)
transformer.injectTransformedArtifacts(session, project);
assertEquals(1, project.getAttachedArtifacts().size());
}
}
Loading