From 74eab0e2e24abad851e3b5334a7cece683e0b40b Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:11:21 +0000 Subject: [PATCH 01/12] chore: Update sbt-javaagent from 0.1.7 to 0.1.8 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index df8ff24e93..a4c33f2d21 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,7 +9,7 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2") addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.1") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3") -addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.7") +addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.8") // also update the scalac-scoverage-runtime version in build.sbt addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From c2a0819cd2f54f72c891f841d4b2de1063a1aefd Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:11:26 +0000 Subject: [PATCH 02/12] chore: Update tapir-json-spray from 1.7.6 to 1.8.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 15b5b4a6cc..6f12d9184a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -121,7 +121,7 @@ object Dependencies { // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.13.0" - val tapirVersion = "1.7.6" + val tapirVersion = "1.8.4" val tapir = Seq( "com.softwaremill.sttp.tapir" %% "tapir-pekko-http-server" % tapirVersion, From 77af59146725fb37ef8599d58b53d233ba2cf166 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:11:34 +0000 Subject: [PATCH 03/12] chore: Update tapir-refined from 1.2.13 to 1.8.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6f12d9184a..c478b156c8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -129,7 +129,7 @@ object Dependencies { "com.softwaremill.sttp.tapir" %% "tapir-json-zio" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-json-spray" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-swagger-ui-bundle" % tapirVersion, - "com.softwaremill.sttp.tapir" %% "tapir-refined" % "1.2.13" + "com.softwaremill.sttp.tapir" %% "tapir-refined" % "1.8.4" ) val metrics = Seq( "dev.zio" %% "zio-metrics-connectors" % ZioMetricsConnectorsVersion, From cb79efc7657cc86f6ed7b77d9ae1de172aab52e3 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:11:41 +0000 Subject: [PATCH 04/12] chore: Update jena-text from 4.8.0 to 4.9.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c478b156c8..c3014ed731 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -19,7 +19,7 @@ object Dependencies { val PekkoActorVersion = "1.0.1" val PekkoHttpVersion = "1.0.0" - val JenaVersion = "4.8.0" + val JenaVersion = "4.9.0" val ZioConfigVersion = "3.0.7" val ZioLoggingVersion = "2.1.14" From 059927eb8168ed5679f57fd8dcb55ac8879b6756 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:11:46 +0000 Subject: [PATCH 05/12] chore: Update jodd from 3.2.7 to 3.4.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c3014ed731..7c8126e7ba 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -95,7 +95,7 @@ object Dependencies { val gwtServlet = "com.google.gwt" % "gwt-servlet" % "2.10.0" val icu4j = "com.ibm.icu" % "icu4j" % "73.2" val jakartaJSON = "org.glassfish" % "jakarta.json" % "2.0.1" - val jodd = "org.jodd" % "jodd" % "3.2.7" + val jodd = "org.jodd" % "jodd" % "3.4.1" val rdf4jClient = "org.eclipse.rdf4j" % "rdf4j-client" % "4.3.7" val rdf4jShacl = "org.eclipse.rdf4j" % "rdf4j-shacl" % "4.3.7" val saxonHE = "net.sf.saxon" % "Saxon-HE" % "12.3" From 7ecc35bbe7eb8d7435e694d7495c8f0fe8898f83 Mon Sep 17 00:00:00 2001 From: DaSCH Bot <50987250+daschbot@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:11:51 +0000 Subject: [PATCH 06/12] chore: Update graph-core from 1.13.6 to 2.0.0 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7c8126e7ba..55e78d998e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -99,8 +99,8 @@ object Dependencies { val rdf4jClient = "org.eclipse.rdf4j" % "rdf4j-client" % "4.3.7" val rdf4jShacl = "org.eclipse.rdf4j" % "rdf4j-shacl" % "4.3.7" val saxonHE = "net.sf.saxon" % "Saxon-HE" % "12.3" - val scalaGraph = "org.scala-graph" %% "graph-core" % "1.13.6" // Scala 3 incompatible - val scallop = "org.rogach" %% "scallop" % "5.0.0" // Scala 3 compatible + val scalaGraph = "org.scala-graph" %% "graph-core" % "2.0.0" // Scala 3 incompatible + val scallop = "org.rogach" %% "scallop" % "5.0.0" // Scala 3 compatible val titaniumJSONLD = "com.apicatalog" % "titanium-json-ld" % "1.3.2" val xmlunitCore = "org.xmlunit" % "xmlunit-core" % "2.9.1" From c6d1e1d3306108a7752be92ff2eac2daf0c13b87 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Tue, 7 Nov 2023 10:04:26 +0100 Subject: [PATCH 07/12] keep old graph-core version --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 55e78d998e..b8fb330607 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -99,7 +99,7 @@ object Dependencies { val rdf4jClient = "org.eclipse.rdf4j" % "rdf4j-client" % "4.3.7" val rdf4jShacl = "org.eclipse.rdf4j" % "rdf4j-shacl" % "4.3.7" val saxonHE = "net.sf.saxon" % "Saxon-HE" % "12.3" - val scalaGraph = "org.scala-graph" %% "graph-core" % "2.0.0" // Scala 3 incompatible + val scalaGraph = "org.scala-graph" %% "graph-core" % "1.13.6" // Scala 3 incompatible val scallop = "org.rogach" %% "scallop" % "5.0.0" // Scala 3 compatible val titaniumJSONLD = "com.apicatalog" % "titanium-json-ld" % "1.3.2" val xmlunitCore = "org.xmlunit" % "xmlunit-core" % "2.9.1" From 96199bf505acab83f9338fd421288b5e8bd74cd0 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Tue, 7 Nov 2023 15:51:05 +0100 Subject: [PATCH 08/12] remove jodd and tapir updates --- project/Dependencies.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7bdf918170..8e67f04f2f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -95,7 +95,7 @@ object Dependencies { val gwtServlet = "com.google.gwt" % "gwt-servlet" % "2.10.0" val icu4j = "com.ibm.icu" % "icu4j" % "74.1" val jakartaJSON = "org.glassfish" % "jakarta.json" % "2.0.1" - val jodd = "org.jodd" % "jodd" % "3.4.1" + val jodd = "org.jodd" % "jodd" % "3.2.7" val rdf4jClient = "org.eclipse.rdf4j" % "rdf4j-client" % "4.3.7" val rdf4jShacl = "org.eclipse.rdf4j" % "rdf4j-shacl" % "4.3.7" val saxonHE = "net.sf.saxon" % "Saxon-HE" % "12.3" @@ -121,7 +121,7 @@ object Dependencies { // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.13.0" - val tapirVersion = "1.8.4" + val tapirVersion = "1.7.6" val tapir = Seq( "com.softwaremill.sttp.tapir" %% "tapir-pekko-http-server" % tapirVersion, @@ -129,7 +129,7 @@ object Dependencies { "com.softwaremill.sttp.tapir" %% "tapir-json-zio" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-json-spray" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-swagger-ui-bundle" % tapirVersion, - "com.softwaremill.sttp.tapir" %% "tapir-refined" % "1.8.4" + "com.softwaremill.sttp.tapir" %% "tapir-refined" % tapirVersion ) val metrics = Seq( "dev.zio" %% "zio-metrics-connectors" % ZioMetricsConnectorsVersion, From 2c7be33740236fec96fd9350e8119e13babbc930 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Tue, 7 Nov 2023 15:51:35 +0100 Subject: [PATCH 09/12] update deps ignore list --- .scala-steward.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index 16c4b2151b..c678d41e93 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -3,8 +3,7 @@ # sbt-scoverage -> version conflict in scala-xml updates.ignore = [ - { groupId = "org.jodd", artifactId = "jodd", version = "3.2.7" } - { groupId = "org.scoverage", artifactId = "sbt-scoverage", version = "1.9.3" } + { groupId = "org.jodd", artifactId = "jodd" } ] # pullRequests.grouping allows you to specify how Scala Steward should group From 2ee037b4e33108ec156d7e9320c0fca5ecd24ae8 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Tue, 7 Nov 2023 16:12:51 +0100 Subject: [PATCH 10/12] fmt --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8e67f04f2f..99e1f7174a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -100,7 +100,7 @@ object Dependencies { val rdf4jShacl = "org.eclipse.rdf4j" % "rdf4j-shacl" % "4.3.7" val saxonHE = "net.sf.saxon" % "Saxon-HE" % "12.3" val scalaGraph = "org.scala-graph" %% "graph-core" % "1.13.6" // Scala 3 incompatible - val scallop = "org.rogach" %% "scallop" % "5.0.0" // Scala 3 compatible + val scallop = "org.rogach" %% "scallop" % "5.0.0" // Scala 3 compatible val titaniumJSONLD = "com.apicatalog" % "titanium-json-ld" % "1.3.2" val xmlunitCore = "org.xmlunit" % "xmlunit-core" % "2.9.1" From 1058ee6777e4def029d5790559735a6afb47460b Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Wed, 8 Nov 2023 15:34:13 +0100 Subject: [PATCH 11/12] add graph-core to ignore list --- .scala-steward.conf | 7 ++++--- project/Dependencies.scala | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index c678d41e93..bcf5c286db 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -1,9 +1,10 @@ # ignore the following dependencies: -# jodd -> hard to update and only used in DateUtilV1 -# sbt-scoverage -> version conflict in scala-xml +# jodd -> hard to update due to removal of JDateTime class in newer versions used in DateUtilV1 to calendars conversions +# graph-core -> hard to update due to breaking changes updates.ignore = [ - { groupId = "org.jodd", artifactId = "jodd" } + { groupId = "org.jodd", artifactId = "jodd" }, + { groupId = "org.scala-graph", artifactId = "graph-core"} ] # pullRequests.grouping allows you to specify how Scala Steward should group diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 99e1f7174a..c3a8baa953 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -129,7 +129,7 @@ object Dependencies { "com.softwaremill.sttp.tapir" %% "tapir-json-zio" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-json-spray" % tapirVersion, "com.softwaremill.sttp.tapir" %% "tapir-swagger-ui-bundle" % tapirVersion, - "com.softwaremill.sttp.tapir" %% "tapir-refined" % tapirVersion + "com.softwaremill.sttp.tapir" %% "tapir-refined" % "1.2.13" ) val metrics = Seq( "dev.zio" %% "zio-metrics-connectors" % ZioMetricsConnectorsVersion, From 73d52f0fbe2664c4d9992f4ef58b8d746b3e60e8 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Thu, 9 Nov 2023 14:32:13 +0100 Subject: [PATCH 12/12] reverse Jena update --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c3a8baa953..72c78a02e6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -19,7 +19,7 @@ object Dependencies { val PekkoActorVersion = "1.0.1" val PekkoHttpVersion = "1.0.0" - val JenaVersion = "4.9.0" + val JenaVersion = "4.8.0" val ZioConfigVersion = "3.0.7" val ZioLoggingVersion = "2.1.14"