From ec4b969e2c87f83cd1f8bbd62c4f0df97b5c7751 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 7 Apr 2019 09:27:22 +0200
Subject: [PATCH] Replace latin encoding with utf-8

---
 .../src/main/java/org/airsonic/player/util/StringUtil.java    | 1 -
 airsonic-main/src/main/resources/applicationContext-cache.xml | 2 +-
 .../src/main/resources/applicationContext-service.xml         | 2 +-
 airsonic-main/src/main/resources/applicationContext-sonos.xml | 2 +-
 airsonic-main/src/main/resources/servlet.xml                  | 2 +-
 airsonic-main/src/main/webapp/WEB-INF/dwr.xml                 | 2 +-
 airsonic-main/src/main/webapp/WEB-INF/sub.tld                 | 4 ++--
 .../src/test/resources/applicationContext-mockSonos.xml       | 2 +-
 pom.xml                                                       | 4 ++--
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
index 959510ca..17d30bd2 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
@@ -41,7 +41,6 @@ import java.util.regex.Pattern;
  */
 public final class StringUtil {
 
-    public static final String ENCODING_LATIN = "ISO-8859-1";
     public static final String ENCODING_UTF8 = "UTF-8";
     private static final DateFormat ISO_8601_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 
diff --git a/airsonic-main/src/main/resources/applicationContext-cache.xml b/airsonic-main/src/main/resources/applicationContext-cache.xml
index 3fb5806c..ae0ee30c 100644
--- a/airsonic-main/src/main/resources/applicationContext-cache.xml
+++ b/airsonic-main/src/main/resources/applicationContext-cache.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/airsonic-main/src/main/resources/applicationContext-service.xml b/airsonic-main/src/main/resources/applicationContext-service.xml
index 6d4b475e..482a32f8 100644
--- a/airsonic-main/src/main/resources/applicationContext-service.xml
+++ b/airsonic-main/src/main/resources/applicationContext-service.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/airsonic-main/src/main/resources/applicationContext-sonos.xml b/airsonic-main/src/main/resources/applicationContext-sonos.xml
index 0d5adfa6..53fdb67f 100644
--- a/airsonic-main/src/main/resources/applicationContext-sonos.xml
+++ b/airsonic-main/src/main/resources/applicationContext-sonos.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
diff --git a/airsonic-main/src/main/resources/servlet.xml b/airsonic-main/src/main/resources/servlet.xml
index 581620f2..a38c152d 100644
--- a/airsonic-main/src/main/resources/servlet.xml
+++ b/airsonic-main/src/main/resources/servlet.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/airsonic-main/src/main/webapp/WEB-INF/dwr.xml b/airsonic-main/src/main/webapp/WEB-INF/dwr.xml
index d19b38f3..1b89ea33 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/dwr.xml
+++ b/airsonic-main/src/main/webapp/WEB-INF/dwr.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dwr PUBLIC "-//GetAhead Limited//DTD Direct Web Remoting 3.0//EN" "http://getahead.org/dwr/dwr30.dtd">
 
 <dwr>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/sub.tld b/airsonic-main/src/main/webapp/WEB-INF/sub.tld
index 9d7f17d8..ce316ab8 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/sub.tld
+++ b/airsonic-main/src/main/webapp/WEB-INF/sub.tld
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -111,4 +111,4 @@
         </attribute>
     </tag>
 
-</taglib>
\ No newline at end of file
+</taglib>
diff --git a/airsonic-main/src/test/resources/applicationContext-mockSonos.xml b/airsonic-main/src/test/resources/applicationContext-mockSonos.xml
index dac835aa..49bd9202 100644
--- a/airsonic-main/src/test/resources/applicationContext-mockSonos.xml
+++ b/airsonic-main/src/test/resources/applicationContext-mockSonos.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
diff --git a/pom.xml b/pom.xml
index f036c1e5..ce1c584d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <failOnDependencyWarning>true</failOnDependencyWarning>
-        <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <cxf.version>3.2.6</cxf.version>
         <jackson.version>2.9.8</jackson.version>
     </properties>
@@ -242,7 +242,7 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
-                    <encoding>ISO-8859-1</encoding>
+                    <encoding>UTF-8</encoding>
                     <verbose>false</verbose>
                     <compilerVersion>1.8</compilerVersion>
                     <showWarnings>true</showWarnings>