Upgrade dependencies (#4705)

* Upgrade dependencies

* upgrade micropickle to 2.0.0

* Add .env file with FLYWAY_CLEAN_DISABLED=false to allow cleaning in test cases

* Fix logging pattern bug

* Add action to load .env file

* Add default flyway.conf at root of repository, disable flywayClean

* remove env action
This commit is contained in:
Chris Stewart 2022-09-05 07:11:23 -05:00 committed by GitHub
parent 2448fe13e8
commit 3ee4fe1138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 17 deletions

View File

@ -23,7 +23,7 @@
<totalSizeCap>5GB</totalSizeCap> <totalSizeCap>5GB</totalSizeCap>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>%date{yyyy-MM-dd'T'HH:mm:ss,SSXXX, UTC}UTC %level [%logger{0}] %msg%n</pattern> <pattern>%date{ISO8601,UTC}UTC %level [%logger{0}] %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>

View File

@ -15,14 +15,13 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- monthly rollover --> <!-- monthly rollover -->
<fileNamePattern>${bitcoins.log.location}/logs/bitcoin-s-%d{yyyy/MM}.%i.log.zip</fileNamePattern> <fileNamePattern>${bitcoins.log.location}/logs/bitcoin-s-%d{yyyy/MM}.%i.log.zip</fileNamePattern>
<!-- each file should be at most 100MB, keep 12 months of history, and at most 5GB in the archive --> <!-- each file should be at most 100MB, keep 12 months of history, and at most 5GB in the archive -->
<maxFileSize>100MB</maxFileSize> <maxFileSize>100MB</maxFileSize>
<maxHistory>12</maxHistory> <maxHistory>12</maxHistory>
<totalSizeCap>5GB</totalSizeCap> <totalSizeCap>5GB</totalSizeCap>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>%date{yyyy-MM-dd'T'HH:mm:ss,SSXXX, UTC}UTC %level [%logger{0}] %msg%n</pattern> <pattern>%date{ISO8601,UTC}UTC %level [%logger{0}] %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>

View File

@ -36,6 +36,7 @@ trait DbManagement extends Logging {
val conf = Flyway val conf = Flyway
.configure() .configure()
.locations(s"classpath:$driverName/$module/migration/") .locations(s"classpath:$driverName/$module/migration/")
.loadDefaultConfigurationFiles()
appConfig.schemaName match { appConfig.schemaName match {
case Some(schema) => case Some(schema) =>
conf conf

1
flyway.conf Normal file
View File

@ -0,0 +1 @@
flyway.cleanDisabled=false

View File

@ -5,25 +5,25 @@ object Deps {
object V { object V {
val bouncyCastle = "1.70" val bouncyCastle = "1.70"
val dropwizardMetricsV = "4.2.9" //https://github.com/dropwizard/metrics val dropwizardMetricsV = "4.2.11" //https://github.com/dropwizard/metrics
val logback = "1.2.11" val logback = "1.4.0" //https://github.com/qos-ch/logback
val log4jV = "1.2.17" val log4jV = "1.2.17"
val logkitV = "1.0.1" val logkitV = "1.0.1"
val avalonLoggingV = "4.1.5" val avalonLoggingV = "4.1.5"
val grizzledSlf4j = "1.3.4" val grizzledSlf4j = "1.3.4"
val scalacheck = "1.15.4" val scalacheck = "1.15.4"
val scalaTest = "3.2.13" val scalaTest = "3.2.13" //https://www.scalatest.org/
val scalaTestPlus = val scalaTestPlus =
"3.2.12.0-RC2" //super annoying... https://oss.sonatype.org/content/groups/public/org/scalatestplus/ "3.2.12.0-RC2" //super annoying... https://oss.sonatype.org/content/groups/public/org/scalatestplus/
val slf4j = "1.7.36" val slf4j = "2.0.0"
val spray = "1.3.6" val spray = "1.3.6"
val zeromq = "0.5.2" val zeromq = "0.5.2"
val scalapb = "0.11.10" val scalapb = "0.11.10"
val akkav = "10.2.9" val akkav = "10.2.9"
val playv = "2.9.2" val playv = "2.9.3" //https://github.com/playframework/play-json/releases
val akkaStreamv = "2.6.19" val akkaStreamv = "2.6.19"
val jUnixSocketV = "2.4.0" val jUnixSocketV = "2.4.0"
val scodecV = "1.1.30" val scodecV = "1.1.30"
@ -36,11 +36,11 @@ object Deps {
val asyncNewScalaV = "1.0.1" val asyncNewScalaV = "1.0.1"
val flywayV = "8.5.9" val flywayV = "9.2.1" //https://flywaydb.org/documentation/learnmore/releaseNotes
val postgresV = "42.3.4" val postgresV = "42.5.0" //https://jdbc.postgresql.org/
val akkaActorV = akkaStreamv val akkaActorV = akkaStreamv
val slickV = "3.3.3" val slickV = "3.3.3"
val sqliteV = "3.36.0.3" val sqliteV = "3.39.2.1" //https://github.com/xerial/sqlite-jdbc
val scalameterV = "0.17" val scalameterV = "0.17"
val scalamockV = "5.2.0" val scalamockV = "5.2.0"
@ -49,7 +49,7 @@ object Deps {
val breezeV = "1.3" val breezeV = "1.3"
val newMicroPickleV = "1.6.0" val newMicroPickleV = "2.0.0" //https://github.com/com-lihaoyi/upickle/
val newMicroJsonV = newMicroPickleV val newMicroJsonV = newMicroPickleV
val osgiFrameworkV = "1.10.0" val osgiFrameworkV = "1.10.0"
@ -67,9 +67,9 @@ object Deps {
val scalaJsStubsV = "1.1.0" val scalaJsStubsV = "1.1.0"
// CLI deps // CLI deps
val scoptV = "4.0.1" val scoptV = "4.1.0"
val sttpV = "3.6.1" val sttpV = "3.7.6" // https://github.com/softwaremill/sttp
val codehausV = "3.1.7" val codehausV = "3.1.8"
val scalaJsTimeV = "2.3.0" val scalaJsTimeV = "2.3.0"
val zxingV = "3.4.1" val zxingV = "3.4.1"

View File

@ -10,13 +10,13 @@
<file>logs/application.log</file> <file>logs/application.log</file>
<encoder> <encoder>
<!-- UTC ISO8601 date format --> <!-- UTC ISO8601 date format -->
<pattern>%date{yyyy-MM-dd'T'HH:mm:ss,SSXXX, UTC}UTC %level [%logger{0}] %msg%n</pattern> <pattern>%date{ISO8601,UTC} %level [%logger{0}] %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>%d{HH:mm:ss.SSS} %level %logger{0} - %msg%n</pattern> <pattern>%date{ISO8601,UTC}UTC %level %logger{0} - %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>