This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-4.0.x by this push:
new 55f964366e Detect an inline @InjectMojo POM by its leading '<'
(#13815) (#13915)
55f964366e is described below
commit 55f964366eb84f336fe6b2db0579c3655771ae7c
Author: Guillaume Nodet <[email protected]>
AuthorDate: Mon Nov 9 13:06:03 2026 +0100
Detect an inline @InjectMojo POM by its leading '<' (#13815) (#13915)
* Detect an inline @InjectMojo POM by its leading '<', not by '<project>'
* Use a namespaced root in the inline POM prolog test
* Write the inline test POMs as text blocks
Co-authored-by: Sylwester Lachiewicz <[email protected]>
---
.../apache/maven/testing/plugin/MojoExtension.java | 3 +-
.../plugin/testing/MojoExtensionInlinePomTest.java | 63 ++++++++++++++++++++++
2 files changed, 65 insertions(+), 1 deletion(-)
diff --git
a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
index 13e187fe28..7db9cf816e 100644
---
a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
+++
b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/MojoExtension.java
@@ -617,7 +617,8 @@ private Reader openPomUrl(Class<?> holder, String pom,
Path[] modelPath) throws
throw new IllegalStateException("Unable to find pom on
classpath: " + pom);
}
return new XmlStreamReader(url.openStream());
- } else if (pom.contains("<project>")) {
+ } else if (pom.stripLeading().startsWith("<")) {
+ // inline XML, with or without a prolog or a namespace on the root
element
return new StringReader(pom);
} else {
Path path = Paths.get(getBasedir()).resolve(pom);
diff --git
a/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionInlinePomTest.java
b/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionInlinePomTest.java
new file mode 100644
index 0000000000..bf5da5c04f
--- /dev/null
+++
b/impl/maven-testing/src/test/java/org/apache/maven/api/plugin/testing/MojoExtensionInlinePomTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.api.plugin.testing;
+
+import org.apache.maven.api.Project;
+import org.apache.maven.api.di.Inject;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@MojoTest
+class MojoExtensionInlinePomTest {
+
+ private static final String COORDINATES =
"test:test-plugin:0.0.1-SNAPSHOT:goal";
+
+ private static final String NAMESPACED_POM = """
+ <project xmlns="http://maven.apache.org/POM/4.0.0">
+ <groupId>customGroupId</groupId>
+ <artifactId>customArtifactId</artifactId>
+ <version>2.0</version>
+ </project>
+ """;
+
+ private static final String POM_WITH_PROLOG = """
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0">
+ <groupId>prologGroupId</groupId>
+ <artifactId>customArtifactId</artifactId>
+ <version>2.0</version>
+ </project>
+ """;
+
+ @Inject
+ Project project;
+
+ @Test
+ @InjectMojo(goal = COORDINATES, pom = NAMESPACED_POM)
+ void inlinePomWithNamespaceIsParsedInline() {
+ assertEquals("customGroupId", project.getModel().getGroupId());
+ }
+
+ @Test
+ @InjectMojo(goal = COORDINATES, pom = POM_WITH_PROLOG)
+ void inlinePomWithXmlPrologIsParsedInline() {
+ assertEquals("prologGroupId", project.getModel().getGroupId());
+ }
+}