Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump logging libraries #1969

Merged
merged 7 commits into from
Dec 17, 2021
Merged

chore: bump logging libraries #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ec8409
chore: bump logging libraries
subotic Dec 16, 2021
4b15120
chore: bump scala
subotic Dec 16, 2021
13ba52d
chore: bump base Java container
subotic Dec 16, 2021
7e1f306
chore: bump akka
subotic Dec 16, 2021
1f4a2fb
Merge branch 'main' into wip/DEV-333-update-log4j
subotic Dec 16, 2021
4d3f023
Merge branch 'wip/DEV-333-update-log4j' of github.com:dasch-swiss/dsp…
subotic Dec 17, 2021
eeb3f10
chore: bump akka
subotic Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down
12 changes: 6 additions & 6 deletions third_party/dependencies.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions third_party/versions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down