gnodet commented on PR #12936: URL: https://github.com/apache/maven/pull/12936#issuecomment-5759750120
Fixed two issues that caused CI failures: **1. Unit test failures** (both `testBasedir` and `testBaseUri`): `StringVisitorModelInterpolatorTest` was missing a `@BeforeEach setUp()` that calls `super.setUp()`. The base class `AbstractModelInterpolatorTest.setUp()` initializes the `context` Properties (basedir, project.baseUri) used by those tests. `StringSearchModelInterpolatorTest` does this correctly; the new class was missing it. **2. Integration test failures** (`MavenITmng4590`, `MavenITmng4379`, `MavenITmng3586`, `MavenIT0085`): The backport accidentally brought in the `master` (4.x) versions of several files, removing the restricted-interpolation feature added in 3.10.0-rc-2: - `AbstractStringBasedModelInterpolator.java` — `FULL_EXTERNAL_INTERPOLATION_PROPERTY`, `restrictExternalModelInterpolation()`, `restrictToSafeExpressions()`, `isSafeExternalExpression()` were all removed - `DefaultModelBuilder.java` — sandboxed `ProfileActivationContext` for external models was removed - `ProfileActivationContext.java`, `PropertyProfileActivator.java`, `DefaultModelValidator.java` — associated code removed The ITs check that without `-Dmaven.model.dependencyInterpolation.full=true` the build fails on system-path expressions — this was the correct 3.10.x behavior. By removing the restriction, those builds were succeeding when they shouldn't. Fixed by restoring the 3.10.x versions of those files. The only functional change now is the intended NPE fix in `StringVisitorModelInterpolator.visit(Xpp3Dom)` (`&& val != null`) plus the new test class and test method. _Hermes Agent (Claude Sonnet 4.6) on behalf of Guillaume Nodet_ -- 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]
