build tweaks plus bump spark version

paulk-asert · Dec 12, 2023 · e9e08d6 · e9e08d6
1 parent 56eaec7
commit e9e08d6
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 16 deletions.
diff --git a/subprojects/ChartUtil/ChartUtil.gradle → subprojects/ChartUtil/build.gradle b/subprojects/ChartUtil/ChartUtil.gradle → subprojects/ChartUtil/build.gradle
diff --git a/...eepLearningMxnet/DeepLearningMxnet.gradle → subprojects/DeepLearningMxnet/build.gradle b/...eepLearningMxnet/DeepLearningMxnet.gradle → subprojects/DeepLearningMxnet/build.gradle
diff --git a/...ts/HousePricesBeam/HousePricesBeam.gradle → subprojects/HousePricesBeam/build.gradle b/...ts/HousePricesBeam/HousePricesBeam.gradle → subprojects/HousePricesBeam/build.gradle
diff --git a/.../HousePricesCamel/HousePricesCamel.gradle → subprojects/HousePricesCamel/build.gradle b/.../HousePricesCamel/HousePricesCamel.gradle → subprojects/HousePricesCamel/build.gradle
diff --git a/.../HousePricesGPars/HousePricesGPars.gradle → subprojects/HousePricesGPars/build.gradle b/.../HousePricesGPars/HousePricesGPars.gradle → subprojects/HousePricesGPars/build.gradle
diff --git a/...PricesGroovyFX/HousePricesGroovyFX.gradle → subprojects/HousePricesGroovyFX/build.gradle b/...PricesGroovyFX/HousePricesGroovyFX.gradle → subprojects/HousePricesGroovyFX/build.gradle
diff --git a/...ousePricesIgnite/HousePricesIgnite.gradle → subprojects/HousePricesIgnite/build.gradle b/...ousePricesIgnite/HousePricesIgnite.gradle → subprojects/HousePricesIgnite/build.gradle
diff --git a/.../HousePricesSpark/HousePricesSpark.gradle → subprojects/HousePricesSpark/build.gradle b/.../HousePricesSpark/HousePricesSpark.gradle → 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 → subprojects/Iris/build.gradle b/subprojects/Iris/Iris.gradle → subprojects/Iris/build.gradle
diff --git a/subprojects/IrisGraalVM/IrisGraalVM.gradle → subprojects/IrisGraalVM/build.gradle b/subprojects/IrisGraalVM/IrisGraalVM.gradle → subprojects/IrisGraalVM/build.gradle
diff --git a/...guageProcessing/LanguageProcessing.gradle → subprojects/LanguageProcessing/build.gradle b/...guageProcessing/LanguageProcessing.gradle → subprojects/LanguageProcessing/build.gradle
diff --git a/...rocessingDjl/LanguageProcessingDjl.gradle → ...ojects/LanguageProcessingDjl/build.gradle b/...rocessingDjl/LanguageProcessingDjl.gradle → ...ojects/LanguageProcessingDjl/build.gradle
diff --git a/...LPCraft/LanguageProcessingNLPCraft.gradle → ...s/LanguageProcessingNLPCraft/build.gradle b/...LPCraft/LanguageProcessingNLPCraft.gradle → ...s/LanguageProcessingNLPCraft/build.gradle
diff --git a/...parkNLP/LanguageProcessingSparkNLP.gradle → ...s/LanguageProcessingSparkNLP/build.gradle b/...parkNLP/LanguageProcessingSparkNLP.gradle → ...s/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 → subprojects/Mnist/build.gradle b/subprojects/Mnist/Mnist.gradle → subprojects/Mnist/build.gradle
diff --git a/subprojects/Whiskey/Whiskey.gradle → subprojects/Whiskey/build.gradle b/subprojects/Whiskey/Whiskey.gradle → subprojects/Whiskey/build.gradle
diff --git a/...ojects/WhiskeyIgnite/WhiskeyIgnite.gradle → subprojects/WhiskeyIgnite/build.gradle b/...ojects/WhiskeyIgnite/WhiskeyIgnite.gradle → subprojects/WhiskeyIgnite/build.gradle
diff --git a/subprojects/WhiskeySpark/WhiskeySpark.gradle → subprojects/WhiskeySpark/build.gradle b/subprojects/WhiskeySpark/WhiskeySpark.gradle → 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/...ojects/WhiskeyWayang/WhiskeyWayang.gradle → subprojects/WhiskeyWayang/build.gradle b/...ojects/WhiskeyWayang/WhiskeyWayang.gradle → 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") {