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(deps): bump log4j to 2.17.0 (DEV-334) #1972

Merged
merged 11 commits into from
Dec 20, 2021
Merged

chore(deps): bump log4j to 2.17.0 (DEV-334) #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 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
1030677
chore(deps): bump log4j to 2.17.0
subotic Dec 18, 2021
e8a3664
Merge branch 'main' into wip/DEV-334-bump-jena
subotic Dec 18, 2021
5be1d58
chore(deps): bump Fuseki to 4.3.2 (log4j 2.16.0)
subotic Dec 20, 2021
5fce7de
Merge branch 'wip/DEV-334-bump-jena' of github.com:dasch-swiss/dsp-ap…
subotic Dec 20, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,4 @@ dependencies.txt
/.metals
/sipi/images/082E/*
/sipi/images/originals/082E/*
/dependencies.bzl
10 changes: 6 additions & 4 deletions third_party/dependencies.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def dependencies():
# e.g., to reference use: @maven//com_typesafe_akka_akka_actor_2_13
#
# ATTENTION: Transitive dependencies need to be explicitly added
# to query: bazel query @maven//:all --output=build
# to query: bazel query @maven//:all --output=build > dependencies.bzl
# or: bazel query @maven//:all | sort
#
maven_install(
Expand Down Expand Up @@ -50,11 +50,12 @@ def dependencies():

# Logging
"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",
"ch.qos.logback:logback-classic:1.2.9",
"ch.qos.logback:logback-core:1.2.9",
"org.slf4j:log4j-over-slf4j:1.7.32",
"org.slf4j:jcl-over-slf4j:1.7.32",
"org.slf4j:slf4j-api:1.7.32",
"org.apache.logging.log4j:log4j:2.17.0", # needed by apache-jena-libs. explicitly setting latest version (log4shell) to override the one used by jena.

# metrics
"io.kamon:kamon-core_2.13:2.1.5",
Expand Down Expand Up @@ -103,8 +104,9 @@ def dependencies():
# provides akka jackson (json) support
"de.heikoseeberger:akka-http-circe_2.13:1.36.0",
"com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.3",
"com.apicatalog:titanium-json-ld:0.8.5",
"javax.json:javax.json-api:1.1.4",
# TODO: DEV-335 upgrade titanium to 1.1.0 and jakarta-json to 2.0.1
"com.apicatalog:titanium-json-ld:0.8.5",
"org.glassfish:jakarta.json:1.1.6",

# swagger (api documentation)
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
Expand Up @@ -14,6 +14,6 @@ SIPI_IMAGE_DIGEST = "sha256:67a0e8c16a67914f2765a1c7906e781383b835cfe72cd19c763b

# Jena Fuseki - digest takes precedence!
FUSEKI_REPOSITORY = "daschswiss/apache-jena-fuseki"
FUSEKI_VERSION = "2.0.4" # contains Fuseki 4.3.1
FUSEKI_VERSION = "2.0.5" # contains Fuseki 4.3.2 (with log4j 2.16.0)
FUSEKI_IMAGE = FUSEKI_REPOSITORY
FUSEKI_IMAGE_DIGEST = "sha256:1987685b11048b00d69873d6eca6f36de32f66e41431f2b87906aa17473501b4"
FUSEKI_IMAGE_DIGEST = "sha256:224b044b0486d78df123507efa1579d17c8455cabc26111dc1848c2049f57700"