commit 080a90f5f8d0df41df9e46b348c7ac678eb69085
author Stefan Seifert <stefanseifert@users.noreply.github.com> Thu Nov 26 17:10:29 2020 +0100
committer GitHub <noreply@github.com> Thu Nov 26 17:10:29 2020 +0100
tree 275c560dc1e426d0bedaeafd9928a6dd8a1dd055
parent 0352e3144fe3d5afb309571bfbc9ccd6b15d73cb

JCRVLT-477 make sure resourceEncoding property is respected in resource filtering (#45)

src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java

diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
index 062bd8f..61ebda2 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
@@ -55,7 +55,6 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProjectHelper;
-import org.apache.maven.shared.filtering.MavenFileFilter;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.apache.maven.shared.filtering.MavenResourcesExecution;
 import org.apache.maven.shared.filtering.MavenResourcesFiltering;
@@ -184,11 +183,6 @@
 
     /**
      */
-    @Component(role = MavenFileFilter.class, hint = "default")
-    private MavenFileFilter mavenFileFilter;
-
-    /**
-     */
     @Component(role = MavenResourcesFiltering.class, hint = "default") 
     MavenResourcesFiltering mavenResourcesFiltering;
 
@@ -352,6 +346,7 @@
 
     protected MavenResourcesExecution setupMavenResourcesExecution() {
         MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution();
+        mavenResourcesExecution.setEncoding(resourceEncoding);
         mavenResourcesExecution.setEscapeString(escapeString);
         mavenResourcesExecution.setSupportMultiLineFiltering(supportMultiLineFiltering);
         mavenResourcesExecution.setMavenProject(project);
@@ -396,6 +391,7 @@
             Map<String, File> embeddedFiles = getEmbeddedFilesMap();
 
             ContentPackageArchiver contentPackageArchiver = new ContentPackageArchiver();
+            contentPackageArchiver.setEncoding(resourceEncoding);
 
             // A map with key = relative file in zip and value = absolute source file name)
             Map<File, File> duplicateFiles = new HashMap<>();