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: Patch dependency updates #3187

Merged
merged 7 commits into from
Apr 15, 2024
Merged

chore: Patch dependency updates #3187

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
38d38a9
chore: Update tapir-json-spray from 1.10.0 to 1.10.4
daschbot Apr 15, 2024
c562e12
chore: Update zio from 2.0.21 to 2.0.22
daschbot Apr 15, 2024
6e23241
chore: Update rdf4j-client from 4.3.10 to 4.3.11
daschbot Apr 15, 2024
1c558d5
chore: Update slf4j-api from 2.0.12 to 2.0.13
daschbot Apr 15, 2024
40fb7ec
Merge branch 'main' into update/patch
seakayone Apr 15, 2024
29b559e
fix compile
seakayone Apr 15, 2024
7b76401
Merge branch 'main' into update/patch
seakayone Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ object Dependencies {
val PekkoActorVersion = "1.0.2"
val PekkoHttpVersion = "1.0.1"
val JenaVersion = "5.0.0"
val Rdf4jVersion = "4.3.10"
val Rdf4jVersion = "4.3.11"

val ZioConfigVersion = "4.0.1"
val ZioLoggingVersion = "2.2.2"
val ZioNioVersion = "2.0.2"
val ZioMetricsConnectorsVersion = "2.3.1"
val ZioPreludeVersion = "1.0.0-RC23"
val ZioSchemaVersion = "0.2.0"
val ZioVersion = "2.0.21"
val ZioVersion = "2.0.22"

// ZIO - all Scala 3 compatible
val zio = "dev.zio" %% "zio" % ZioVersion
Expand Down Expand Up @@ -67,7 +67,7 @@ object Dependencies {

// logging
val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5" // Scala 3 compatible
val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.12" // the logging interface
val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.13" // the logging interface

// Metrics
val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.22"
Expand Down Expand Up @@ -116,7 +116,7 @@ object Dependencies {
// found/added by the plugin but deleted anyway
val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.14.0"

val tapirVersion = "1.10.0"
val tapirVersion = "1.10.4"

val tapir = Seq(
"com.softwaremill.sttp.tapir" %% "tapir-pekko-http-server" % tapirVersion,
Expand Down
3 changes: 2 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/slice/admin/domain/service/DspIngestClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ final case class DspIngestClientLive(
for {
importUrl <- ZIO.fromEither(URL.decode(s"${projectsPath(shortcode)}/import"))
token <- jwtService.createJwtForDspIngest()
body <- Body.fromFile(fileToImport.toFile)
request = Request
.post(importUrl, Body.fromFile(fileToImport.toFile))
.post(importUrl, body)
.addHeaders(
Headers(
Header.Authorization.Bearer(token.jwtString),
Expand Down