Skip to content

Commit 9f7daff

Browse files
committed
Fixed issue with of escape string not taking effect
1 parent 98496fd commit 9f7daff

5 files changed

Lines changed: 10 additions & 2 deletions

File tree

src/it/rpm-filter-scriptlet/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
</executions>
3333
<configuration>
3434
<group>Application/Collectors</group>
35+
<escapeString>\</escapeString>
3536
<preinstallScriptlet>
3637
<script>echo "installing ${project.artifactId}"</script>
3738
</preinstallScriptlet>

src/it/rpm-filter-scriptlet/verify.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ assert specFile.text.contains("PROJECT_NAME=rpm-filter-scriptlet")
88

99
// Test if the pre remove <scriptFile> was filtered
1010
assert specFile.text.contains("echo \"Erasing version 1.0\"")
11+
assert specFile.text.contains("echo \"Erasing version (escaped) \${project.version}\"")
1112

1213
// Test if the post remove <scriptFile> was found and filtered (located in a relative path)
1314
assert specFile.text.contains("echo \"Done erasing version 1.0\"")
15+
assert specFile.text.contains("echo \"Done erasing version (escaped) \${project.version}\"")
1416

1517
// Test if the trigger script was filtered
1618
assert specFile.text.contains("echo \"a filtered install trigger for rpm-filter-scriptlet\"")
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/sh
22

33
echo "Erasing version ${project.version}"
4+
echo "Erasing version (escaped) \${project.version}"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/sh
22

33
echo "Done erasing version ${project.version}"
4+
echo "Done erasing version (escaped) \${project.version}"

src/main/java/org/codehaus/mojo/rpm/AbstractRPMMojo.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,13 +850,16 @@ private void setDefaultWrappers()
850850
throws MojoExecutionException
851851
{
852852
final MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution();
853+
mavenResourcesExecution.setMavenProject( project );
854+
mavenResourcesExecution.setFilters( filters );
855+
mavenResourcesExecution.setEscapedBackslashesInFilePath( false );
856+
mavenResourcesExecution.setMavenSession( session );
853857
mavenResourcesExecution.setEscapeString( escapeString );
854858

855859
try
856860
{
857861
defaultFilterWrappers =
858-
mavenFileFilter.getDefaultFilterWrappers( project, filters, false, this.session,
859-
mavenResourcesExecution );
862+
mavenFileFilter.getDefaultFilterWrappers( mavenResourcesExecution );
860863
}
861864
catch ( MavenFilteringException e )
862865
{

0 commit comments

Comments
 (0)