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

Bump apache commons libraries to fix some known bugs

Browse Source 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
Andrew DeMaria
2017-02-19 21:01:07 -07:00
parent 370fbeb6b4
commit d12c790a0e
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/pom.xml
+2 -2
View File
@@ -346,12 +346,12 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId> <artifactId>commons-configuration2</artifactId>
<version>2.1</version> <version>2.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<version>1.9.2</version> <version>1.9.3</version>
<!-- commons-configuration2 requires during runtime --> <!-- commons-configuration2 requires during runtime -->
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java
+1 -2
View File
@@ -34,8 +34,7 @@ public class ApacheCommonsConfigurationService {
} }
Parameters params = new Parameters(); Parameters params = new Parameters();
PropertiesConfigurationLayout layout = new PropertiesConfigurationLayout(); PropertiesConfigurationLayout layout = new PropertiesConfigurationLayout();
// https://issues.apache.org/jira/browse/CONFIGURATION-644 layout.setHeaderComment(HEADER_COMMENT);
// layout.setHeaderComment(HEADER_COMMENT);
layout.setGlobalSeparator("="); layout.setGlobalSeparator("=");
builder = new FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration.class).configure( builder = new FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration.class).configure(
params.properties() params.properties()
libresonic-main/src/main/resources/log4j.properties
-13
View File
@@ -1,13 +0,0 @@
# Set root logger level to WARN and its only appender to A1.
log4j.rootLogger=WARN, A1
# A1 is set to be a ConsoleAppender.
log4j.appender.A1=org.apache.log4j.ConsoleAppender
# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=[%d{ISO8601}] %-5p %c - %m%n
# TODO remove this once https://issues.apache.org/jira/browse/CONFIGURATION-627 is fixed
log4j.logger.org.apache.commons.beanutils.FluentPropertyBeanIntrospector=ERROR, A1
log4j.additivity.org.apache.commons.beanutils.FluentPropertyBeanIntrospector=false