Skip to content

Commit

Permalink
change logging to tinylog; update java dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
swoellauer committed Dec 17, 2021
1 parent b8d38d7 commit d2fc04e
Show file tree
Hide file tree
Showing 246 changed files with 2,130 additions and 2,167 deletions.
26 changes: 12 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@ repositories {
}

dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.15.0'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.15.0'
implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j18-impl', version: '2.15.0' // needed for jetty logger

implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.2'
implementation group: 'org.tinylog', name: 'tinylog-impl', version: '2.4.1'
runtimeOnly group: 'org.tinylog', name: 'slf4j-tinylog', version: '2.4.1' // needed for jetty logger

implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.3'
implementation group: 'org.javassist', name: 'javassist', version: '3.28.0-GA'

implementation group: 'org.mapdb', name: 'mapdb', version: '1.0.9' // warning: newer versions v2 do break storage layout
Expand All @@ -62,16 +61,16 @@ dependencies {

implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'

implementation group: 'org.json', name: 'json', version: '20210307'
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.29'
implementation group: 'org.json', name: 'json', version: '20211205'
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.30'
implementation group: 'com.opencsv', name: 'opencsv', version: '4.6' // warning: API at v5.0 breaks
implementation group: 'org.ini4j', name: 'ini4j', version: '0.5.4'
implementation group: 'ar.com.hjg', name: 'pngj', version: '2.1.0'
implementation group: 'com.github.luben', name: 'zstd-jni', version: '1.5.0-1' // caution: newer versions may break storage layout (last tested 1.4.5-6)
implementation group: 'com.github.luben', name: 'zstd-jni', version: '1.5.0-5' // caution: newer versions may break storage layout (last tested 1.4.5-6)
implementation group: 'me.lemire.integercompression', name: 'JavaFastPFOR', version: '0.1.12' // caution: newer versions may break strorage layout

implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.4'
implementation group: 'org.eclipse.jetty', name: 'jetty-security', version: '11.0.4'
implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.7'
implementation group: 'org.eclipse.jetty', name: 'jetty-security', version: '11.0.7'

implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
Expand All @@ -81,8 +80,8 @@ dependencies {

implementation group: 'org.gdal', name: 'gdal', version: '2.2.0' // caution: newer versions may break compatibility

implementation group: 'org.influxdb', name: 'influxdb-java', version: '2.21'
implementation group: 'com.h2database', name: 'h2', version: '1.4.200'
implementation group: 'org.influxdb', name: 'influxdb-java', version: '2.22'
implementation group: 'com.h2database', name: 'h2', version: '2.0.202'
}

dependencies {
Expand All @@ -91,8 +90,7 @@ dependencies {
}

jar {
from file('src/log4j2.component.properties') // log4j system config
from file('src/log4j2.xml') // log4j logger config
from file('src/tinylog.properties')
from file('src/command_descriptions.yaml') // terminal command descriptions
destinationDirectory = project.layout.projectDirectory.dir('package')

Expand Down
20 changes: 20 additions & 0 deletions launch/TubeDB - dependencyUpdates.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.buildship.core.launch.runconfiguration">
<listAttribute key="arguments">
<listEntry value="--warning-mode"/>
<listEntry value="all"/>
</listAttribute>
<booleanAttribute key="build_scans_enabled" value="false"/>
<stringAttribute key="gradle_distribution" value="GRADLE_DISTRIBUTION(VERSION(7.0.1))"/>
<stringAttribute key="gradle_user_home" value=""/>
<stringAttribute key="java_home" value=""/>
<listAttribute key="jvm_arguments"/>
<booleanAttribute key="offline_mode" value="false"/>
<booleanAttribute key="override_workspace_settings" value="false"/>
<booleanAttribute key="show_console_view" value="true"/>
<booleanAttribute key="show_execution_view" value="true"/>
<listAttribute key="tasks">
<listEntry value="dependencyUpdates"/>
</listAttribute>
<stringAttribute key="working_dir" value="${workspace_loc:/tubedb}"/>
</launchConfiguration>
1 change: 0 additions & 1 deletion src/log4j2.component.properties

This file was deleted.

71 changes: 0 additions & 71 deletions src/log4j2.xml

This file was deleted.

33 changes: 33 additions & 0 deletions src/tinylog.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
writingthread = true

writerInfo = rolling file
writerInfo.level = info
writerInfo.format = {date} {level|min-size=5} {message|min-size=80} {class}.{method}({file}:{line})
writerInfo.file = log/log_{date}.txt
writerInfo.charset = UTF-8
writerInfo.buffered = true
writerInfo.policies = startup, daily: 03:00, size: 10mb
writerInfo.backups = 20

writerTrace = rolling file
writerTrace.level = trace
writerTrace.format = {date} {level|min-size=5} {message|min-size=80} {class}.{method}({file}:{line})
writerTrace.file = log/trace/trace_{date}.txt
writerTrace.charset = UTF-8
writerTrace.buffered = true
writerTrace.policies = startup, daily: 03:00, size: 10mb
writerTrace.backups = 20

writerWarn = rolling file
writerWarn.level = warn
writerWarn.format = {date} {level|min-size=5} {message|min-size=80} {class}.{method}({file}:{line})
writerWarn.file = log/warn/warn_{date}.txt
writerWarn.charset = UTF-8
writerWarn.buffered = true
writerWarn.policies = startup, daily: 03:00, size: 10mb
writerWarn.backups = 20

writerConsole = console
writerConsole.level = info
writerConsole.format = {level|min-size=5} {message|min-size=80} {class}.{method}({file}:{line})
writerConsole.stream = err@WARN
Loading

0 comments on commit d2fc04e

Please sign in to comment.