From ec78d7bc177cfaf43a9b06e08c78ee8ac40f470e Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Fri, 14 Dec 2012 15:37:27 +0100
Subject: [PATCH] honor per-file encoding (IDEA-97558 External build: Honor
 file-level encoding during maven resources processing)

---
 .../jetbrains/jps/maven/compiler/MavenResourcesBuilder.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
index f653c20fe96a..189d594b0b1a 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
@@ -19,6 +19,8 @@ import org.jetbrains.jps.incremental.messages.CompilerMessage;
 import org.jetbrains.jps.incremental.messages.ProgressMessage;
 import org.jetbrains.jps.maven.model.JpsMavenExtensionService;
 import org.jetbrains.jps.maven.model.impl.*;
+import org.jetbrains.jps.model.JpsEncodingConfigurationService;
+import org.jetbrains.jps.model.JpsEncodingProjectConfiguration;
 
 import java.io.*;
 import java.text.SimpleDateFormat;
@@ -49,7 +51,8 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
       return;
     }
     final Set<String> filteringExcludedExtensions = config.getFilteringExcludedExtensions();
-    final String encoding = context.getProjectDescriptor().getEncodingConfiguration().getPreferredModuleEncoding(target.getModule());
+    final JpsEncodingProjectConfiguration encodingConfig =
+      JpsEncodingConfigurationService.getInstance().getEncodingConfiguration(target.getModule().getProject());
     final Date timestamp = new Date();
 
     @Nullable
@@ -111,6 +114,7 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
       }
 
       private void copyWithFiltering(File file, File outputFile) throws IOException {
+        final String encoding = encodingConfig != null? encodingConfig.getEncoding(file) : null;
         PrintWriter writer;
         try {
           writer = encoding != null ? new PrintWriter(outputFile, encoding) : new PrintWriter(outputFile);