Upgrades to spark 4.0.1

gradle/java-publication.gradle

@@ -7,13 +7,13 @@ def licenseSpec = copySpec {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
     with licenseSpec
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier 'javadoc'
+    archiveClassifier ='javadoc'
     from tasks.javadoc
     with licenseSpec
 }
@@ -35,7 +35,7 @@ publishing {
             artifact sourcesJar
             artifact javadocJar
 
-            artifactId = project.archivesBaseName
+            artifactId = project.base.archivesName.get()
 
             pom {
                 name = artifactId

gradle/versions.gradle

@@ -1,13 +1,10 @@
-import org.gradle.util.VersionNumber
-
 ext {
-    scalaVersion = findProperty("scalaVersion") ?: "2.13.14"
+    scalaVersion = findProperty("scalaVersion") ?: "2.13.17"
     println "Scala version: " + scalaVersion
 
     // Get the short Scala version: if scalaVersion == "X.Y.Z", then scalaVersionShort == "X.Y"
-    scalaVersionShort = VersionNumber.parse(scalaVersion).getMajor() + "." +
-            VersionNumber.parse(scalaVersion).getMinor()
+    scalaVersionShort = scalaVersion.substring(0, scalaVersion.lastIndexOf('.'))
 
-    sparkVersion = findProperty("sparkVersion") ?: "3.5.5"
+    sparkVersion = findProperty("sparkVersion") ?: "4.0.1"
     println "Spark version: " + sparkVersion
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists