Merge pull request #5339 from JabRef/fix-xjc-encoding

fix encoding issues in xjc code generation
JabRef · Sep 24, 2019 · caafef1 · caafef1
2 parents 9cc7ce7 + 1ab09a8
commit caafef1
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/buildSrc/src/main/groovy/org/jabref/build/xjc/XjcTask.groovy b/buildSrc/src/main/groovy/org/jabref/build/xjc/XjcTask.groovy
@@ -12,13 +12,14 @@ class XjcTask extends DefaultTask {
     private def bindingFile
     private def outputDirectory
     private String javaPackage
+    private String encoding
     @Optional
     private String arguments
 
     @TaskAction
     def generateClasses() {
         project.mkdir(outputDirectory)
-        project.ant.xjc(destdir: outputDirectory, package: javaPackage) {
+        project.ant.xjc(destdir: outputDirectory, package: javaPackage, encoding: getEncoding()) {
             schema(dir: schemaFile.getParent(), includes: schemaFile.getName())
             if (bindingFile != null) {
                 binding(dir: bindingFile.getParent(), includes: bindingFile.getName())
@@ -62,6 +63,19 @@ class XjcTask extends DefaultTask {
         updateOutput()
     }
 
+    String getEncoding() {
+        if(encoding == null ) {
+            // use UTF-8 as default encoding
+            return "UTF-8"
+        } else {
+            return encoding
+        }
+    }
+
+    void setEncoding(String encoding) {
+        this.encoding = encoding
+    }
+
     String getArguments() {
         return arguments
     }