This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
The following commit(s) were added to refs/heads/master by this push:
new 193e7215 [ARCHETYPE-535] Merge profile properties even without
dependencies
193e7215 is described below
commit 193e7215d181c8d740fcbd9941695b36c5ff7ab7
Author: Arturo Bernal <[email protected]>
AuthorDate: Thu Oct 29 11:39:37 2026 +0100
[ARCHETYPE-535] Merge profile properties even without dependencies
DefaultPomManager.mergeModelBase() nested the properties putAll
inside the loop over generated dependencies, so properties on a
profile were silently dropped whenever that profile had no
dependencies to merge. Move the properties merge out of the loop
so it always runs.
Fixes #528
---
.../maven/archetype/common/DefaultPomManager.java | 8 ++++----
.../maven/archetype/common/TestPomManager.java | 23 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git
a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
index 611893a2..c24e8cc0 100644
---
a/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
+++
b/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
@@ -305,12 +305,12 @@ public class DefaultPomManager implements PomManager {
} else {
LOGGER.warn("Can not override property: " +
generatedDependencyId);
}
+ }
- // TODO: maybe warn, if a property key gets overridden?
- model.getProperties().putAll(generatedModel.getProperties());
+ // TODO: maybe warn, if a property key gets overridden?
+ model.getProperties().putAll(generatedModel.getProperties());
- // TODO: maybe merge more than just dependencies and properties...
- }
+ // TODO: maybe merge more than just dependencies and properties...
}
private void mergeReportPlugins(Model model, Model generatedModel) {
diff --git
a/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
b/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
index 57214539..2209f2a7 100644
---
a/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
+++
b/archetype-common/src/test/java/org/apache/maven/archetype/common/TestPomManager.java
@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
import org.apache.maven.archetype.exception.InvalidPackaging;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -109,6 +110,28 @@ public class TestPomManager {
assertEquals(java.util.Arrays.asList(artifactIds), actual);
}
+ @Test
+ public void
testMergePomsKeepsProfilePropertiesWithoutDependencies(@TempDir Path dir)
throws Exception {
+ Path existing = dir.resolve("pom.xml");
+ Path temporary = dir.resolve("generated.xml");
+ Files.write(
+ existing,
+
pom("<profiles><profile><id>sample</id></profile></profiles>").getBytes(StandardCharsets.UTF_8));
+ Files.write(
+ temporary,
+ pom("<profiles><profile><id>sample</id>"
+ +
"<properties><sample.property>value</sample.property></properties>"
+ + "</profile></profiles>")
+ .getBytes(StandardCharsets.UTF_8));
+
+ new DefaultPomManager().mergePoms(existing.toFile(),
temporary.toFile());
+
+ Model merged = new org.apache.maven.model.io.xpp3.MavenXpp3Reader()
+ .read(Files.newBufferedReader(existing,
StandardCharsets.UTF_8));
+ Profile mergedProfile = merged.getProfiles().get(0);
+ assertEquals("value",
mergedProfile.getProperties().getProperty("sample.property"));
+ }
+
private static String pom(String body) {
return "<project
xmlns=\"http://maven.apache.org/POM/4.0.0\"><modelVersion>4.0.0</modelVersion>"
+
"<groupId>g</groupId><artifactId>a</artifactId><version>1</version>" + body +
"</project>";