You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2024/03/03 13:47:50 UTC
(incubator-pekko-connectors) branch 1.0.x updated (75bcc63a5 -> d53183b58)
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a change to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
from 75bcc63a5 Rename akka reference to pekko (#467)
new 513f22dc9 Use sbt-web 1.5.x despite staying on paradox 0.9.2 (#515)
new 633312c1a Update sbt-pekko-paradox
new d53183b58 Fix excludes for sbt-site-paradox
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
project/plugins.sbt | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(incubator-pekko-connectors) 03/03: Fix excludes for sbt-site-paradox
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
commit d53183b58287977747e43f79274f3e378647e189
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Sun Mar 3 13:46:30 2024 +0100
Fix excludes for sbt-site-paradox
(cherry picked from commit f1812eb7a0dee1137a5865314a3ab8d4ed1d5278)
---
project/plugins.sbt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 9b9db98f7..826964b60 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -23,10 +23,11 @@ addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
resolvers += Resolver.ApacheMavenSnapshotsRepo
addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1-RC1+3-2b1f8708-SNAPSHOT")
+addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.5.0").excludeAll(
+ "com.lightbend.paradox", "sbt-paradox"))
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
-addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.5.0").exclude("com.typesafe.sbt", "sbt-web"))
// Pekko gRPC -- sync with PekkoGrpcBinaryVersion in Dependencies.scala
addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.2")
// templating
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(incubator-pekko-connectors) 02/03: Update sbt-pekko-paradox
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
commit 633312c1acb27c5f92e2dc3f05f28ad566139a32
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Sun Mar 3 12:55:25 2024 +0100
Update sbt-pekko-paradox
(cherry picked from commit 627ad9d8a6b9f3ce910b97e065546eaa2ecdec67)
---
project/plugins.sbt | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 86b131f95..9b9db98f7 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -21,17 +21,8 @@ addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
// docs
-// We have to deliberately use older versions of sbt-paradox because current Pekko sbt build
-// only loads on JDK 1.8 so we need to bring in older versions of parboiled which support JDK 1.8
-addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.0").excludeAll(
- "com.lightbend.paradox", "sbt-paradox",
- "com.lightbend.paradox" % "sbt-paradox-apidoc",
- "com.lightbend.paradox" % "sbt-paradox-project-info"))
-addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").force().exclude("com.typesafe.sbt", "sbt-web"))
-addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4") // sbt-paradox 0.9.2 depends on old sbt-web 1.4.x, but we want a newer version
-addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-apidoc" % "0.10.1").force().exclude("com.typesafe.sbt", "sbt-web"))
-addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-project-info" % "2.0.0").force()
- .exclude("com.typesafe.sbt", "sbt-web"))
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1-RC1+3-2b1f8708-SNAPSHOT")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org
(incubator-pekko-connectors) 01/03: Use sbt-web 1.5.x despite staying on paradox 0.9.2 (#515)
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
commit 513f22dc95cf6050c472f92934e60994b15002e4
Author: Matthias Kurz <m....@irregular.at>
AuthorDate: Sun Feb 25 23:09:50 2024 +0100
Use sbt-web 1.5.x despite staying on paradox 0.9.2 (#515)
* Use sbt-web 1.5.x despite staying on paradox 0.9.2
* Seems to work without explicit scala-xml override
---------
Co-authored-by: PJ Fanning <pj...@users.noreply.github.com>
(cherry picked from commit 17826d122409f3aab5407e4afc8e355163b7e55a)
---
project/plugins.sbt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 896396456..86b131f95 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -7,8 +7,6 @@
* This file is part of the Apache Pekko project, which was derived from Akka.
*/
-dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.2.0"
-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")
@@ -29,13 +27,15 @@ addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.0").excludeAll(
"com.lightbend.paradox", "sbt-paradox",
"com.lightbend.paradox" % "sbt-paradox-apidoc",
"com.lightbend.paradox" % "sbt-paradox-project-info"))
-addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").force())
-addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-apidoc" % "0.10.1").force())
-addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-project-info" % "2.0.0").force())
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").force().exclude("com.typesafe.sbt", "sbt-web"))
+addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4") // sbt-paradox 0.9.2 depends on old sbt-web 1.4.x, but we want a newer version
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-apidoc" % "0.10.1").force().exclude("com.typesafe.sbt", "sbt-web"))
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-project-info" % "2.0.0").force()
+ .exclude("com.typesafe.sbt", "sbt-web"))
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
+addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.5.0").exclude("com.typesafe.sbt", "sbt-web"))
// Pekko gRPC -- sync with PekkoGrpcBinaryVersion in Dependencies.scala
addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.2")
// templating
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org