diff --git a/gradle.properties b/gradle.properties index c248fa1..526e88d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,6 +33,7 @@ djlVersion = 0.28.0 groovy3Version = 3.0.21 groovy4Version = 4.0.21 igniteVersion = 2.16.0 +igniteMlVersion = 2.15.0 jacksonVersion = 2.17.1 jfreechartVersion = 1.5.4 junitVersion = 4.13.1 diff --git a/subprojects/HousePricesIgnite/build.gradle b/subprojects/HousePricesIgnite/build.gradle index c12bad8..2e934dc 100644 --- a/subprojects/HousePricesIgnite/build.gradle +++ b/subprojects/HousePricesIgnite/build.gradle @@ -37,14 +37,15 @@ tasks.named('run').configure { dependencies { implementation "org.apache.groovy:groovy:$groovy4Version" implementation "org.apache.ignite:ignite-core:$igniteVersion" - implementation "org.apache.ignite:ignite-ml:$igniteVersion" + implementation "org.apache.ignite:ignite-ml:$igniteMlVersion" runtimeOnly "org.apache.ignite:ignite-spring:$igniteVersion" runtimeOnly "org.slf4j:slf4j-simple:$slf4jVersion" implementation "tech.tablesaw:tablesaw-core:$tablesawVersion" + implementation "com.google.guava:guava:32.1.3-jre" // non-vulnerable dependency tablesaw-core } -task copyToLib(type: Copy) { - into "$buildDir/lib" +tasks.register('copyToLib', Copy) { + into layout.buildDirectory.dir('lib') from configurations.runtimeClasspath } diff --git a/subprojects/HousePricesSpark/build.gradle b/subprojects/HousePricesSpark/build.gradle index 8e7b795..9dff3d5 100644 --- a/subprojects/HousePricesSpark/build.gradle +++ b/subprojects/HousePricesSpark/build.gradle @@ -33,6 +33,8 @@ tasks.named('run').configure { dependencies { implementation "org.apache.groovy:groovy:$groovy4Version" implementation "org.apache.spark:spark-sql_$sparkVariant:$sparkVersion" + implementation "org.apache.avro:avro:1.11.3" // non-vulnerable dependency spark-sql + implementation "org.apache.avro:avro-mapred:1.11.3" // non-vulnerable dependency spark-sql implementation "org.apache.spark:spark-mllib_$sparkVariant:$sparkVersion" implementation "com.fasterxml.jackson:jackson-bom:$jacksonVersion" runtimeOnly "org.apache.spark:spark-core_$sparkVariant:$sparkVersion" diff --git a/subprojects/WhiskeyIgnite/build.gradle b/subprojects/WhiskeyIgnite/build.gradle index e148dcc..ef1ecfe 100644 --- a/subprojects/WhiskeyIgnite/build.gradle +++ b/subprojects/WhiskeyIgnite/build.gradle @@ -39,12 +39,10 @@ dependencies { implementation "org.apache.groovy:groovy:$groovy4Version" // implementation project(':ChartUtil') implementation "org.apache.ignite:ignite-core:$igniteVersion" - implementation "org.apache.ignite:ignite-ml:$igniteVersion" + implementation "org.apache.ignite:ignite-ml:$igniteMlVersion" runtimeOnly "org.apache.ignite:ignite-spring:$igniteVersion" runtimeOnly "org.slf4j:slf4j-simple:$slf4jVersion" implementation "org.apache.commons:commons-csv:$commonsCsvVersion" -// implementation "com.github.haifengl:smile-core:$smileVersion" -// runtimeOnly "org.bytedeco:openblas-platform:$openblasPlatformVersion" } tasks.register('versionInfo') {