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

master
Andrew DeMaria 6 years ago
commit cddc2b2fa7
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 1
      airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
  2. 2
      airsonic-main/src/main/resources/applicationContext-cache.xml
  3. 2
      airsonic-main/src/main/resources/applicationContext-service.xml
  4. 2
      airsonic-main/src/main/resources/applicationContext-sonos.xml
  5. 2
      airsonic-main/src/main/resources/servlet.xml
  6. 2
      airsonic-main/src/main/webapp/WEB-INF/dwr.xml
  7. 2
      airsonic-main/src/main/webapp/WEB-INF/sub.tld
  8. 2
      airsonic-main/src/test/resources/applicationContext-mockSonos.xml
  9. 4
      pom.xml

@ -41,7 +41,6 @@ import java.util.regex.Pattern;
*/ */
public final class StringUtil { public final class StringUtil {
public static final String ENCODING_LATIN = "ISO-8859-1";
public static final String ENCODING_UTF8 = "UTF-8"; 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"); private static final DateFormat ISO_8601_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");

@ -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" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

@ -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" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

@ -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" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxws="http://cxf.apache.org/jaxws"

@ -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" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

@ -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"> <!DOCTYPE dwr PUBLIC "-//GetAhead Limited//DTD Direct Web Remoting 3.0//EN" "http://getahead.org/dwr/dwr30.dtd">
<dwr> <dwr>

@ -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" <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

@ -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" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:jaxws="http://cxf.apache.org/jaxws"

@ -15,7 +15,7 @@
<properties> <properties>
<failOnDependencyWarning>true</failOnDependencyWarning> <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> <cxf.version>3.2.6</cxf.version>
<jackson.version>2.9.8</jackson.version> <jackson.version>2.9.8</jackson.version>
</properties> </properties>
@ -248,7 +248,7 @@
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
<encoding>ISO-8859-1</encoding> <encoding>UTF-8</encoding>
<verbose>false</verbose> <verbose>false</verbose>
<compilerVersion>1.8</compilerVersion> <compilerVersion>1.8</compilerVersion>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>

Loading…
Cancel
Save