diff --git a/.gitignore b/.gitignore
index aee1dd39d..6bb2a06b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ build/
 /.metadata/
 /.packages
 /.dart_tool/
+logs/
+.DS_Store
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 655e57966..a9cd29d3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>11</java.version>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
     </properties>
 
     <dependencies>
diff --git a/src/integrationtest/log4j.properties b/src/integrationtest/log4j.properties
index d35b4c93b..1f9fd34d7 100644
--- a/src/integrationtest/log4j.properties
+++ b/src/integrationtest/log4j.properties
@@ -1,6 +1,26 @@
-log4j.rootCategory=INFO, Console
-log4j.category.org.asteriskjava.live=DEBUG
-
+# Define appenders
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.target=System.out
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d %c %p [%t] - %m\n
\ No newline at end of file
+log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n
+
+log4j.appender.File=org.apache.log4j.FileAppender
+log4j.appender.File.File=logs/trace.log
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n
+
+log4j.appender.Error=org.apache.log4j.FileAppender
+log4j.appender.Error.File=logs/error.log
+log4j.appender.Error.layout=org.apache.log4j.PatternLayout
+log4j.appender.Error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n
+
+# Root logger configuration
+log4j.rootLogger=TRACE, File, Console, Error
+
+# Hibernate logger configuration
+log4j.logger.org.hibernate=ERROR, Error
+log4j.additivity.org.hibernate=false
+
+# Log all SQL statements
+log4j.logger.org.hibernate.SQL=INFO, File
+log4j.additivity.org.hibernate.SQL=false
diff --git a/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java b/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java
index f01856574..987f743d0 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/asterisk/MeetmeRoom.java
@@ -50,8 +50,9 @@ public boolean addChannel(final Channel channel) {
                 this.channels.add(channel);
                 this.channelCount++;
                 newChannel = true;
-            } else
+            } else {
                 MeetmeRoom.logger.error("rejecting " + channel + " already in meetme."); //$NON-NLS-1$ //$NON-NLS-2$
+            }
             return newChannel;
         }
     }
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java b/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java
index 9147f06e7..6f0798947 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/core/AsteriskPBX.java
@@ -252,9 +252,9 @@ public void hangup(final Channel channel) throws PBXException {
                 logger.error(e, e);
                 throw new PBXException(e);
             }
-        } else
+        } else {
             logger.debug("Suppressed hangup for " + channel + " as it was already hungup"); //$NON-NLS-1$ //$NON-NLS-2$
-
+        }
     }
 
     @Override
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java
index fd73f2fd8..e9427ba6a 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentManagerConnection.java
@@ -102,8 +102,9 @@ class CoherentManagerConnection implements FilteredManagerListener<ManagerEvent>
 
     public static synchronized void init()
             throws IllegalStateException, IOException, AuthenticationFailedException, TimeoutException, InterruptedException {
-        if (self != null)
+        if (self != null) {
             logger.warn("The CoherentManagerConnection has already been initialised");
+        }
         else {
             self = new CoherentManagerConnection();
             boolean done = false;
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java b/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java
index 46a1778bd..6e11a69cb 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/core/LiveChannelManager.java
@@ -257,10 +257,10 @@ public void onManagerEvent(ManagerEvent event) {
 
                 }
 
-            } else
+            } else {
                 logger.error("Either the clone or original channelProxy was missing during a masquerade: cloneIndex="
-                        + cloneIndex + " originalIndex=" + originalIndex);
-
+                    + cloneIndex + " originalIndex=" + originalIndex);
+            }
         }
         if (event instanceof RenameEvent) {
             RenameEvent rename = (RenameEvent) event;
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java b/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java
index f06e87020..ae60ef001 100644
--- a/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java
+++ b/src/main/java/org/asteriskjava/pbx/internal/core/Peer.java
@@ -125,9 +125,10 @@ public void handleEvent(final MasqueradeEvent b) {
                 clone.mergeCalls(original);
                 clone.setState(b.getCloneState());
                 this.evaluateState();
-            } else
+            } else {
                 logger.warn("When processing masquradeEvent we could not find the expected calls. event=" //$NON-NLS-1$
-                        + b.toString() + " original=" + original + " clone=" + clone); //$NON-NLS-1$ //$NON-NLS-2$
+                    + b.toString() + " original=" + original + " clone=" + clone); //$NON-NLS-1$ //$NON-NLS-2$
+            }
         }
     }
 
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
index d35b4c93b..1f9fd34d7 100644
--- a/src/test/resources/log4j.properties
+++ b/src/test/resources/log4j.properties
@@ -1,6 +1,26 @@
-log4j.rootCategory=INFO, Console
-log4j.category.org.asteriskjava.live=DEBUG
-
+# Define appenders
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.target=System.out
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d %c %p [%t] - %m\n
\ No newline at end of file
+log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n
+
+log4j.appender.File=org.apache.log4j.FileAppender
+log4j.appender.File.File=logs/trace.log
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n
+
+log4j.appender.Error=org.apache.log4j.FileAppender
+log4j.appender.Error.File=logs/error.log
+log4j.appender.Error.layout=org.apache.log4j.PatternLayout
+log4j.appender.Error.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} | [%t] | %-5p | %c{36}:%L | %m%n
+
+# Root logger configuration
+log4j.rootLogger=TRACE, File, Console, Error
+
+# Hibernate logger configuration
+log4j.logger.org.hibernate=ERROR, Error
+log4j.additivity.org.hibernate=false
+
+# Log all SQL statements
+log4j.logger.org.hibernate.SQL=INFO, File
+log4j.additivity.org.hibernate.SQL=false
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 757aa32de..4b3ea0fe5 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -1,10 +1,35 @@
 <configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} | [%thread] | %-5level | %logger{36}:%line | %msg%n</pattern>
         </encoder>
     </appender>
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
+
+    <appender name="File" class="ch.qos.logback.core.FileAppender">
+        <file>logs/trace.log</file>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} | [%thread] | %-5level | %logger{36}:%line | %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="Error" class="ch.qos.logback.core.FileAppender">
+        <file>logs/error.log</file>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} | [%thread] | %-5level | %logger{36}:%line | %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="TRACE">
+        <appender-ref ref="File"/>
+        <appender-ref ref="Console"/>
+        <appender-ref ref="Error"/>
     </root>
-</configuration>
\ No newline at end of file
+
+    <logger name="org.hibernate" level="ERROR" additivity="false">
+        <appender-ref ref="Error"/>
+    </logger>
+
+    <logger name="org.hibernate.SQL" level="INFO" additivity="false">
+        <appender-ref ref="File"/>
+    </logger>
+</configuration>