From 801cd605517c2e7979a5b03389ee14d6e1f7689c Mon Sep 17 00:00:00 2001
From: bvn13 <mail4bvn@gmail.com>
Date: Thu, 12 Sep 2019 20:48:12 +0300
Subject: [PATCH] upgrade dependencies

---
 pom.xml                                       | 30 +-------
 .../database/entities/ChannelSettings.java    |  1 -
 src/main/resources/logback-spring.xml         | 71 +++++++++++++++++++
 .../{logback.xml => logback.xml.old}          |  0
 4 files changed, 74 insertions(+), 28 deletions(-)
 create mode 100644 src/main/resources/logback-spring.xml
 rename src/main/resources/{logback.xml => logback.xml.old} (100%)

diff --git a/pom.xml b/pom.xml
index 14eb5ef..50f5bdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,19 +6,19 @@
 
     <groupId>ru.bvn13</groupId>
     <artifactId>jircbot</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <version>2.1.6.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
 
     <properties>
-        <bot.version>2.1.0</bot.version>
+        <bot.version>2.1.1</bot.version>
 
         <java.version>1.8</java.version>
 
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -135,13 +134,6 @@
             <version>1.11.2</version>
         </dependency>
 
-        <!--Google API-->
-        <dependency>
-            <groupId>com.google.apis</groupId>
-            <artifactId>google-api-services-customsearch</artifactId>
-            <version>v1-rev57-1.23.0</version>
-        </dependency>
-
         <!--Mapper-->
         <dependency>
             <groupId>org.modelmapper</groupId>
@@ -167,21 +159,6 @@
         </dependency>
 
         <!--logging-->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -201,7 +178,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.20</version>
         </dependency>
 
 
diff --git a/src/main/java/ru/bvn13/jircbot/database/entities/ChannelSettings.java b/src/main/java/ru/bvn13/jircbot/database/entities/ChannelSettings.java
index 0442ea6..d36fdfa 100644
--- a/src/main/java/ru/bvn13/jircbot/database/entities/ChannelSettings.java
+++ b/src/main/java/ru/bvn13/jircbot/database/entities/ChannelSettings.java
@@ -3,7 +3,6 @@ package ru.bvn13.jircbot.database.entities;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.annotation.Nullable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..44547e8
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <property name="LOGS" value="./logs" />
+
+    <appender name="Console"
+              class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="RollingFile"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOGS}/spring-boot-logger.log</file>
+        <encoder
+                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
+        </encoder>
+
+        <rollingPolicy
+                class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- rollover daily and when the file reaches 10 MegaBytes -->
+            <fileNamePattern>${LOGS}/archived/spring-boot-logger-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!-- LOG everything at INFO level -->
+    <root level="debug">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </root>
+
+    <!-- LOG spring -->
+    <logger name="org.springframework" level="error" additivity="false">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </logger>
+
+    <!-- LOG "com.bvn13*" at TRACE level -->
+    <logger name="ru.bvn13" level="debug" additivity="false">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </logger>
+
+    <!-- LOG "org.pircbotx.*" at TRACE level -->
+    <logger name="org.pircbotx" level="debug" additivity="false">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </logger>
+
+    <!-- LOG "org.pircbotx.PircBotX.*" at TRACE level -->
+    <logger name="org.pircbotx.PircBotX" level="warn" additivity="false">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </logger>
+
+    <!-- LOG "org.hibernate.*" at TRACE level -->
+    <logger name="org.hibernate" level="warn" additivity="false">
+        <appender-ref ref="RollingFile" />
+        <appender-ref ref="Console" />
+    </logger>
+
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml.old
similarity index 100%
rename from src/main/resources/logback.xml
rename to src/main/resources/logback.xml.old