diff --git a/WORKSPACE b/WORKSPACE index 258ce2d8b5..f948654159 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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") diff --git a/third_party/dependencies.bzl b/third_party/dependencies.bzl index 6d059578bc..46b34fe335 100644 --- a/third_party/dependencies.bzl +++ b/third_party/dependencies.bzl @@ -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", diff --git a/third_party/versions.bzl b/third_party/versions.bzl index 66e0c730fd..e0aedffbdf 100644 --- a/third_party/versions.bzl +++ b/third_party/versions.bzl @@ -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" diff --git a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala index 8322f62a7d..410e657a0e 100644 --- a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala +++ b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala @@ -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))