Render project .vm overrides with Velocity when useProjectFiles is set (#267) - #282
Open
elharo wants to merge 1 commit into
Open
Render project .vm overrides with Velocity when useProjectFiles is set (#267)#282elharo wants to merge 1 commit into
elharo wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #267
Problem
When
useProjectFilesis enabled, a resource override placed in the projectroot is copied verbatim via
FilteringUtils.copyFile, bypassing Velocityprocessing. Unlike
copyResourceIfExists,copyProjectRootIfExistsalso onlylooked for
<name>, never for the<name>.vmtemplate variant, so.vmoverrides were silently ignored and the bundle template was used instead.
Changes
copyProjectRootIfExistsnow mirrorscopyResourceIfExists:<name>and<name>.vmin the project root<name>.vmthrough Velocity (velocity.evaluate) with the bundle'ssource encoding, matching the behavior of bundle-resource templates
Tests
testUseProjectFilesRendersVelocityTemplate: writes a local<basedir>/FILTER.txt.vmcontaining$project.name, setsuseProjectFilesand asserts the output
FILTER.txtcontains the rendered project name.mvn verify(incl. spotless/checkstyle/RAT) passes.