bump wayang to 1.0.0, gradle to latest version

Author: paulk-asert

gradle.properties

@@ -35,7 +35,7 @@ flinkMlVersion          = 2.3.0
 flinkStatefunVersion    = 3.2.0
 groovy3Version          = 3.0.21
 groovy4Version          = 4.0.21
-groovy5Version          = 5.0.0-alpha-8
+groovy5Version          = 5.0.0-alpha-12
 igniteVersion           = 2.16.0
 igniteMlVersion         = 2.15.0
 jacksonVersion          = 2.17.1
@@ -51,7 +51,7 @@ opencsvVersion          = 5.9
 opennlpJdk8Version      = 1.9.4
 opennlpJdk11Version     = 2.2.0
 opennlpLatestVersion    = 2.3.3
-slf4jVersion            = 2.0.13
+slf4jVersion            = 2.0.16
 smilePreviousVersion    = 3.0.3
 smileVersion            = 3.1.1
 tablesawVersion         = 0.43.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -16,29 +16,30 @@
 apply plugin: 'groovy'
 
 repositories {
-    mavenLocal() // until next wayang release of ml4all, build latest version and install locally
+//    mavenLocal() // until next wayang release of ml4all, build latest version and install locally
     mavenCentral()
 //    maven {
-//        url 'https://repository.apache.org/content/repositories/orgapachewayang-1017'
+//        url 'https://repository.apache.org/content/repositories/orgapachewayang-1025'
 //    }
 }
 
 ext {
-    wayangVersion = '0.7.1'
+    wayangVersion = '1.0.0'
     hadoopVersion = '3.4.0'
     scalaMajorVersion = '2.12'
-    sparkVersion = '3.5.1'
+    sparkVersion = '3.5.4'
 }
 
 dependencies {
     implementation "org.apache.groovy:groovy:$groovy5Version"
-    implementation "org.apache.wayang:wayang-api-scala-java_$scalaMajorVersion:$wayangVersion"
+    implementation "org.apache.wayang:wayang-api-scala-java:$wayangVersion"
     implementation "org.apache.wayang:wayang-java:$wayangVersion"
     implementation("org.apache.wayang:wayang-ml4all:$wayangVersion") {
         exclude(group: 'org.apache.spark', module: 'spark-graphx_2.12')
         exclude(group: 'org.apache.spark', module: 'spark-mllib_2.12')
+        exclude(group: 'org.apache.hadoop')
     }
-    implementation("org.apache.wayang:wayang-spark_$scalaMajorVersion:$wayangVersion") {
+    implementation("org.apache.wayang:wayang-spark:$wayangVersion") {
         transitive = false
     }
     implementation "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
@@ -83,8 +84,8 @@ FileUtil.baseNames(sourceSets.main.allSource.files).each { name ->
         description "Run ${name}.groovy as a JVM application/Groovy script"
         classpath = sourceSets.main.runtimeClasspath
         mainClass = name
-        if (JavaVersion.current().java11Compatible) {
-            jvmArgs ['--add-exports=java.base/sun.nio.ch=ALL-UNNAMED']
+        if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
+            jvmArgs '--add-exports=java.base/sun.nio.ch=ALL-UNNAMED'
         }
     }
     runAll.configure {

subprojects/WhiskeyWayang/build.gradle

@@ -57,7 +57,9 @@ class SelectNearestCentroid implements ExtendedSerializableFunction<Point, Point
         var minDistance = Double.POSITIVE_INFINITY
         var nearestCentroidId = -1
         for (c in centroids) {
-            var distance = sqrt(p.pts.indices.collect{ p.pts[it] - c.pts[it] }.sum{ it ** 2 } as double)
+            var distance = sqrt(p.pts.indices
+                .collect{ p.pts[it] - c.pts[it] }
+                .sum{ it ** 2 } as double)
             if (distance < minDistance) {
                 minDistance = distance
                 nearestCentroidId = c.cluster
@@ -90,7 +92,7 @@ var randomPoint = { (0..<dims).collect { r.nextGaussian() + 2 } as double[] }
 var initPts = (1..k).collect(randomPoint)
 
 var context = new WayangContext()
-    .withPlugin(Java.basicPlugin())
+//    .withPlugin(Java.basicPlugin())
     .withPlugin(Spark.basicPlugin())
 var planBuilder = new JavaPlanBuilder(context, "KMeans ($url, k=$k, iterations=$iterations)")
 
@@ -111,7 +113,7 @@ var finalCentroids = initialCentroids.repeat(iterations, currentCentroids ->
 
 println 'Centroids:'
 finalCentroids.each { c ->
-    println "Cluster $c.cluster: ${c.pts.collect { sprintf '%.2f', it }.join(', ')}"
+    println "Cluster $c.cluster: ${c.pts.collect('%.2f'::formatted).join(', ')}"
 }
 
 println()
@@ -120,7 +122,7 @@ var allocations = pointsData.withIndex()
     .collect{ pt, idx -> [allocator.apply(pt).cluster, distilleries[idx]] }
     .groupBy{ cluster, ds -> "Cluster $cluster" }
     .collectValues{ v -> v.collect{ it[1] } }
-    .sort{ e1, e2 -> e1.key <=> e2.key }
+    .sort{ it.key }
 allocations.each{ c, ds -> println "$c (${ds.size()} members): ${ds.join(', ')}" }
 /*
 Centroids:

subprojects/WhiskeyWayang/src/main/groovy/WhiskeyWayang.groovy

@@ -65,7 +65,7 @@ var plan = new ML4allPlan(
 
 var model = plan.execute('file:' + url, context)
 model.getByKey("centers").eachWithIndex { center, idx ->
-    var pts = center.collect { sprintf '%.2f', it }.join(', ')
+    var pts = center.collect('%.2f'::formatted).join(', ')
     println "Cluster$idx: $pts"
 }