build: remove scala 2.12 and mentions of spark 3

.snyk

@@ -7,10 +7,14 @@ ignore:
         reason: Spark Core is provided dependency
         expires: 2050-01-01T00:00:00.000Z
         created: 2025-09-18T08:33:31.014
-    - 'org.apache.spark:spark-core_2.12':
         <<: *spark-core
-  'SNYK-JAVA-COMFASTERXMLJACKSONCORE-7569538': *spark-core-exclusions
-  'SNYK-JAVA-COMGOOGLEPROTOBUF-8055227': *spark-core-exclusions
-  'SNYK-JAVA-ORGAPACHEIVY-5847858': *spark-core-exclusions
-  'SNYK-JAVA-ORGAPACHEZOOKEEPER-5961102': *spark-core-exclusions
+  'SNYK-JAVA-ORGGLASSFISHJERSEYCORE-14049172': *spark-core-exclusions
+  'SNYK-JAVA-IOAIRLIFT-14412703': &spark-sql-exclusions
+    - 'org.apache.spark:spark-sql_2.13': &spark-sql
+        reason: Spark SQL is provided dependency
+        expires: 2050-01-01T00:00:00.000Z
+        created: 2025-09-18T08:35:12.345
+        <<: *spark-sql
+  'SNYK-JAVA-ORGLZ4-14151788': *spark-core-exclusions
+  'SNYK-JAVA-ORGLZ4-14219384': *spark-core-exclusions
 patch: {}

README.md

@@ -12,16 +12,14 @@ The documentation for Neo4j Connector for Apache Spark lives at https://github.c
 
 ## Building for Spark 3
 
-You can build for Spark 3.x with both Scala 2.12 and Scala 2.13
+You can build for Spark 4.x with Scala 2.13
 
 ```
-./maven-release.sh package 2.12
 ./maven-release.sh package 2.13
 ```
 
 These commands will generate the corresponding targets
-* `spark-3/target/neo4j-connector-apache-spark_2.12-<version>_for_spark_3.jar`
-* `spark-3/target/neo4j-connector-apache-spark_2.13-<version>_for_spark_3.jar`
+* `spark/target/neo4j-connector-apache-spark_2.13-<version>_for_spark_3.jar`
 
 
 ## Integration with Apache Spark Applications

common/LICENSES.txt

@@ -4,7 +4,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
 
 ------------------------------------------------------------------------------
 Apache Software License, Version 2.0
-  IntelliJ IDEA Annotations
+  JetBrains Java Annotations
   Kotlin Stdlib
   Neo4j Bolt Connection (Bolt Provider reference impl)
   Neo4j Bolt Connection (Pooled Source impl)

common/NOTICE.txt

@@ -19,7 +19,7 @@ Third-party licenses
 --------------------
 
 Apache Software License, Version 2.0
-  IntelliJ IDEA Annotations
+  JetBrains Java Annotations
   Kotlin Stdlib
   Neo4j Bolt Connection (Bolt Provider reference impl)
   Neo4j Bolt Connection (Pooled Source impl)

common/src/test/scala/org/neo4j/spark/util/ValidationsTest.scala

@@ -30,7 +30,7 @@ class ValidationsTest extends SparkConnectorScalaBaseTSE {
       .map { _.version }
       .getOrElse("UNKNOWN")
     try {
-      Validations.validate(ValidateSparkMinVersion("3.10000"))
+      Validations.validate(ValidateSparkMinVersion("4.10000"))
       fail(s"should be thrown a ${classOf[IllegalArgumentException].getName}")
     } catch {
       case e: IllegalArgumentException =>

jreleaser.yml

@@ -73,7 +73,7 @@ assemble:
           output: .
           includes:
             - '{{projectName}}-{{projectVersion}}*.jar'
-      templateDirectory: spark-3/src/jreleaser/assemblers/zip
+      templateDirectory: spark/src/jreleaser/assemblers/zip
 
 hooks:
   script:
@@ -88,16 +88,16 @@ hooks:
           includes: [ "assemble" ]
         matrix:
           vars:
-            scala: [ "2.12", "2.13" ]
+            scala: [ "2.13" ]
         continueOnError: false
         verbose: true
         shell: BASH
         run: |
           mkdir artifacts || true
           ./maven-release.sh deploy {{matrix.scala}} default::file://{{basedir}}/target/{{matrix.scala}}/maven-artifacts
           cp -r {{basedir}}/target/{{matrix.scala}}/maven-artifacts artifacts/
-          cp -r {{basedir}}/spark-3/target/{{projectName}}*.zip artifacts/
-          cp -r {{basedir}}/spark-3/target/{{projectName}}*.jar artifacts/
+          cp -r {{basedir}}/spark/target/{{projectName}}*.zip artifacts/
+          cp -r {{basedir}}/spark/target/{{projectName}}*.jar artifacts/
 
 signing:
   active: ALWAYS

maven-release.sh

@@ -12,7 +12,7 @@ exit_script() {
   mv -f pom.xml.bak pom.xml
   mv -f common/pom.xml.bak common/pom.xml
   mv -f test-support/pom.xml.bak test-support/pom.xml
-  mv -f spark-3/pom.xml.bak spark-3/pom.xml
+  mv -f spark/pom.xml.bak spark/pom.xml
   trap - SIGINT SIGTERM # clear the trap
   kill -- -$$ || true # Sends SIGTERM to child/sub processes
 }
@@ -48,7 +48,7 @@ SPARK_PACKAGES_VERSION="${PROJECT_VERSION}-s_$SCALA_VERSION"
 cp pom.xml pom.xml.bak
 cp common/pom.xml common/pom.xml.bak
 cp test-support/pom.xml test-support/pom.xml.bak
-cp spark-3/pom.xml spark-3/pom.xml.bak
+cp spark/pom.xml spark/pom.xml.bak
 
 ./mvnw -B versions:set -DnewVersion=${PROJECT_VERSION}_for_spark_${SPARK_VERSION} -DgenerateBackupPoms=false
 
@@ -61,11 +61,11 @@ sed_i "s/<artifactId>neo4j-connector-apache-spark_common<\/artifactId>/<artifact
 sed_i "s/<artifactId>neo4j-connector-apache-spark_parent<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_parent<\/artifactId>/" "common/pom.xml"
 sed_i "s/<artifactId>neo4j-connector-apache-spark_test-support<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_test-support<\/artifactId>/" "common/pom.xml"
 
-sed_i "s/<artifactId>neo4j-connector-apache-spark<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}<\/artifactId>/" "spark-3/pom.xml"
-sed_i "s/<artifactId>neo4j-connector-apache-spark_parent<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_parent<\/artifactId>/" "spark-3/pom.xml"
-sed_i "s/<artifactId>neo4j-connector-apache-spark_common<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_common<\/artifactId>/" "spark-3/pom.xml"
-sed_i "s/<artifactId>neo4j-connector-apache-spark_test-support<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_test-support<\/artifactId>/" "spark-3/pom.xml"
-sed_i "s/<spark-packages.version\/>/<spark-packages.version>${SPARK_PACKAGES_VERSION}<\/spark-packages.version>/" "spark-3/pom.xml"
+sed_i "s/<artifactId>neo4j-connector-apache-spark<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}<\/artifactId>/" "spark/pom.xml"
+sed_i "s/<artifactId>neo4j-connector-apache-spark_parent<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_parent<\/artifactId>/" "spark/pom.xml"
+sed_i "s/<artifactId>neo4j-connector-apache-spark_common<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_common<\/artifactId>/" "spark/pom.xml"
+sed_i "s/<artifactId>neo4j-connector-apache-spark_test-support<\/artifactId>/<artifactId>neo4j-connector-apache-spark_${SCALA_VERSION}_test-support<\/artifactId>/" "spark/pom.xml"
+sed_i "s/<spark-packages.version\/>/<spark-packages.version>${SPARK_PACKAGES_VERSION}<\/spark-packages.version>/" "spark/pom.xml"
 
 # build
 ./mvnw -B clean "${GOAL}" -Dscala-"${SCALA_VERSION}" -DskipTests ${ALT_DEPLOYMENT_REPOSITORY}

pom.xml

@@ -31,7 +31,7 @@
     <modules>
         <module>common</module>
         <module>test-support</module>
-        <module>spark-3</module>
+        <module>spark</module>
     </modules>
     <scm>
         <url>https://github.com/neo4j/neo4j-spark-connector</url>
@@ -68,11 +68,11 @@
         <netty-bom.version>4.1.128.Final</netty-bom.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <scala-maven-plugin.version>4.9.6</scala-maven-plugin.version>
-        <scala.binary.version>2.12</scala.binary.version>
-        <scala.version>2.12.20</scala.version>
+        <scala.binary.version>2.13</scala.binary.version>
+        <scala.version>2.13.18</scala.version>
         <slf4j-api.version>2.0.17</slf4j-api.version>
         <sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
-        <spark.version>3.5.7</spark.version>
+        <spark.version>4.0.1</spark.version>
         <spotless-maven-plugin.version>3.0.0</spotless-maven-plugin.version>
         <surefire.jvm.args/>
         <testcontainers.version>2.0.2</testcontainers.version>

scripts/python/requirements.txt

@@ -1,4 +1,4 @@
-pyspark==3.5.5
+pyspark==4.0.1
 testcontainers[neo4j]
 six
 tzlocal==2.1

spark-3/src/main/scala/org/neo4j/spark/DataSource.scala → spark/src/main/scala/org/neo4j/spark/DataSource.scala

@@ -39,7 +39,7 @@ import java.util.UUID
 class DataSource extends TableProvider
     with DataSourceRegister {
 
-  Validations.validate(ValidateSparkMinVersion("3.3.0"))
+  Validations.validate(ValidateSparkMinVersion("4.0.0"))
 
   private val jobId: String = UUID.randomUUID().toString