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 2026/09/16 10:39:33 UTC
(incubator-toree) branch master updated (82340a9c -> 0117e08f)
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 82340a9c Add missing ASF license header to dependabot.yml
new 432fbc5e Update Maven artifact names and Makefile to use apache-toree prefix
new 0117e08f Fix SBT linting and missing credentials warnings
The 2 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 | 6 +++---
build.sbt | 26 ++++++++++++++------------
etc/templates/toree-assembly-pom.xml | 2 +-
3 files changed, 18 insertions(+), 16 deletions(-)
(incubator-toree) 02/02: Fix SBT linting and missing credentials warnings
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 0117e08fb04115a147f5b80a31e0cb9fd0a44d8a
Author: Luciano Resende <lr...@apple.com>
AuthorDate: Wed Sep 16 11:44:02 2026 +0200
Fix SBT linting and missing credentials warnings
- Conditionally load ~/.ivy2/.credentials only if the file exists to prevent warnings.
- Exclude 'pgpPassphrase' and 'mappings' from SBT unused key linting.
---
build.sbt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/build.sbt b/build.sbt
index 7c93a0ec..b9aab056 100644
--- a/build.sbt
+++ b/build.sbt
@@ -127,7 +127,7 @@ ThisBuild / pomExtra := {
<tag>HEAD</tag>
</scm>
}
-ThisBuild / credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
+ThisBuild / credentials ++= (if ((Path.userHome / ".ivy2" / ".credentials").exists) Seq(Credentials(Path.userHome / ".ivy2" / ".credentials")) else Nil)
// Project structure
@@ -250,3 +250,5 @@ assembly / assemblyOption ~= {
_.withIncludeScala(false)
}
assembly / aggregate := false
+
+Global / excludeLintKeys ++= Set(pgpPassphrase, mappings)
(incubator-toree) 01/02: Update Maven artifact names and Makefile to use apache-toree prefix
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 432fbc5e9929d71e0b51ad70251a8dc7a8ceb9a1
Author: Luciano Resende <lr...@apple.com>
AuthorDate: Wed Sep 16 11:38:41 2026 +0200
Update Maven artifact names and Makefile to use apache-toree prefix
Per Apache naming policies, artifacts published to Maven should be
prefixed with 'apache-'. This updates the SBT project names, the
assembly POM template, and the Makefile definitions to use the
'apache-toree' prefix rather than the legacy 'toree' prefix.
---
Makefile | 6 +++---
build.sbt | 22 +++++++++++-----------
etc/templates/toree-assembly-pom.xml | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index f4fea93f..4026e1c8 100644
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,8 @@ RUN=$(RUN_PREFIX)$(1)$(RUN_SUFFIX)
ENV_OPTS:=APACHE_SPARK_VERSION=$(APACHE_SPARK_VERSION) SCALA_VERSION=$(SCALA_VERSION) VERSION=$(VERSION) IS_SNAPSHOT=$(IS_SNAPSHOT)
-ASSEMBLY_JAR:=toree-assembly-$(VERSION)$(SNAPSHOT).jar
-ASSEMBLY_POM:=toree-assembly-$(VERSION)$(SNAPSHOT).pom
+ASSEMBLY_JAR:=apache-toree-assembly-$(VERSION)$(SNAPSHOT).jar
+ASSEMBLY_POM:=apache-toree-assembly-$(VERSION)$(SNAPSHOT).pom
help:
@echo ' '
@@ -104,7 +104,7 @@ dev-binder: .binder-image
--workdir /home/main/notebooks $(BINDER_IMAGE) \
/home/main/start-notebook.sh --ip=0.0.0.0
-SPARK_MONITOR_JAR:=toree-spark-monitor-plugin-assembly-$(VERSION)$(SNAPSHOT).jar
+SPARK_MONITOR_JAR:=apache-toree-spark-monitor-plugin-assembly-$(VERSION)$(SNAPSHOT).jar
target/scala-$(SCALA_VERSION)/$(ASSEMBLY_JAR): VM_WORKDIR=/src/toree-kernel
target/scala-$(SCALA_VERSION)/$(ASSEMBLY_JAR): ${shell find ./*/src/main/**/*}
diff --git a/build.sbt b/build.sbt
index 30e924f8..7c93a0ec 100644
--- a/build.sbt
+++ b/build.sbt
@@ -133,7 +133,7 @@ ThisBuild / credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
/** Root Toree project. */
lazy val root = (project in file("."))
- .settings(name := "toree")
+ .settings(name := "apache-toree")
.aggregate(
macros,protocol,plugins,sparkMonitorPlugin,communication,kernelApi,client,scalaInterpreter,sqlInterpreter,kernel
)
@@ -146,28 +146,28 @@ lazy val root = (project in file("."))
* any other project using them.
*/
lazy val macros = (project in file("macros"))
- .settings(name := "toree-macros")
+ .settings(name := "apache-toree-macros")
/**
* Project representing the IPython kernel message protocol in Scala. Used
* by the client and kernel implementations.
*/
lazy val protocol = (project in file("protocol"))
- .settings(name := "toree-protocol")
+ .settings(name := "apache-toree-protocol")
.dependsOn(macros)
/**
* Project representing base plugin system for the Toree infrastructure.
*/
lazy val plugins = (project in file("plugins"))
- .settings(name := "toree-plugins")
+ .settings(name := "apache-toree-plugins")
.dependsOn(macros)
/**
* Project representing the SparkMonitor plugin for Toree.
*/
lazy val sparkMonitorPlugin = (project in file("spark-monitor-plugin"))
- .settings(name := "toree-spark-monitor-plugin")
+ .settings(name := "apache-toree-spark-monitor-plugin")
.dependsOn(macros, protocol, plugins, kernel, kernelApi)
/**
@@ -175,7 +175,7 @@ lazy val sparkMonitorPlugin = (project in file("spark-monitor-plugin"))
* client/kernel.
*/
lazy val communication = (project in file("communication"))
- .settings(name := "toree-communication")
+ .settings(name := "apache-toree-communication")
.dependsOn(macros, protocol)
/**
@@ -183,35 +183,35 @@ lazy val communication = (project in file("communication"))
* import this to implement their own magics and plugins.
*/
lazy val kernelApi = (project in file("kernel-api"))
- .settings(name := "toree-kernel-api")
+ .settings(name := "apache-toree-kernel-api")
.dependsOn(macros, plugins)
/**
* Project representing the client code for connecting to the kernel backend.
*/
lazy val client = (project in file("client"))
- .settings(name := "toree-client")
+ .settings(name := "apache-toree-client")
.dependsOn(macros, protocol, communication)
/**
* Project represents the scala interpreter used by the Spark Kernel.
*/
lazy val scalaInterpreter = (project in file("scala-interpreter"))
- .settings(name := "toree-scala-interpreter")
+ .settings(name := "apache-toree-scala-interpreter")
.dependsOn(plugins, protocol, kernelApi)
/**
* Project represents the SQL interpreter used by the Spark Kernel.
*/
lazy val sqlInterpreter = (project in file("sql-interpreter"))
- .settings(name := "toree-sql-interpreter")
+ .settings(name := "apache-toree-sql-interpreter")
.dependsOn(plugins, protocol, kernelApi, scalaInterpreter)
/**
* Project representing the kernel code for the Spark Kernel backend.
*/
lazy val kernel = (project in file("kernel"))
- .settings(name := "toree-kernel")
+ .settings(name := "apache-toree-kernel")
.dependsOn(
macros % "test->test;compile->compile",
protocol % "test->test;compile->compile",
diff --git a/etc/templates/toree-assembly-pom.xml b/etc/templates/toree-assembly-pom.xml
index c8a63a58..e9612c35 100644
--- a/etc/templates/toree-assembly-pom.xml
+++ b/etc/templates/toree-assembly-pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.toree</groupId>
- <artifactId>toree-assembly</artifactId>
+ <artifactId>apache-toree-assembly</artifactId>
<version>@VERSION@</version>
<packaging>jar</packaging>