From 8af09be85b2545b8631b93e43c9bb68f8608c105 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Sun, 1 Dec 2024 00:13:00 +0000 Subject: [PATCH 1/5] chore: Update zio-logging from 2.3.2 to 2.4.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index abf84db62c..f4a4dfd165 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,7 @@ object Dependencies { val TopbraidShaclVersion = "1.4.3" val ZioConfigVersion = "4.0.2" - val ZioLoggingVersion = "2.3.2" + val ZioLoggingVersion = "2.4.0" val ZioNioVersion = "2.0.2" val ZioMetricsConnectorsVersion = "2.3.1" val ZioPreludeVersion = "1.0.0-RC34" From 6f954d1ad253f810842bb43afbb7e3ad991ec18a Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Sun, 1 Dec 2024 00:13:01 +0000 Subject: [PATCH 2/5] chore: Update rdf4j-client from 5.0.3 to 5.1.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f4a4dfd165..b13e796364 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -25,7 +25,7 @@ object Dependencies { // topbraid/shacl is not yet compatible with jena 5 so we need to use jena 4 for now // see: https://github.com/TopQuadrant/shacl/pull/177 val JenaVersion = "4.10.0" - val Rdf4jVersion = "5.0.3" + val Rdf4jVersion = "5.1.0" val TopbraidShaclVersion = "1.4.3" val ZioConfigVersion = "4.0.2" From 016c49d2e207271c859de133202d2f8206ac9c95 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Sun, 1 Dec 2024 00:13:03 +0000 Subject: [PATCH 3/5] chore: Update wiremock from 3.9.2 to 3.10.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b13e796364..3c77ad50bc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -122,7 +122,7 @@ object Dependencies { val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" val testcontainers = "org.testcontainers" % "testcontainers" % "1.20.3" - val wiremock = "org.wiremock" % "wiremock" % "3.9.2" + val wiremock = "org.wiremock" % "wiremock" % "3.10.0" // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.17.0" From f33c63bee7ad8074d8c3d65d07c44398fcb67ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Thu, 19 Dec 2024 11:24:14 +0100 Subject: [PATCH 4/5] Revert upgrade of wiremock due to bug in 3.10.0 bug report: https://github.com/wiremock/wiremock/issues/2911 --- project/Dependencies.scala | 4 +++- .../domain/service/DspIngestClientLiveSpec.scala | 13 ++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6d4a2ea545..e99bd50243 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -122,7 +122,9 @@ object Dependencies { val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" val testcontainers = "org.testcontainers" % "testcontainers" % "1.20.4" - val wiremock = "org.wiremock" % "wiremock" % "3.10.0" + + // use version 3.9.2 until https://github.com/wiremock/wiremock/issues/2911 is fixed + val wiremock = "org.wiremock" % "wiremock" % "3.9.2" // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.17.0" diff --git a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/DspIngestClientLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/DspIngestClientLiveSpec.scala index 70f73df5f4..f801536b1e 100644 --- a/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/DspIngestClientLiveSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/slice/admin/domain/service/DspIngestClientLiveSpec.scala @@ -189,17 +189,12 @@ object HttpMockServer { val random: ULayer[TestPort] = ZLayer.fromZIO(Random.nextIntBetween(1000, 10_000).map(TestPort.apply)) } - private def acquireWireMockServer: ZIO[TestPort, Throwable, WireMockServer] = - ZIO.serviceWith[TestPort](_.value).flatMap { port => + val layer: ZLayer[Scope & TestPort, Throwable, WireMockServer] = + ZLayer.fromZIO(ZIO.acquireRelease(ZIO.serviceWithZIO[TestPort] { port => ZIO.attempt { - val server = new WireMockServer(options().port(port)); // No-args constructor will start on port 8080, no HTTPS + val server = new WireMockServer(options().port(port.value)) server.start() server } - } - - private def releaseWireMockServer(server: WireMockServer) = ZIO.attempt(server.stop()).logError.ignore - - val layer: ZLayer[Scope & TestPort, Throwable, WireMockServer] = - ZLayer.fromZIO(ZIO.acquireRelease(acquireWireMockServer)(releaseWireMockServer)) + })(server => ZIO.attempt(server.stop()).logError.orDie)) } From e41ed9aaaff57d2a246ba36fc2ad61201b4f7f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Thu, 19 Dec 2024 11:26:21 +0100 Subject: [PATCH 5/5] fmt --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e99bd50243..0f6f205bdd 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -124,7 +124,7 @@ object Dependencies { val testcontainers = "org.testcontainers" % "testcontainers" % "1.20.4" // use version 3.9.2 until https://github.com/wiremock/wiremock/issues/2911 is fixed - val wiremock = "org.wiremock" % "wiremock" % "3.9.2" + val wiremock = "org.wiremock" % "wiremock" % "3.9.2" // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.17.0"