From e9e08d6559443b8c82d5ba7b45f4bb7c6ec44bb1 Mon Sep 17 00:00:00 2001 From: Paul King Date: Tue, 12 Dec 2023 17:22:06 +1000 Subject: [PATCH] build tweaks plus bump spark version --- subprojects/ChartUtil/{ChartUtil.gradle => build.gradle} | 0 .../{DeepLearningMxnet.gradle => build.gradle} | 0 .../{HousePricesBeam.gradle => build.gradle} | 0 .../{HousePricesCamel.gradle => build.gradle} | 0 .../{HousePricesGPars.gradle => build.gradle} | 0 .../{HousePricesGroovyFX.gradle => build.gradle} | 0 .../{HousePricesIgnite.gradle => build.gradle} | 0 .../{HousePricesSpark.gradle => build.gradle} | 7 +------ subprojects/Iris/{Iris.gradle => build.gradle} | 0 .../IrisGraalVM/{IrisGraalVM.gradle => build.gradle} | 0 .../{LanguageProcessing.gradle => build.gradle} | 0 .../{LanguageProcessingDjl.gradle => build.gradle} | 0 .../{LanguageProcessingNLPCraft.gradle => build.gradle} | 0 .../{LanguageProcessingSparkNLP.gradle => build.gradle} | 4 ++-- subprojects/Mnist/{Mnist.gradle => build.gradle} | 0 subprojects/Whiskey/{Whiskey.gradle => build.gradle} | 0 .../WhiskeyIgnite/{WhiskeyIgnite.gradle => build.gradle} | 0 .../WhiskeySpark/{WhiskeySpark.gradle => build.gradle} | 7 +------ .../WhiskeyWayang/{WhiskeyWayang.gradle => build.gradle} | 7 +++++-- 19 files changed, 9 insertions(+), 16 deletions(-) rename subprojects/ChartUtil/{ChartUtil.gradle => build.gradle} (100%) rename subprojects/DeepLearningMxnet/{DeepLearningMxnet.gradle => build.gradle} (100%) rename subprojects/HousePricesBeam/{HousePricesBeam.gradle => build.gradle} (100%) rename subprojects/HousePricesCamel/{HousePricesCamel.gradle => build.gradle} (100%) rename subprojects/HousePricesGPars/{HousePricesGPars.gradle => build.gradle} (100%) rename subprojects/HousePricesGroovyFX/{HousePricesGroovyFX.gradle => build.gradle} (100%) rename subprojects/HousePricesIgnite/{HousePricesIgnite.gradle => build.gradle} (100%) rename subprojects/HousePricesSpark/{HousePricesSpark.gradle => build.gradle} (95%) rename subprojects/Iris/{Iris.gradle => build.gradle} (100%) rename subprojects/IrisGraalVM/{IrisGraalVM.gradle => build.gradle} (100%) rename subprojects/LanguageProcessing/{LanguageProcessing.gradle => build.gradle} (100%) rename subprojects/LanguageProcessingDjl/{LanguageProcessingDjl.gradle => build.gradle} (100%) rename subprojects/LanguageProcessingNLPCraft/{LanguageProcessingNLPCraft.gradle => build.gradle} (100%) rename subprojects/LanguageProcessingSparkNLP/{LanguageProcessingSparkNLP.gradle => build.gradle} (95%) rename subprojects/Mnist/{Mnist.gradle => build.gradle} (100%) rename subprojects/Whiskey/{Whiskey.gradle => build.gradle} (100%) rename subprojects/WhiskeyIgnite/{WhiskeyIgnite.gradle => build.gradle} (100%) rename subprojects/WhiskeySpark/{WhiskeySpark.gradle => build.gradle} (95%) rename subprojects/WhiskeyWayang/{WhiskeyWayang.gradle => build.gradle} (93%) diff --git a/subprojects/ChartUtil/ChartUtil.gradle b/subprojects/ChartUtil/build.gradle similarity index 100% rename from subprojects/ChartUtil/ChartUtil.gradle rename to subprojects/ChartUtil/build.gradle diff --git a/subprojects/DeepLearningMxnet/DeepLearningMxnet.gradle b/subprojects/DeepLearningMxnet/build.gradle similarity index 100% rename from subprojects/DeepLearningMxnet/DeepLearningMxnet.gradle rename to subprojects/DeepLearningMxnet/build.gradle diff --git a/subprojects/HousePricesBeam/HousePricesBeam.gradle b/subprojects/HousePricesBeam/build.gradle similarity index 100% rename from subprojects/HousePricesBeam/HousePricesBeam.gradle rename to subprojects/HousePricesBeam/build.gradle diff --git a/subprojects/HousePricesCamel/HousePricesCamel.gradle b/subprojects/HousePricesCamel/build.gradle similarity index 100% rename from subprojects/HousePricesCamel/HousePricesCamel.gradle rename to subprojects/HousePricesCamel/build.gradle diff --git a/subprojects/HousePricesGPars/HousePricesGPars.gradle b/subprojects/HousePricesGPars/build.gradle similarity index 100% rename from subprojects/HousePricesGPars/HousePricesGPars.gradle rename to subprojects/HousePricesGPars/build.gradle diff --git a/subprojects/HousePricesGroovyFX/HousePricesGroovyFX.gradle b/subprojects/HousePricesGroovyFX/build.gradle similarity index 100% rename from subprojects/HousePricesGroovyFX/HousePricesGroovyFX.gradle rename to subprojects/HousePricesGroovyFX/build.gradle diff --git a/subprojects/HousePricesIgnite/HousePricesIgnite.gradle b/subprojects/HousePricesIgnite/build.gradle similarity index 100% rename from subprojects/HousePricesIgnite/HousePricesIgnite.gradle rename to subprojects/HousePricesIgnite/build.gradle diff --git a/subprojects/HousePricesSpark/HousePricesSpark.gradle b/subprojects/HousePricesSpark/build.gradle similarity index 95% rename from subprojects/HousePricesSpark/HousePricesSpark.gradle rename to subprojects/HousePricesSpark/build.gradle index 92070fb..2382e59 100644 --- a/subprojects/HousePricesSpark/HousePricesSpark.gradle +++ b/subprojects/HousePricesSpark/build.gradle @@ -16,15 +16,10 @@ apply plugin: 'groovy' apply plugin: 'application' -repositories { - mavenCentral() -// mavenLocal() -} - ext { appName = 'HousePricesSpark' sparkVariant = '2.12' - sparkVersion = '3.4.0' + sparkVersion = '3.5.0' } application { diff --git a/subprojects/Iris/Iris.gradle b/subprojects/Iris/build.gradle similarity index 100% rename from subprojects/Iris/Iris.gradle rename to subprojects/Iris/build.gradle diff --git a/subprojects/IrisGraalVM/IrisGraalVM.gradle b/subprojects/IrisGraalVM/build.gradle similarity index 100% rename from subprojects/IrisGraalVM/IrisGraalVM.gradle rename to subprojects/IrisGraalVM/build.gradle diff --git a/subprojects/LanguageProcessing/LanguageProcessing.gradle b/subprojects/LanguageProcessing/build.gradle similarity index 100% rename from subprojects/LanguageProcessing/LanguageProcessing.gradle rename to subprojects/LanguageProcessing/build.gradle diff --git a/subprojects/LanguageProcessingDjl/LanguageProcessingDjl.gradle b/subprojects/LanguageProcessingDjl/build.gradle similarity index 100% rename from subprojects/LanguageProcessingDjl/LanguageProcessingDjl.gradle rename to subprojects/LanguageProcessingDjl/build.gradle diff --git a/subprojects/LanguageProcessingNLPCraft/LanguageProcessingNLPCraft.gradle b/subprojects/LanguageProcessingNLPCraft/build.gradle similarity index 100% rename from subprojects/LanguageProcessingNLPCraft/LanguageProcessingNLPCraft.gradle rename to subprojects/LanguageProcessingNLPCraft/build.gradle diff --git a/subprojects/LanguageProcessingSparkNLP/LanguageProcessingSparkNLP.gradle b/subprojects/LanguageProcessingSparkNLP/build.gradle similarity index 95% rename from subprojects/LanguageProcessingSparkNLP/LanguageProcessingSparkNLP.gradle rename to subprojects/LanguageProcessingSparkNLP/build.gradle index f178946..789965e 100644 --- a/subprojects/LanguageProcessingSparkNLP/LanguageProcessingSparkNLP.gradle +++ b/subprojects/LanguageProcessingSparkNLP/build.gradle @@ -24,7 +24,7 @@ repositories { ext { appName = 'DetectEntities_SparkNLP' sparkVariant = '2.12' - sparkVersion = '3.3.1' + sparkVersion = '3.4.0' } application { @@ -42,7 +42,7 @@ dependencies { exclude(group: 'org.apache.spark', module: 'spark-graphx_2.12') exclude(group: 'com.fasterxml.jackson', module: 'jackson-bom') } - implementation('com.johnsnowlabs.nlp:spark-nlp_2.12:4.2.4') { + implementation('com.johnsnowlabs.nlp:spark-nlp_2.12:4.4.3') { exclude(group: 'com.github.universal-automata', module: 'liblevenshtein') exclude(group: 'com.navigamez', module: 'greex') } diff --git a/subprojects/Mnist/Mnist.gradle b/subprojects/Mnist/build.gradle similarity index 100% rename from subprojects/Mnist/Mnist.gradle rename to subprojects/Mnist/build.gradle diff --git a/subprojects/Whiskey/Whiskey.gradle b/subprojects/Whiskey/build.gradle similarity index 100% rename from subprojects/Whiskey/Whiskey.gradle rename to subprojects/Whiskey/build.gradle diff --git a/subprojects/WhiskeyIgnite/WhiskeyIgnite.gradle b/subprojects/WhiskeyIgnite/build.gradle similarity index 100% rename from subprojects/WhiskeyIgnite/WhiskeyIgnite.gradle rename to subprojects/WhiskeyIgnite/build.gradle diff --git a/subprojects/WhiskeySpark/WhiskeySpark.gradle b/subprojects/WhiskeySpark/build.gradle similarity index 95% rename from subprojects/WhiskeySpark/WhiskeySpark.gradle rename to subprojects/WhiskeySpark/build.gradle index 9ce52fd..31d6778 100644 --- a/subprojects/WhiskeySpark/WhiskeySpark.gradle +++ b/subprojects/WhiskeySpark/build.gradle @@ -16,15 +16,10 @@ apply plugin: 'groovy' apply plugin: 'application' -repositories { - mavenCentral() -// mavenLocal() -} - ext { appName = 'WhiskeySpark' sparkVariant = '2.12' - sparkVersion = '3.4.0' + sparkVersion = '3.5.0' } application { diff --git a/subprojects/WhiskeyWayang/WhiskeyWayang.gradle b/subprojects/WhiskeyWayang/build.gradle similarity index 93% rename from subprojects/WhiskeyWayang/WhiskeyWayang.gradle rename to subprojects/WhiskeyWayang/build.gradle index b461120..2a47c85 100644 --- a/subprojects/WhiskeyWayang/WhiskeyWayang.gradle +++ b/subprojects/WhiskeyWayang/build.gradle @@ -18,6 +18,9 @@ apply plugin: 'application' repositories { mavenCentral() + maven { + url 'https://repository.apache.org/content/repositories/orgapachewayang-1017' + } } ext.appName = 'WhiskeyWayang' @@ -34,14 +37,14 @@ tasks.named('run').configure { } ext { - wayangVersion = '0.6.0' + wayangVersion = '0.7.1' hadoopVersion = '3.3.5' scalaMajorVersion = '2.12' sparkVersion = '3.4.0' } dependencies { - implementation "org.apache.groovy:groovy:$groovy4Version" + implementation "org.apache.groovy:groovy:5.0.0-alpha-1" implementation "org.apache.wayang:wayang-api-scala-java_$scalaMajorVersion:$wayangVersion" implementation "org.apache.wayang:wayang-java:$wayangVersion" implementation("org.apache.wayang:wayang-spark_$scalaMajorVersion:$wayangVersion") {