From db558bc05372e48a8dec799161e303aa6f52ce01 Mon Sep 17 00:00:00 2001 From: Pawel Lipski Date: Tue, 19 Sep 2023 17:09:26 +0200 Subject: [PATCH] Ignore pekko-grpc-runtime in Steward updates --- .scala-steward.conf | 114 ++++++++++++++++++++------------------ scripts/akka-to-pekko.sed | 5 +- 2 files changed, 63 insertions(+), 56 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index b8295b95..6e6e0430 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -11,62 +11,68 @@ buildRoots = [ "sbt-akka-serialization-helper/src/sbt-test/sbt-dumpschema/simple", ] -# updates.allowPreReleases = [ { groupId = "org.apache.pekko" } ] -# updates.allow = [ { groupId = "org.apache.pekko" } ] +updates { +# +# allowPreReleases = [ { groupId = "org.apache.pekko" } ] +# allow = [ { groupId = "org.apache.pekko" } ] +# ignore = [ { groupId = "org.apache.pekko", artifactId = "pekko-grpc-runtime" } ] +# + # -updates.pin = [ - # * org.scala-lang.modules:scala-xml_2.12:2.1.0 (early-semver) is selected over 1.2.0 - # +- com.github.sbt:sbt-native-packager:1.9.10 (sbtVersion=1.0, scalaVersion=2.12) (depends on 2.1.0) - # +- com.typesafe.play:twirl-api_2.12:1.5.1 (depends on 1.2.0) - { groupId = "com.github.sbt", artifactId = "sbt-native-packager", version = "1.9.9" } + pin = [ + # * org.scala-lang.modules:scala-xml_2.12:2.1.0 (early-semver) is selected over 1.2.0 + # +- com.github.sbt:sbt-native-packager:1.9.10 (sbtVersion=1.0, scalaVersion=2.12) (depends on 2.1.0) + # +- com.typesafe.play:twirl-api_2.12:1.5.1 (depends on 1.2.0) + { groupId = "com.github.sbt", artifactId = "sbt-native-packager", version = "1.9.9" } - # * org.scala-lang.modules:scala-parser-combinators_2.13:2.1.0 (early-semver) is selected over 1.1.2 - # +- org.scalikejdbc:scalikejdbc-core_2.13:4.0.0 (depends on 2.1.0) - # +- com.typesafe:ssl-config-core_2.13:0.4.3 (depends on 1.1.2) - { groupId = "org.scalikejdbc", version = "3." } + # * org.scala-lang.modules:scala-parser-combinators_2.13:2.1.0 (early-semver) is selected over 1.1.2 + # +- org.scalikejdbc:scalikejdbc-core_2.13:4.0.0 (depends on 2.1.0) + # +- com.typesafe:ssl-config-core_2.13:0.4.3 (depends on 1.1.2) + { groupId = "org.scalikejdbc", version = "3." } - # Since most libraries will pull in slf4j-api v1 for a long time... - # so to spare ourselves dependency overrides & all the hassle with v2, let's stick to v1 as for now. - { groupId = "org.slf4j", version = "1." } + # Since most libraries will pull in slf4j-api v1 for a long time... + # so to spare ourselves dependency overrides & all the hassle with v2, let's stick to v1 as for now. + { groupId = "org.slf4j", version = "1." } - # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the - # 2.7.0 release. So, we want to stick to 2.6.x for now to avoid potential license-connected problems. - { groupId = "com.typesafe.akka", artifactId="akka-actor", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-actor-typed", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-stream", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-persistence-typed", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-actor-testkit-typed", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-stream-testkit", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-cluster-typed", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-cluster-sharding-typed", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-discovery", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-slf4j", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-serialization-jackson", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-persistence-testkit", version = "2.6." } - { groupId = "com.typesafe.akka", artifactId="akka-persistence-query", version = "2.6." } - # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the - # 1.3.0 release for akka-projection. So, we want to stick to 1.2.x for now to avoid - # potential license-connected problems. - { groupId = "com.lightbend.akka", artifactId="akka-projection-eventsourced", version = "1.2." } - { groupId = "com.lightbend.akka", artifactId="akka-projection-jdbc", version = "1.2." } - # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the - # 2.2.0 release for akka-grpc. So, we want to stick to 2.1.x for now to avoid potential license-connected problems. - { groupId = "com.lightbend.akka.grpc", artifactId="akka-grpc-runtime", version = "2.1." } - # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the - # 10.3.0 release for akka-http. So, we want to stick to 10.2.x for now to avoid potential license-connected problems. - { groupId = "com.typesafe.akka", artifactId="akka-http", version = "10.2." } - { groupId = "com.typesafe.akka", artifactId="akka-http-spray-json", version = "10.2." } - { groupId = "com.typesafe.akka", artifactId="akka-http2-support", version = "10.2." } - # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the - # 1.2.0 release for akka-management - related modules. So, we want to stick to 1.1.x for now to avoid - # potential license-connected problems. - { groupId = "com.lightbend.akka.management", artifactId="akka-management", version = "1.1." } - { groupId = "com.lightbend.akka.management", artifactId="akka-management-cluster-http", version = "1.1." } - { groupId = "com.lightbend.akka.management", artifactId="akka-management-cluster-bootstrap", version = "1.1." } - { groupId = "com.lightbend.akka.discovery", artifactId="akka-discovery-kubernetes-api", version = "1.1." } - # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the - # 5.2.0 release for akka-persistence-jdbc. So, we want to stick to 5.1.x for now to avoid - # potential license-connected problems. - { groupId = "com.lightbend.akka", artifactId="akka-persistence-jdbc", version = "5.1." } -] + # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the + # 2.7.0 release. So, we want to stick to 2.6.x for now to avoid potential license-connected problems. + { groupId = "com.typesafe.akka", artifactId="akka-actor", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-actor-typed", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-stream", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-persistence-typed", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-actor-testkit-typed", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-stream-testkit", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-cluster-typed", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-cluster-sharding-typed", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-discovery", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-slf4j", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-serialization-jackson", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-persistence-testkit", version = "2.6." } + { groupId = "com.typesafe.akka", artifactId="akka-persistence-query", version = "2.6." } + # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the + # 1.3.0 release for akka-projection. So, we want to stick to 1.2.x for now to avoid + # potential license-connected problems. + { groupId = "com.lightbend.akka", artifactId="akka-projection-eventsourced", version = "1.2." } + { groupId = "com.lightbend.akka", artifactId="akka-projection-jdbc", version = "1.2." } + # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the + # 2.2.0 release for akka-grpc. So, we want to stick to 2.1.x for now to avoid potential license-connected problems. + { groupId = "com.lightbend.akka.grpc", artifactId="akka-grpc-runtime", version = "2.1." } + # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the + # 10.3.0 release for akka-http. So, we want to stick to 10.2.x for now to avoid potential license-connected problems. + { groupId = "com.typesafe.akka", artifactId="akka-http", version = "10.2." } + { groupId = "com.typesafe.akka", artifactId="akka-http-spray-json", version = "10.2." } + { groupId = "com.typesafe.akka", artifactId="akka-http2-support", version = "10.2." } + # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the + # 1.2.0 release for akka-management - related modules. So, we want to stick to 1.1.x for now to avoid + # potential license-connected problems. + { groupId = "com.lightbend.akka.management", artifactId="akka-management", version = "1.1." } + { groupId = "com.lightbend.akka.management", artifactId="akka-management-cluster-http", version = "1.1." } + { groupId = "com.lightbend.akka.management", artifactId="akka-management-cluster-bootstrap", version = "1.1." } + { groupId = "com.lightbend.akka.discovery", artifactId="akka-discovery-kubernetes-api", version = "1.1." } + # Akka changed its license from Apache 2.0 (opensource) to Business Source License 1.1 (commercial) in the + # 5.2.0 release for akka-persistence-jdbc. So, we want to stick to 5.1.x for now to avoid + # potential license-connected problems. + { groupId = "com.lightbend.akka", artifactId="akka-persistence-jdbc", version = "5.1." } + ] # +} diff --git a/scripts/akka-to-pekko.sed b/scripts/akka-to-pekko.sed index 5690f7fe..e395217d 100644 --- a/scripts/akka-to-pekko.sed +++ b/scripts/akka-to-pekko.sed @@ -1,5 +1,6 @@ -//, // d -s/^.* *// +//, // d +//, // s/^#// +/|/ d # All cases where "akka" isn't simply replaced with "pekko"; imports must be replaced first s/import akka/import org.apache.pekko/