MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/983'

Browse Source
This commit is contained in:
Andrew DeMaria
2019-04-19 09:48:05 -06:00
parent d03b4dd963 ec4b969e2c
commit cddc2b2fa7
9 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
-1
View File
@@ -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");
airsonic-main/src/main/resources/applicationContext-cache.xml
+1 -1
View File
@@ -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"
airsonic-main/src/main/resources/applicationContext-service.xml
+1 -1
View File
@@ -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"
airsonic-main/src/main/resources/applicationContext-sonos.xml
+1 -1
View File
@@ -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"
airsonic-main/src/main/resources/servlet.xml
+1 -1
View File
@@ -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"
airsonic-main/src/main/webapp/WEB-INF/dwr.xml
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/sub.tld
+1 -1
View File
@@ -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"
airsonic-main/src/test/resources/applicationContext-mockSonos.xml
+1 -1
View File
@@ -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"
pom.xml
+2 -2
View File
@@ -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>
@@ -248,7 +248,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>