From d12c790a0e2f5f5897444c55ed8d52123d55c8fc Mon Sep 17 00:00:00 2001
From: Andrew DeMaria <lostonamountain@gmail.com>
Date: Sun, 19 Feb 2017 21:01:07 -0700
Subject: [PATCH] Bump apache commons libraries to fix some known bugs

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
---
 libresonic-main/pom.xml                             |  4 ++--
 .../service/ApacheCommonsConfigurationService.java  |  3 +--
 libresonic-main/src/main/resources/log4j.properties | 13 -------------
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 libresonic-main/src/main/resources/log4j.properties

diff --git a/libresonic-main/pom.xml b/libresonic-main/pom.xml
index d69ba727..ebed1392 100644
--- a/libresonic-main/pom.xml
+++ b/libresonic-main/pom.xml
@@ -346,12 +346,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-configuration2</artifactId>
-            <version>2.1</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.2</version>
+            <version>1.9.3</version>
             <!-- commons-configuration2 requires during runtime -->
             <scope>runtime</scope>
         </dependency>
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java b/libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java
index d797c0c6..771c2c74 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java
@@ -34,8 +34,7 @@ public class ApacheCommonsConfigurationService {
         }
         Parameters params = new Parameters();
         PropertiesConfigurationLayout layout = new PropertiesConfigurationLayout();
-        // https://issues.apache.org/jira/browse/CONFIGURATION-644
-//        layout.setHeaderComment(HEADER_COMMENT);
+        layout.setHeaderComment(HEADER_COMMENT);
         layout.setGlobalSeparator("=");
         builder = new FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration.class).configure(
                 params.properties()
diff --git a/libresonic-main/src/main/resources/log4j.properties b/libresonic-main/src/main/resources/log4j.properties
deleted file mode 100644
index a8078146..00000000
--- a/libresonic-main/src/main/resources/log4j.properties
+++ /dev/null
@@ -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