scottsand-db
diff --git a/‎build.sbt
+13-72 b/‎build.sbt
+13-72
diff --git a/‎build/sbt-config/repositories
+1-1 b/‎build/sbt-config/repositories
+1-1
diff --git a/‎default-core/src/main/java/io/delta/core/data/JsonRow.java renamed to ‎kernel-default/src/main/java/io/delta/core/data/JsonRow.java b/‎default-core/src/main/java/io/delta/core/data/JsonRow.java renamed to ‎kernel-default/src/main/java/io/delta/core/data/JsonRow.java
diff --git a/‎default-core/src/main/java/io/delta/core/helpers/DefaultTableHelper.java renamed to ‎kernel-default/src/main/java/io/delta/core/helpers/DefaultTableHelper.java b/‎default-core/src/main/java/io/delta/core/helpers/DefaultTableHelper.java renamed to ‎kernel-default/src/main/java/io/delta/core/helpers/DefaultTableHelper.java
diff --git a/‎default-core/src/test/scala/io/delta/core/TableSuite.scala renamed to ‎kernel-default/src/test/scala/io/delta/core/TableSuite.scala b/‎default-core/src/test/scala/io/delta/core/TableSuite.scala renamed to ‎kernel-default/src/test/scala/io/delta/core/TableSuite.scala
diff --git a/‎core/src/main/java/io/delta/core/ColumnMappingMode.java renamed to ‎kernel/src/main/java/io/delta/core/ColumnMappingMode.java b/‎core/src/main/java/io/delta/core/ColumnMappingMode.java renamed to ‎kernel/src/main/java/io/delta/core/ColumnMappingMode.java
diff --git a/‎core/src/main/java/io/delta/core/Scan.java renamed to ‎kernel/src/main/java/io/delta/core/Scan.java b/‎core/src/main/java/io/delta/core/Scan.java renamed to ‎kernel/src/main/java/io/delta/core/Scan.java
diff --git a/‎core/src/main/java/io/delta/core/ScanBuilder.java renamed to ‎kernel/src/main/java/io/delta/core/ScanBuilder.java b/‎core/src/main/java/io/delta/core/ScanBuilder.java renamed to ‎kernel/src/main/java/io/delta/core/ScanBuilder.java
diff --git a/‎core/src/main/java/io/delta/core/ScanTask.java renamed to ‎kernel/src/main/java/io/delta/core/ScanTask.java b/‎core/src/main/java/io/delta/core/ScanTask.java renamed to ‎kernel/src/main/java/io/delta/core/ScanTask.java
diff --git a/‎core/src/main/java/io/delta/core/Snapshot.java renamed to ‎kernel/src/main/java/io/delta/core/Snapshot.java b/‎core/src/main/java/io/delta/core/Snapshot.java renamed to ‎kernel/src/main/java/io/delta/core/Snapshot.java
diff --git a/‎core/src/main/java/io/delta/core/Table.java renamed to ‎kernel/src/main/java/io/delta/core/Table.java b/‎core/src/main/java/io/delta/core/Table.java renamed to ‎kernel/src/main/java/io/delta/core/Table.java
diff --git a/‎core/src/main/java/io/delta/core/data/ColumnVector.java renamed to ‎kernel/src/main/java/io/delta/core/data/ColumnVector.java b/‎core/src/main/java/io/delta/core/data/ColumnVector.java renamed to ‎kernel/src/main/java/io/delta/core/data/ColumnVector.java
diff --git a/‎core/src/main/java/io/delta/core/data/ColumnarBatch.java renamed to ‎kernel/src/main/java/io/delta/core/data/ColumnarBatch.java b/‎core/src/main/java/io/delta/core/data/ColumnarBatch.java renamed to ‎kernel/src/main/java/io/delta/core/data/ColumnarBatch.java
diff --git a/‎core/src/main/java/io/delta/core/data/DeletionVector.java renamed to ‎kernel/src/main/java/io/delta/core/data/DeletionVector.java b/‎core/src/main/java/io/delta/core/data/DeletionVector.java renamed to ‎kernel/src/main/java/io/delta/core/data/DeletionVector.java
diff --git a/‎core/src/main/java/io/delta/core/data/Row.java renamed to ‎kernel/src/main/java/io/delta/core/data/Row.java b/‎core/src/main/java/io/delta/core/data/Row.java renamed to ‎kernel/src/main/java/io/delta/core/data/Row.java
diff --git a/‎core/src/main/java/io/delta/core/expressions/Expression.java renamed to ‎kernel/src/main/java/io/delta/core/expressions/Expression.java b/‎core/src/main/java/io/delta/core/expressions/Expression.java renamed to ‎kernel/src/main/java/io/delta/core/expressions/Expression.java
diff --git a/‎core/src/main/java/io/delta/core/fs/FileStatus.java renamed to ‎kernel/src/main/java/io/delta/core/fs/FileStatus.java b/‎core/src/main/java/io/delta/core/fs/FileStatus.java renamed to ‎kernel/src/main/java/io/delta/core/fs/FileStatus.java
diff --git a/‎core/src/main/java/io/delta/core/helpers/ScanHelper.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/ScanHelper.java b/‎core/src/main/java/io/delta/core/helpers/ScanHelper.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/ScanHelper.java
diff --git a/‎core/src/main/java/io/delta/core/helpers/SupportsDeletionVector.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/SupportsDeletionVector.java b/‎core/src/main/java/io/delta/core/helpers/SupportsDeletionVector.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/SupportsDeletionVector.java
diff --git a/‎core/src/main/java/io/delta/core/helpers/TableHelper.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/TableHelper.java b/‎core/src/main/java/io/delta/core/helpers/TableHelper.java renamed to ‎kernel/src/main/java/io/delta/core/helpers/TableHelper.java
diff --git a/‎core/src/main/java/io/delta/core/internal/LogSegment.java renamed to ‎kernel/src/main/java/io/delta/core/internal/LogSegment.java b/‎core/src/main/java/io/delta/core/internal/LogSegment.java renamed to ‎kernel/src/main/java/io/delta/core/internal/LogSegment.java
diff --git a/‎core/src/main/java/io/delta/core/internal/TableImpl.java renamed to ‎kernel/src/main/java/io/delta/core/internal/TableImpl.java b/‎core/src/main/java/io/delta/core/internal/TableImpl.java renamed to ‎kernel/src/main/java/io/delta/core/internal/TableImpl.java
diff --git a/‎core/src/main/java/io/delta/core/internal/actions/Action.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/Action.java b/‎core/src/main/java/io/delta/core/internal/actions/Action.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/Action.java
diff --git a/‎core/src/main/java/io/delta/core/internal/actions/AddFile.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/AddFile.java b/‎core/src/main/java/io/delta/core/internal/actions/AddFile.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/AddFile.java
diff --git a/‎core/src/main/java/io/delta/core/internal/actions/FileAction.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/FileAction.java b/‎core/src/main/java/io/delta/core/internal/actions/FileAction.java renamed to ‎kernel/src/main/java/io/delta/core/internal/actions/FileAction.java
diff --git a/‎core/src/main/java/io/delta/core/internal/checkpoint/CheckpointInstance.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/CheckpointInstance.java b/‎core/src/main/java/io/delta/core/internal/checkpoint/CheckpointInstance.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/CheckpointInstance.java
diff --git a/‎core/src/main/java/io/delta/core/internal/checkpoint/CheckpointMetaData.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/CheckpointMetaData.java b/‎core/src/main/java/io/delta/core/internal/checkpoint/CheckpointMetaData.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/CheckpointMetaData.java
diff --git a/‎core/src/main/java/io/delta/core/internal/checkpoint/Checkpointer.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/Checkpointer.java b/‎core/src/main/java/io/delta/core/internal/checkpoint/Checkpointer.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checkpoint/Checkpointer.java
diff --git a/‎core/src/main/java/io/delta/core/internal/checksum/VersionChecksum.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checksum/VersionChecksum.java b/‎core/src/main/java/io/delta/core/internal/checksum/VersionChecksum.java renamed to ‎kernel/src/main/java/io/delta/core/internal/checksum/VersionChecksum.java
diff --git a/‎core/src/main/java/io/delta/core/internal/lang/ListUtils.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/ListUtils.java b/‎core/src/main/java/io/delta/core/internal/lang/ListUtils.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/ListUtils.java
diff --git a/‎core/src/main/java/io/delta/core/internal/lang/Optional.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Optional.java b/‎core/src/main/java/io/delta/core/internal/lang/Optional.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Optional.java
diff --git a/‎core/src/main/java/io/delta/core/internal/lang/Ordered.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Ordered.java b/‎core/src/main/java/io/delta/core/internal/lang/Ordered.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Ordered.java
diff --git a/‎core/src/main/java/io/delta/core/internal/lang/Tuple2.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Tuple2.java b/‎core/src/main/java/io/delta/core/internal/lang/Tuple2.java renamed to ‎kernel/src/main/java/io/delta/core/internal/lang/Tuple2.java
diff --git a/‎core/src/main/java/io/delta/core/internal/snapshot/InitialSnapshot.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/InitialSnapshot.java b/‎core/src/main/java/io/delta/core/internal/snapshot/InitialSnapshot.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/InitialSnapshot.java
diff --git a/‎core/src/main/java/io/delta/core/internal/snapshot/SnapshotImpl.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/SnapshotImpl.java b/‎core/src/main/java/io/delta/core/internal/snapshot/SnapshotImpl.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/SnapshotImpl.java
diff --git a/‎core/src/main/java/io/delta/core/internal/snapshot/SnapshotManager.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/SnapshotManager.java b/‎core/src/main/java/io/delta/core/internal/snapshot/SnapshotManager.java renamed to ‎kernel/src/main/java/io/delta/core/internal/snapshot/SnapshotManager.java
diff --git a/‎core/src/main/java/io/delta/core/internal/util/FileNames.java renamed to ‎kernel/src/main/java/io/delta/core/internal/util/FileNames.java b/‎core/src/main/java/io/delta/core/internal/util/FileNames.java renamed to ‎kernel/src/main/java/io/delta/core/internal/util/FileNames.java
diff --git a/‎core/src/main/java/io/delta/core/internal/util/Logging.java renamed to ‎kernel/src/main/java/io/delta/core/internal/util/Logging.java b/‎core/src/main/java/io/delta/core/internal/util/Logging.java renamed to ‎kernel/src/main/java/io/delta/core/internal/util/Logging.java
diff --git a/‎core/src/main/java/io/delta/core/types/DataType.java renamed to ‎kernel/src/main/java/io/delta/core/types/DataType.java b/‎core/src/main/java/io/delta/core/types/DataType.java renamed to ‎kernel/src/main/java/io/delta/core/types/DataType.java
diff --git a/‎core/src/main/java/io/delta/core/types/LongType.java renamed to ‎kernel/src/main/java/io/delta/core/types/LongType.java b/‎core/src/main/java/io/delta/core/types/LongType.java renamed to ‎kernel/src/main/java/io/delta/core/types/LongType.java
diff --git a/‎core/src/main/java/io/delta/core/types/StructField.java renamed to ‎kernel/src/main/java/io/delta/core/types/StructField.java b/‎core/src/main/java/io/delta/core/types/StructField.java renamed to ‎kernel/src/main/java/io/delta/core/types/StructField.java
diff --git a/‎core/src/main/java/io/delta/core/types/StructType.java renamed to ‎kernel/src/main/java/io/delta/core/types/StructType.java b/‎core/src/main/java/io/delta/core/types/StructType.java renamed to ‎kernel/src/main/java/io/delta/core/types/StructType.java
diff --git a/‎core/src/main/java/io/delta/core/utils/CloseableIterator.java renamed to ‎kernel/src/main/java/io/delta/core/utils/CloseableIterator.java b/‎core/src/main/java/io/delta/core/utils/CloseableIterator.java renamed to ‎kernel/src/main/java/io/delta/core/utils/CloseableIterator.java
@@ -797,91 +797,32 @@ lazy val flink = (project in file("flink"))
     (Test / test) := ((Test / test) dependsOn (Compile / unidoc)).value
   )
 
-lazy val core = (project in file("core"))
+lazy val kernel = (project in file("kernel"))
   .settings(
-    name := "delta-core",
+    name := "delta-kernel",
     commonSettings,
     skipReleaseSettings,
     libraryDependencies ++= Seq(
 
     )
   )
 
-lazy val defaultCore = (project in file("default-core"))
-  .dependsOn(core)
+lazy val kernelDefault = (project in file("kernel-default"))
+  .dependsOn(kernel)
   .settings(
-    name := "delta-core-default",
+    name := "delta-kernel-default",
     commonSettings,
     skipReleaseSettings,
     libraryDependencies ++= Seq(
       "org.apache.hadoop" % "hadoop-client-api" % "3.3.1", // Configuration, Path
       "io.delta" % "delta-storage" % "2.2.0", // LogStore
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.14.2", // ObjectMapper
-
-      /*
-      // ---------------------------------------------------------------
-      // ------ COPIED VERBATIM FROM DELTA LAKE ON SPARK BUILD.SBT -----
-      // ---------------------------------------------------------------
-      // IntelliJ output
-      //    A full rebuild may help if 'SparkFunSuite.class' was compiled against an incompatible version of org.scalatest.
-      // SBT output
-      //    [error] /home/scott.sandre/connectors/default-core/src/test/scala/io/delta/core/TableSuite.scala:23:41: Symbol 'type org.scalatest.FunSuite' is missing from the classpath.
-      //    [error] This symbol is required by 'class org.apache.spark.SparkFunSuite'.
-      //    [error] Make sure that type FunSuite is in your classpath and check for conflicting dependencies with `-Ylog-classpath`.
-      //    [error] A full rebuild may help if 'SparkFunSuite.class' was compiled against an incompatible version of org.scalatest.
-      //    [error] class TableSuite extends QueryTest with SharedSparkSession {
-      //    [error]                                         ^
-      //    [error] /home/scott.sandre/connectors/default-core/src/test/scala/io/delta/core/TableSuite.scala:29:3: package test is not a value
-      //    [error]   test("basic read") {
-      // Adding test classifier seems to break transitive resolution of the core dependencies
-      "org.apache.spark" %% "spark-hive" % sparkVersion % "provided",
-      "org.apache.spark" %% "spark-sql" % sparkVersion % "provided",
-      "org.apache.spark" %% "spark-core" % sparkVersion % "provided",
-      "org.apache.spark" %% "spark-catalyst" % sparkVersion % "provided",
-
-      // Test deps
-      "org.scalatest" %% "scalatest" % "3.2.9" % "test",
-      "org.scalatestplus" %% "scalacheck-1-15" % "3.2.9.0" % "test",
-      "junit" % "junit" % "4.12" % "test",
-      "com.novocode" % "junit-interface" % "0.11" % "test",
-      "org.apache.spark" %% "spark-catalyst" % sparkVersion % "test" classifier "tests",
-      "org.apache.spark" %% "spark-core" % sparkVersion % "test" classifier "tests",
-      "org.apache.spark" %% "spark-sql" % sparkVersion % "test" classifier "tests",
-      "org.apache.spark" %% "spark-hive" % sparkVersion % "test" classifier "tests",
-      */
-
-      /*
-      // ------------------------------------------------
-      // ------ COPIED VERBATIM FROM GOLDEN TABLES  -----
-      // ------------------------------------------------
-      // IntelliJ output (when running test)
-      //    An exception or error caused a run to abort: 'void org.apache.hadoop.security.HadoopKerberosName.setRuleMechanism(java.lang.String)'
-      //    java.lang.NoSuchMethodError: 'void org.apache.hadoop.security.HadoopKerberosName.setRuleMechanism(java.lang.String)'
-      // SBT output
-      // Test Dependencies (when running test)
-      //    23/03/24 22:07:48 WARN SparkSession: Cannot use io.delta.sql.DeltaSparkSessionExtension to configure session extensions.
-      //    java.lang.ClassNotFoundException: io.delta.sql.DeltaSparkSessionExtension
-      "org.scalatest" %% "scalatest" % "3.1.0" % "test",
-      "org.apache.spark" % "spark-sql_2.12" % "3.2.0" % "test",
-      "io.delta" % "delta-core_2.12" % "1.1.0" % "test",
-      "commons-io" % "commons-io" % "2.8.0" % "test",
-      "org.apache.spark" % "spark-catalyst_2.12" % "3.2.0" % "test" classifier "tests",
-      "org.apache.spark" % "spark-core_2.12" % "3.2.0" % "test" classifier "tests",
-      "org.apache.spark" % "spark-sql_2.12" % "3.2.0" % "test" classifier "tests"
-      */
-
-      // Verbatim from golden tables, trying out different test / classifier tests combinations
-      // test and classifier tests -> Cause: java.lang.ClassNotFoundException: delta.DefaultSource
-      // just test -> object QueryTest is not a member of package org.apache.spark.sql
-      // just classifier tests ->  Symbol 'type org.apache.spark.sql.SparkSession' is missing from the classpath.
-      //      "io.delta" % "delta-core_2.12" % "1.1.0" % "test",
-      //      "org.apache.spark" % "spark-catalyst_2.12" % "3.2.0" % "test",
-      //      "org.apache.spark" % "spark-core_2.12" % "3.2.0" % "test",
-      //      "org.apache.spark" % "spark-sql_2.12" % "3.2.0" % "test",
-      //
-      //      "io.delta" % "delta-core_2.12" % "1.1.0" % "test" classifier "tests",
-      //      "org.apache.spark" % "spark-catalyst_2.12" % "3.2.0" % "test" classifier "tests",
-      //      "org.apache.spark" % "spark-core_2.12" % "3.2.0" % "test" classifier "tests",
-      //      "org.apache.spark" % "spark-sql_2.12" % "3.2.0" % "test" classifier "tests"
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.5", // ObjectMapper
+
+      "org.scalatest" %% "scalatest" % "3.2.15" % "test",
+      "io.delta" %% "delta-core" % "2.2.0" % "test",
+      "org.apache.spark" %% "spark-sql" % "3.3.2" % "test", // SparkSession
+      "org.apache.spark" %% "spark-sql" % "3.3.2" % "test" classifier "tests",
+      "org.apache.spark" %% "spark-core" % "3.3.2" % "test" classifier "tests",
+      "org.apache.spark" %% "spark-catalyst" % "3.3.2" % "test" classifier "tests",
     )
   )
@@ -7,5 +7,5 @@
   typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   sbt-plugin-releases: https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
-  bintray-spark-packages: https://dl.bintray.com/spark-packages/maven/
+  repos-spark-packages: https://repos.spark-packages.org
   typesafe-releases: http://repo.typesafe.com/typesafe/releases/