levels update

gradle update to newer version compatible with Java 11
avast · Mar 7, 2022 · e0239ac · e0239ac
1 parent 971ba05
commit e0239ac
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -81,6 +81,9 @@ dependencies {
     compile "org.slf4j:log4j-over-slf4j:${slf4jVersion}"
     compile "org.slf4j:jcl-over-slf4j:${slf4jVersion}"
     compile "ch.qos.logback:logback-classic:${logbackVersion}"
+
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
+
     compile("org.springframework.boot:spring-boot-starter:${springBootVersion}"){
         exclude group: 'log4j'
         exclude group: 'common-logging'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
@@ -4,4 +4,4 @@
 |  _  || | | )|  _)  `\__ \(______)`\__ \ |  _  ||  _)_ | |  _ | |  _
 | | | || |_) || |    ( )_) |       ( )_) || | | || (_( )| |_( )| |_( )
 (_) (_)(____/'(_)    `\____)       `\____)(_) (_)(____/'(____/'(____/'
-                                                   by Vity (2017-2019)
+                                                   by Vity (2017-2022)
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <include file="config/basic.xml"/>
+<!--    <include file="config/basic.xml"/>-->
 
     <property name="LOG_FILE_DIR" value="log/"/>
     <property name="LOG_FILE" value="${LOG_FILE_DIR}hdfs-shell"/>
 
-    <property name="FILE_LOG_PATTERN" value="%date{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%.-4level) - %cyan(%30.-30logger{30}) - %20.-20thread{30} - %message%n"/>
+    <property name="FILE_LOG_PATTERN" value="%date{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%.-5level) - %cyan(%30.-30logger{30}) - %20.-20thread{30} - %message%n"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
       <target>System.out</target>
       <encoder>
         <charset>UTF-8</charset>
-        <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%.-4level) - %cyan(%30.-30logger{30}) - %20.-20thread{30} - %message%n</pattern>
+        <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) - %cyan(%30.-30logger{30}) - [%10.-10thread{20}] - %message%n</pattern>
       </encoder>
     </appender>
     <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
       <target>System.err</target>
       <encoder>
         <charset>UTF-8</charset>
-        <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%.-4level) - %cyan(%30.-30logger{30}) - %20.-20thread{30} - %message%n</pattern>
+        <pattern>%date{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) - %cyan(%30.-30logger{30}) - [%10.-10thread{20}] - %message%n</pattern>
       </encoder>
     </appender>
 
@@ -33,15 +33,12 @@
       <appender-ref ref="STDOUT" />
     </appender>
 
-    <root level="${log_level:-INFO}">
+    <root level="${log_level:-WARN}">
         <appender-ref ref="ASYNC-SERVICE"/>
     </root>
 
 
-    <logger name="org.springframework" level="INFO"/>
-    <logger name="com.avast" level="DEBUG"/>
-    <logger name="com.avast.jmx" level="INFO"/>
-
-    <logger name="com.avast.server.wififinder.dao" level="INFO"/>
+    <logger name="org.springframework" level="WARN"/>
+    <logger name="com.avast" level="WARN"/>
 
 </configuration>