gnodet-bot commented on code in PR #13194: URL: https://github.com/apache/maven/pull/13194#discussion_r4050875030
########## its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh13192PomInlinerCiFriendlyPropertyTest.java: ########## @@ -0,0 +1,109 @@ +/* + * 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.it; + +import java.nio.file.Files; +import java.nio.file.Path; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Verifies that {@code PomInlinerTransformer} correctly inlines CI-friendly version properties + * (e.g. {@code ${revision}}) that are defined in the project's own {@code <properties>} section + * rather than being passed via {@code -Drevision=...} on the command line. + * + * <p>Prior to the fix, Maven 4 would throw + * {@code IllegalArgumentException: Cannot inline property revision} in legacy mode + * when {@code revision} was present only in POM properties.</p> + * + * @see <a href="https://github.com/apache/maven/issues/13192";>GH-13192</a> + */ +class MavenITgh13192PomInlinerCiFriendlyPropertyTest extends AbstractMavenIntegrationTestCase { + Review Comment: ⚠️ **NOT addressed — Missing version-range constructor (re-raised from previous review).** `AbstractMavenIntegrationTestCase` uses the constructor argument to gate the test to Maven versions where the feature exists. Without it, this test runs against Maven 3 builds where `PomInlinerTransformer` does not exist, causing spurious failures in CI. Convention from sibling tests (`MavenITgh13004ConsumerPomProfileArtifactIdTest`, `MavenITgh13068LegacyPluginDependenciesResolverTest` — both gate on `[4.0.0-rc-6,)` or `[4.0.0-rc-7,)`): ```suggestion class MavenITgh13192PomInlinerCiFriendlyPropertyTest extends AbstractMavenIntegrationTestCase { MavenITgh13192PomInlinerCiFriendlyPropertyTest() { super("[4.0.0-rc-7,)"); } ``` ########## impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/PomInlinerTransformer.java: ########## @@ -113,6 +120,12 @@ private Set<String> needsInlining(RepositorySystemSession session) { PomInlinerTransformer.class.getName() + ".needsInlining", ConcurrentHashMap::newKeySet); } + @SuppressWarnings("unchecked") + private Map<String, String> pomProperties(RepositorySystemSession session) { + return (Map<String, String>) session.getData() + .computeIfAbsent(PomInlinerTransformer.class.getName() + ".pomProperties", ConcurrentHashMap::new); Review Comment: ⚠️ **NOT addressed — Session-scoped `pomProperties` map conflates values across reactor projects (re-raised from previous review).** The map is keyed by property name only (e.g. `"revision"`), shared across the entire session. `injectTransformedArtifacts` is called once per project in the reactor. If two modules define the same property with different values — or if a build ever supports per-module CI-friendly versions — the last writer wins and `replacePom()` uses the wrong value for previously-processed projects. This doesn't bite the exact test case (all modules share `revision=1.0.0` via parent inheritance), but it is a design gap in the implementation. The simplest fix is to scope the key by the artifact's identity. Since `replacePom()` has access to the artifact (GAV is on `artifact.getGroupId()` + `artifact.getArtifactId()`), and `injectTransformedArtifacts` has access to `project`, you can key the map by `groupId:artifactId:property`: ```java // In injectTransformedArtifacts — when storing: pomProperties.put(project.getGroupId() + ":" + project.getArtifactId() + ":" + property, projectValue); // In replacePom — when retrieving (artifact GAV is available here): return pomProperties.get(artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + property); ``` This eliminates the cross-project collision without any structural change to the design. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
