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.

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

chore: Patch dependency updates #3284

Merged
merged 8 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.8.0
870d2491e283d5f6e329fa64ce0725f512dcadae

# Scala Steward: Reformat with scalafmt 3.8.2
318a790409a0dab067a060031cbc7c77ab2168e2
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.1"
version = "3.8.2"
runner.dialect = scala3
maxColumn = 120
align.preset = most
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class OntologyResponderV2Spec extends CoreSpec with ImplicitSender {
"<http://rdfh.ch/0001/a-thing>", // rdf:type anything:Thing
"<http://rdfh.ch/0001/a-blue-thing>", // rdf:type anything:BlueThing, a subclass of anything:Thing
"<http://www.knora.org/ontology/0001/something#Something>", // a subclass of anything:Thing in another ontology
"<http://www.knora.org/ontology/0001/something#hasOtherSomething>",// a subproperty of anything:hasOtherThing in another ontology
"<http://www.knora.org/ontology/0001/something#hasOtherSomething>", // a subproperty of anything:hasOtherThing in another ontology
)

expectedSubjects.forall(s => errorMsg.contains(s)) should ===(true)
Expand Down
11 changes: 7 additions & 4 deletions project/Dependencies.scala
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.11"
val Rdf4jVersion = "4.3.12"

val ZioConfigVersion = "4.0.2"
val ZioLoggingVersion = "2.3.0"
val ZioNioVersion = "2.0.2"
val ZioMetricsConnectorsVersion = "2.3.1"
val ZioPreludeVersion = "1.0.0-RC27"
val ZioSchemaVersion = "0.2.0"
val ZioVersion = "2.1.1"
val ZioVersion = "2.1.3"

// ZIO
val zio = "dev.zio" %% "zio" % ZioVersion
Expand Down Expand Up @@ -80,7 +80,10 @@ object Dependencies {
val jwtSprayJson = "com.github.jwt-scala" %% "jwt-zio-json" % "10.0.1"
// jwtSprayJson -> 9.0.2 is the latest version that's compatible with spray-json; if it wasn't for spray, this would be Scala 3 compatible
val springSecurityCore =
"org.springframework.security" % "spring-security-core" % "6.3.0" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
"org.springframework.security" % "spring-security-core" % "6.3.0" exclude (
"commons-logging",
"commons-logging",
) exclude ("org.springframework", "spring-aop")
val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.78.1"

// caching
Expand Down Expand Up @@ -112,7 +115,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.8"
val tapirVersion = "1.10.9"

val tapir = Seq(
"com.softwaremill.sttp.tapir" %% "tapir-pekko-http-server" % tapirVersion,
Expand Down
2 changes: 1 addition & 1 deletion webapi/src/main/scala/dsp/valueobjects/Iri.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object Iri {
val urlValidator =
new UrlValidator(
Array("http", "https"), // valid URL schemes
UrlValidator.ALLOW_LOCAL_URLS,// local URLs are URL-encoded IRIs as part of the whole URL
UrlValidator.ALLOW_LOCAL_URLS, // local URLs are URL-encoded IRIs as part of the whole URL
)

object KnoraInternal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1867,13 +1867,9 @@ final case class ResourcesResponderV2(
// find the version of resource which has a value with previousValueIri
versionDateAndPreviousVersion <-
ZIO
.fromOption(
allResourceVersions.find { case (_, resource) =>
resource.values.exists(item =>
item._1 == propertyIri && item._2.exists(value => value.valueIri == previousValueIri),
)
},
)
.fromOption(allResourceVersions.find { case (_, resource) =>
resource.values.get(propertyIri).exists(_.exists(_.valueIri == previousValueIri))
})
.orElseFail(NotFoundException(s"Could not find the previous value of ${currentVersionOfValue.valueIri}"))
(previousVersionDate, previousVersionOfResource) = versionDateAndPreviousVersion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ final case class CardinalityHandler(
// turn the propertyIri into a ReadPropertyInfoV2
.map(propertyIri => cacheData.ontologies(propertyIri.getOntologyFromEntity).properties(propertyIri))
.filter(_.isLinkProp) // we are only interested in link properties
.map(_.entityInfoContent.propertyIri),// turn whatever is left back to a propertyIri
.map(_.entityInfoContent.propertyIri), // turn whatever is left back to a propertyIri
)
.fold(e => throw e.head, v => v)

Expand Down Expand Up @@ -262,7 +262,7 @@ final case class CardinalityHandler(
// turn the propertyIri into a ReadPropertyInfoV2
.map(propertyIri => cacheData.ontologies(propertyIri.getOntologyFromEntity).properties(propertyIri))
.filter(_.isLinkProp) // we are only interested in link properties
.map(_.entityInfoContent.propertyIri),// turn whatever is left back to a propertyIri
.map(_.entityInfoContent.propertyIri), // turn whatever is left back to a propertyIri
)
.fold(e => throw e.head, v => v)

Expand Down
Loading