You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2025/05/06 19:49:34 UTC
(incubator-toree) branch master updated (973aab75 -> 75073e65)
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
from 973aab75 [TOREE-562] Update NOTICE for 2025 (#226)
new 09e641d1 Update sbt version to 1.5.5 -> 1.9.3
new 47ff62e6 Update sbt-assembly and sbt-buildinfo plugins
new 79a8ca3f Use builds to use Spark 3.4.0
new 75073e65 Update to Pekko 1.0.3
The 4 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:
Makefile | 2 +-
build.sbt | 10 +++++++---
project/Dependencies.scala | 2 +-
project/build.properties | 2 +-
project/plugins.sbt | 4 ++--
5 files changed, 12 insertions(+), 8 deletions(-)
(incubator-toree) 01/04: Update sbt version to 1.5.5 -> 1.9.3
Posted by lr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
commit 09e641d1949105d84322d4f01bd34b41a9157201
Author: Luciano Resende <lr...@apple.com>
AuthorDate: Sat May 3 08:46:55 2025 -0700
Update sbt version to 1.5.5 -> 1.9.3
---
project/build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/build.properties b/project/build.properties
index f7cc74b5..aff013d3 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -15,4 +15,4 @@
# limitations under the License
#
-sbt.version=1.5.5
+sbt.version=1.9.3
(incubator-toree) 02/04: Update sbt-assembly and sbt-buildinfo plugins
Posted by lr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
commit 47ff62e69a07f3f0cb47c050daf1a9bdb5550b00
Author: Luciano Resende <lr...@apple.com>
AuthorDate: Sat May 3 08:47:54 2025 -0700
Update sbt-assembly and sbt-buildinfo plugins
---
build.sbt | 10 +++++++---
project/plugins.sbt | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index d3232e8a..8127fcee 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,6 +16,7 @@
*/
import scala.util.Properties
+import sbtassembly.AssemblyOption
// Version settings
ThisBuild / version := Properties.envOrElse("VERSION", "0.0.0-dev") +
@@ -54,8 +55,8 @@ ThisBuild / scalacOptions ++= Seq(
ThisBuild / javacOptions ++= Seq(
"-Xlint:all", // Enable all Java-based warnings
"-Xlint:-path", // Suppress path warnings since we get tons of them
- "-Xlint:-options",
- "-Xlint:-processing",
+ "-Xlint:-options", // Suppress "options" warnings
+ "-Xlint:-processing", // Suppress annotation processing warnings
"-Werror", // Treat warnings as errors
"-source", "1.8",
"-target", "1.8"
@@ -219,11 +220,14 @@ assembly / assemblyShadeRules := Seq(
assembly / assemblyMergeStrategy := {
case "module-info.class" => MergeStrategy.discard
+ case PathList("META-INF", "versions", "9", "module-info.class") => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
}
assembly / test := {}
-assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeScala = false)
+assembly / assemblyOption ~= {
+ _.withIncludeScala(false)
+}
assembly / aggregate := false
diff --git a/project/plugins.sbt b/project/plugins.sbt
index eb746b2a..44754e6e 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -21,10 +21,10 @@ logLevel := Level.Warn
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
// Provides abilit to create an uber-jar
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
// Provides a generated build info object to sync between build and application
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
// Used for signing jars published via `sbt publish-signed`
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
(incubator-toree) 04/04: Update to Pekko 1.0.3
Posted by lr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
commit 75073e65a6d8b63db768620d3a264470a65d0575
Author: Luciano Resende <lr...@apple.com>
AuthorDate: Sun May 4 21:51:25 2025 -0700
Update to Pekko 1.0.3
---
project/Dependencies.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index e873a48e..64e785e4 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -21,7 +21,7 @@ import scala.util.Properties
object Dependencies {
// Libraries
- val pekkoVersion = "1.0.2" // Apache v2
+ val pekkoVersion = "1.0.3" // Apache v2
val pekkoActor = "org.apache.pekko" %% "pekko-actor" % pekkoVersion // Apache v2
val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion // Apache v2
val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % pekkoVersion // Apache v2
(incubator-toree) 03/04: Use builds to use Spark 3.4.0
Posted by lr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
commit 79a8ca3fc85678263c5ead1ade9c12ee5890d1d6
Author: Luciano Resende <lr...@apple.com>
AuthorDate: Sun May 4 10:02:04 2025 -0700
Use builds to use Spark 3.4.0
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 2c0f39c7..2552a6b9 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ IS_SNAPSHOT?=true
SNAPSHOT:=-SNAPSHOT
endif
-APACHE_SPARK_VERSION?=3.3.2
+APACHE_SPARK_VERSION?=3.4.0
SCALA_VERSION?=2.12
IMAGE?=jupyter/all-spark-notebook:latest
EXAMPLE_IMAGE?=apache/toree-examples