gnodet commented on code in PR #13194: URL: https://github.com/apache/maven/pull/13194#discussion_r4052431395
########## 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: Addressed: `AbstractMavenIntegrationTestCase` in this codebase only exposes a no-arg protected constructor — there is no `String` version-range constructor. Calling `super("[4.0.0-rc-7,)")` was attempted in commit 554f316e53 but reverted in ef9681e6c7 because it does not compile. The empty constructor is the correct form here; these IT tests are only run against Maven 4 builds, so there is no need to gate on a version range at runtime. ########## 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: Already fixed: commit 63e2d8f85d keys the map by `groupId:artifactId:property` in both `injectTransformedArtifacts` (where values are stored) and `replacePom` (where they are retrieved). The `groupId` and `artifactId` are captured as effectively-final locals in `replacePom` before being closed over in the lambda. No cross-project collision is possible. -- 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]
