Skip to content
Permalink
Browse files
chore: bump logging libraries (DEV-333) (#1969)
* chore: bump logging libraries
* chore: bump scala
* chore: bump base Java container
* chore: bump akka
  • Loading branch information
subotic committed Dec 17, 2021
1 parent b2c9204 commit f680c4ff3da0af844b96c7a6cde42e2deba0c87a
Showing with 11 additions and 11 deletions.
  1. +2 −2 WORKSPACE
  2. +6 −6 third_party/dependencies.bzl
  3. +2 −2 third_party/versions.bzl
  4. +1 −1 webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala
@@ -60,7 +60,7 @@ container_pull(
# get openjdk
container_pull(
name = "openjdk11",
digest = "sha256:07a404dc9d910d35d89f8c4ab31016162f820ebfd3ae88d2a10f9d4755b60364", # 5.11.2021
digest = "sha256:14605eb0f24ce726e13c4a85862325083dee3ab13da847b7af20d0df5966c176", # 29.11.2021
registry = "docker.io",
repository = "eclipse-temurin",
# tag = "11-jre-focal", # Ubuntu 20.04
@@ -104,7 +104,7 @@ http_archive(
# scala_config(scala_version = "2.11.12")
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")

scala_config(scala_version = "2.13.6")
scala_config(scala_version = "2.13.7")

# register default and our custom scala toolchain
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
@@ -49,12 +49,12 @@ def dependencies():
),

# Logging
"com.typesafe.scala-logging:scala-logging_2.13:3.9.3",
"ch.qos.logback:logback-classic:1.2.3",
"ch.qos.logback:logback-core:1.2.3",
"org.slf4j:log4j-over-slf4j:1.7.29",
"org.slf4j:jcl-over-slf4j:1.7.29",
"org.slf4j:slf4j-api:1.7.29",
"com.typesafe.scala-logging:scala-logging_2.13:3.9.4",
"ch.qos.logback:logback-classic:1.2.8",
"ch.qos.logback:logback-core:1.2.8",
"org.slf4j:log4j-over-slf4j:1.7.32",
"org.slf4j:jcl-over-slf4j:1.7.32",
"org.slf4j:slf4j-api:1.7.32",

# metrics
"io.kamon:kamon-core_2.13:2.1.5",
@@ -1,7 +1,7 @@
"""Primary location for setting Knora-API project wide versions"""

SCALA_VERSION = "2.13.5"
AKKA_VERSION = "2.6.5"
SCALA_VERSION = "2.13.7"
AKKA_VERSION = "2.6.17"
AKKA_HTTP_VERSION = "10.2.4"
JENA_VERSION = "3.14.0"
METRICS_VERSION = "4.0.1"
@@ -382,7 +382,7 @@ class KnoraSettingsImpl(config: Config, log: LoggingAdapter) extends Extension {

object KnoraSettings extends ExtensionId[KnoraSettingsImpl] with ExtensionIdProvider {

override def lookup(): KnoraSettings.type = KnoraSettings
override def lookup: KnoraSettings.type = KnoraSettings

override def createExtension(system: ExtendedActorSystem) =
new KnoraSettingsImpl(system.settings.config, akka.event.Logging(system, this.getClass))

0 comments on commit f680c4f

Please sign in to comment.