From 4390e095b7af348497cd26b2b01b4909285207f6 Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 08:50:43 +0200 Subject: [PATCH 1/8] update testcontainers --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a8a9bbcd5c..a51b030853 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -105,7 +105,7 @@ object Dependencies { val gatlingHighcharts = "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.8.4" val gatlingTestFramework = "io.gatling" % "gatling-test-framework" % "3.8.4" val scalaTest = "org.scalatest" %% "scalatest" % "3.2.13" // Scala 3 compatible - val testcontainers = "org.testcontainers" % "testcontainers" % "1.17.3" + val testcontainers = "org.testcontainers" % "testcontainers" % "1.17.5" // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.12.0" From e8cb57f4ab8c7ec5f60aa6b7b54a9794b96177a5 Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 08:53:30 +0200 Subject: [PATCH 2/8] update SBT --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 22af2628c4..563a014da4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 +sbt.version=1.7.2 From 55055768d1c5e10477a0ff029cc08349f28b978b Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 08:54:44 +0200 Subject: [PATCH 3/8] upgrade ZIO logging --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a51b030853..5457360fee 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -25,7 +25,7 @@ object Dependencies { val ZioJsonVersion = "0.3.0" val ZioConfigVersion = "3.0.2" val ZioSchemaVersion = "0.2.0" - val ZioLoggingVersion = "2.1.1" + val ZioLoggingVersion = "2.1.2" val ZioMetricsConnectorsVersion = "2.0.0" val ZioPreludeVersion = "1.0.0-RC16" From ccb63fb1ace9ae950025002a1099d83a95687f80 Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 08:56:39 +0200 Subject: [PATCH 4/8] update logback --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5457360fee..38975af635 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -58,7 +58,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.2" // the logging interface - val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.1" // the logging implementation + val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.3" // the logging implementation // Metrics val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.9.1" From 2a6efa58bb30e3ba8905a83a7fdf1358c768d4da Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 09:37:06 +0200 Subject: [PATCH 5/8] update slf4j --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 38975af635..5907488c59 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -57,7 +57,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.2" // the logging interface + val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.3" // the logging interface val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.4.3" // the logging implementation // Metrics From 9cfc5677e6ca70c4ccac40718b2e8bfefbbe2f4b Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:14:57 +0200 Subject: [PATCH 6/8] update rdf4j and fix arising issues --- project/Dependencies.scala | 4 ++-- .../messages/util/search/gravsearch/GravsearchParser.scala | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5907488c59..38b3ec1534 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -89,8 +89,8 @@ object Dependencies { val icu4j = "com.ibm.icu" % "icu4j" % "71.1" val jakartaJSON = "org.glassfish" % "jakarta.json" % "2.0.1" val jodd = "org.jodd" % "jodd" % "3.2.7" - val rdf4jClient = "org.eclipse.rdf4j" % "rdf4j-client" % "4.1.3" - val rdf4jShacl = "org.eclipse.rdf4j" % "rdf4j-shacl" % "4.1.3" + val rdf4jClient = "org.eclipse.rdf4j" % "rdf4j-client" % "4.2.0" + val rdf4jShacl = "org.eclipse.rdf4j" % "rdf4j-shacl" % "4.2.0" val saxonHE = "net.sf.saxon" % "Saxon-HE" % "11.4" val scalaGraph = "org.scala-graph" %% "graph-core" % "1.13.5" // Scala 3 incompatible val scallop = "org.rogach" %% "scallop" % "4.1.0" // Scala 3 compatible diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala index 7489be6907..6816f41b67 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParser.scala @@ -807,6 +807,9 @@ object GravsearchParser { // Successive statements are connected by Joins. node.visitChildren(this) + override def meet(node: algebra.AggregateFunctionCall): Unit = + unsupported(node) + override def meetOther(node: algebra.QueryModelNode): Unit = unsupported(node) } From a30c7dac6d1ac816b1f3d7bec670121b7abe5e04 Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:32:50 +0200 Subject: [PATCH 7/8] update scalaTest --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 38b3ec1534..00fe75be5e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -104,7 +104,7 @@ object Dependencies { val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % AkkaActorVersion // Scala 3 compatible val gatlingHighcharts = "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.8.4" val gatlingTestFramework = "io.gatling" % "gatling-test-framework" % "3.8.4" - val scalaTest = "org.scalatest" %% "scalatest" % "3.2.13" // Scala 3 compatible + val scalaTest = "org.scalatest" %% "scalatest" % "3.2.14" // Scala 3 compatible val testcontainers = "org.testcontainers" % "testcontainers" % "1.17.5" // found/added by the plugin but deleted anyway From 72965acd8044c9248d3738ca22e4d13aa303f3a2 Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Wed, 12 Oct 2022 11:09:22 +0200 Subject: [PATCH 8/8] update bcprov --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 00fe75be5e..6920bdcb36 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -74,7 +74,7 @@ object Dependencies { // 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" % "5.7.3" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop") - val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.71" + val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.72" // caching val ehcache = "net.sf.ehcache" % "ehcache" % "2.10.9.2"