Merge pull request #4811 from gchq/gradle_fixes2

Gradle fixes

Author: stroomdev66

Diff for: build.gradle

@@ -45,7 +45,7 @@ plugins {
 
     alias(libs.plugins.flyway) apply false
 
-    alias(libs.plugins.jdeps)
+//    alias(libs.plugins.jdeps)
 
 //    id 'org.javamodularity.moduleplugin' apply false
 
@@ -72,7 +72,7 @@ java {
 //if the project has a value for the passed property (i.e from the cmd line via -PpropName=xxx)
 //use that, else use a default value
 ext.getPropertyOrDefault = { propName, defaultValue ->
-    def val;
+    def val
     if (project.hasProperty(propName)
             && project.getProperty(propName) != "unspecified"
             && project.getProperty(propName) != "") {
@@ -82,7 +82,7 @@ ext.getPropertyOrDefault = { propName, defaultValue ->
         val = defaultValue
         logger.info("Property [$propName] has no value, using default value [$val]")
     }
-    return val;
+    return val
 }
 
 // Try to determine the jdbc url from local.yml so that when using
@@ -99,7 +99,7 @@ if (localYamlFile.exists()) {
     if (yamlVal != null) {
         // Strip all the param substitution stuff
         yamlVal = yamlVal.replaceAll('^\\$\\{STROOM_JDBC_DRIVER_URL:-', '')
-            .replaceAll('\\}$', '')
+                .replaceAll('\\}$', '')
         ext.jdbcUrl = yamlVal
         // Extract the schema name from the url
         ext.dbSchema = (yamlVal =~ /jdbc:mysql:\/\/[^:]+:[0-9]+\/([^?]+)\?.*/)[0][1]
@@ -127,7 +127,7 @@ ext.gwtCompilerProps = [
 //version numbers for libs that share version numbers, e.g. dropwizard-*, or for github repo release versions
 ext.versions = [
         //----------Stroom-----------------
-        stroom            : getPropertyOrDefault('version', 'SNAPSHOT').replaceFirst(/^v/, ""),
+        stroom: getPropertyOrDefault('version', 'SNAPSHOT').replaceFirst(/^v/, ""),
 ]
 
 // Defines the content packs that will be downloaded/copied for SetupSampleData,
@@ -293,7 +293,7 @@ subprojects {
             }
         }
 
-        reports.html.outputLocation = file("${reporting.baseDir}/${name}")
+        reports.html.outputLocation = file("${reporting.baseDirectory.getAsFile().get()}/${name}")
 
         afterSuite { descriptor, result ->
             if (descriptor != null
@@ -447,9 +447,9 @@ subprojects {
             }
         }
 
-        jdepsReport {
-            multiRelease = '15'
-        }
+//        jdepsReport {
+//            multiRelease = '15'
+//        }
     }
 
 
@@ -491,8 +491,8 @@ subprojects {
     // config files in config/checkstyle
 
     checkstyle {
-        ignoreFailures false
-        showViolations true
+        ignoreFailures = false
+        showViolations = true
         toolVersion = "10.4"
     }
 

Diff for: gradlew

@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

Diff for: stroom-app-gwt/build.gradle

@@ -81,17 +81,20 @@ dependencies {
     implementation libs.gwtp.mvp.client
     implementation libs.jackson.annotations
     implementation libs.jaxb.api.gwt
-    implementation libs.swagger.annotations // needed so gwt can compile the stroom-query code that contains swagger annotations
+    // needed so gwt can compile the stroom-query code that contains swagger annotations
+    implementation libs.swagger.annotations
     implementation libs.ws.rs.api.gwt
 
     gwtSourceImplementation libs.gin
     gwtSourceImplementation libs.gwt.user
     gwtSourceImplementation libs.gwtp.mvp.client
     gwtSourceImplementation libs.jaxb.api.gwt
-    gwtSourceImplementation libs.swagger.annotations // needed so gwt can compile the stroom-query code that contains swagger annotations
+    // needed so gwt can compile the stroom-query code that contains swagger annotations
+    gwtSourceImplementation libs.swagger.annotations
     gwtSourceImplementation libs.restygwt
     gwtSourceImplementation libs.ws.rs.api.gwt
 
+    gwtDevSourceImplementation project(':stroom-gwt')
     gwtDevSourceImplementation libs.gwt.dev
 
     jakartaTransformerImplementation libs.eclipse.transformer.cli
@@ -151,22 +154,22 @@ tasks.register('copySources') {
         println('  output: ' + transformedSourceDir)
         delete transformedSourceDir
 
-        javaexec {
+        providers.javaexec {
             classpath = files(sourceSets.jakartaTransformer.compileClasspath)
             mainClass = "org.eclipse.transformer.cli.TransformerCLI"
             args = [
                     inputProjectPath,
                     transformedSourceDir,
                     '-tr', propFilePath,
             ]
-        }
+        }.result.get()
         println("${Duration.between(start, Instant.now())}")
         start = Instant.now()
 
         delete allSourceDir
 
         println("copy dep jars => ${allSourceDir}")
-        sourceSets.gwtSource.compileClasspath.files.forEach {zipFile ->
+        sourceSets.gwtSource.compileClasspath.files.forEach { zipFile ->
             println('  ' + zipFile)
             copy {
                 from zipTree(zipFile)
@@ -202,7 +205,7 @@ tasks.register('compileSources', JavaCompile) {
 
 tasks.register('makeGwtSourceDirs') {
     dependsOn compileSources
-    group "gwt"
+    group = "gwt"
 
     doLast {
         def rsyncInputDir = "${gwtBuildDir}/rsync-input"
@@ -237,7 +240,7 @@ tasks.register('makeGwtSourceDirs') {
         // which it doesn't like. Rsync should only change the files that have actually changed
         // i.e. when doing superdev code changes.
         println "rsync ${rsyncInputDir} => ${rsyncOutputDir}"
-        exec {
+        providers.exec {
             executable = 'rsync'
             args = [
                     "--recursive",
@@ -246,7 +249,7 @@ tasks.register('makeGwtSourceDirs') {
                     "--stats",
                     rsyncInputDir + "/",
                     rsyncOutputDir]
-        }
+        }.result.get()
 
         println("${Duration.between(start, Instant.now())}")
         start = Instant.now()
@@ -255,7 +258,6 @@ tasks.register('makeGwtSourceDirs') {
         gwtSourceDirs = []
         // Add all of the library sources from the gwtSource source set defined above.
         gwtSourceDirs.addAll(sourceSets.gwtDevSource.compileClasspath)
-        gwtSourceDirs.addAll(project(':stroom-gwt').sourceSets.main.output.classesDirs)
         // Add the rsync clone of our transformed build
         gwtSourceDirs.add(rsyncOutputDir)
 
@@ -268,7 +270,7 @@ tasks.register('makeGwtSourceDirs') {
 
 tasks.register('gwtCompile', JavaExec) {
     dependsOn classes
-    group "gwt"
+    group = "gwt"
     dependsOn 'makeGwtSourceDirs'
 
     def module = 'stroom.app.App'
@@ -340,7 +342,7 @@ tasks.register('gwtCompile', JavaExec) {
 
 tasks.register('gwtDraftCompile', JavaExec) {
     dependsOn classes
-    group "gwt"
+    group = "gwt"
     dependsOn 'makeGwtSourceDirs'
 
     def module = 'stroom.app.AppSuperDevModeChrome'
@@ -403,7 +405,7 @@ tasks.register('gwtDraftCompile', JavaExec) {
 
 tasks.register('gwtSuperDevMode', JavaExec) {
     dependsOn classes
-    group "gwt"
+    group = "gwt"
     dependsOn 'makeGwtSourceDirs'
 
     def module = 'stroom.app.AppSuperDevModeChrome'
@@ -467,7 +469,7 @@ tasks.register('gwtSuperDevMode', JavaExec) {
 }
 
 tasks.register('gwtClean') {
-    group "gwt"
+    group = "gwt"
     doLast {
 //        println 'Deleting GWT unit cache: ' + unitCacheDir.toString()
 //        delete unitCacheDir

Diff for: stroom-app/build.gradle

@@ -29,18 +29,17 @@ ext.moduleName = 'stroom.app'
 def fatJarName = 'stroom-app-all.jar'
 def sendToStroomScriptVersion = 'send-to-stroom-v3.2.2-1'
 def releaseBuildDir = "${projectDir}/build/release"
-def configDefaultsFile = "${releaseBuildDir}/config/config-defaults.yml"
-def configSchemaFile = "${releaseBuildDir}/config/config-schema.yml"
 def stroomZipDistContentPacksDir = "${releaseBuildDir}/content_packs"
 def stroomDockerBuildDir = "${projectDir}/docker/build"
 def stroomDockerContentPacksDir = "${stroomDockerBuildDir}/content_packs"
 
 apply plugin: 'application'
 apply plugin: 'com.gradleup.shadow'
 apply plugin: "io.swagger.core.v3.swagger-gradle-plugin"
-apply plugin: "java"
 
-mainClassName = 'stroom.app.App'
+application {
+    mainClass = 'stroom.app.App'
+}
 
 dependencies {
     implementation project(':stroom-activity:stroom-activity-api')
@@ -378,7 +377,7 @@ shadowJar {
     dependsOn resolve
 
     // Allows us to build fat jars with lots of files
-    zip64 true
+    zip64 = true
 
     // Ensure we include the GWT and Rest generated resources.
     from './src/main/resources'
@@ -405,7 +404,7 @@ tasks.register('migrate', JavaExec) {
     dependsOn ':stroom-config:stroom-config-app:compileJava'
 
     classpath = sourceSets.main.runtimeClasspath
-    mainClass = mainClassName
+    mainClass = application.mainClass.get()
     args 'migrate', '../local.yml'
 }
 
@@ -633,15 +632,15 @@ tasks.register('copySupportingFiles', Copy) {
     into releaseBuildDir
 
     doLast {
-        exec {
+        providers.exec {
             // Move the banner.txt into bin where it is expected
             commandLine 'mv', "${releaseBuildDir}/banner.txt", "${releaseBuildDir}/bin/banner.txt"
-        }
+        }.result.get()
         // This is a sym-link so it seems to go into the zip with +x perms
         // which we don't want
-        //exec {
-        //commandLine 'chmod', '644', "${releaseBuildDir}/config/config.yml"
-        //}
+        //providers.exec {
+        //  commandLine 'chmod', '644', "${releaseBuildDir}/config/config.yml"
+        //}.result.get()
     }
 }
 
@@ -674,10 +673,10 @@ tasks.register('downloadSendArgs', Download) {
 tasks.register('makeSendExecutable') {
     dependsOn downloadSend
     doLast {
-        // The args script is sourced so doesn't need execute perms
-        exec {
+        providers.exec {
+            // The args script is sourced so doesn't need execute perms
             commandLine 'chmod', '+x', "${releaseBuildDir}/bin/send_to_stroom.sh"
-        }
+        }.result.get()
     }
 }
 
@@ -686,16 +685,6 @@ tasks.register('makeSendExecutable') {
 //into "${releaseBuildDir}/contentPacks"
 //}
 
-// Create an example yaml config file from the compile-time defaults
-tasks.register('generateConfigDefaultsYamlFile', JavaExec) {
-    dependsOn ':stroom-config:stroom-config-app:compileJava'
-    dependsOn ':stroom-config:stroom-config-app:compileTestJava'
-
-    classpath = project(':stroom-config:stroom-config-app').sourceSets.test.runtimeClasspath
-    mainClass = 'stroom.config.app.GenerateExpectedYaml'
-    args = [configDefaultsFile, configSchemaFile]
-}
-
 // Build the release distribution zip for stroom
 tasks.register('buildDistribution', Zip) {
 
@@ -707,7 +696,7 @@ tasks.register('buildDistribution', Zip) {
     dependsOn makeSendExecutable
     dependsOn downloadStroomContentForZipDist
     dependsOn generateConfigFiles
-    dependsOn generateConfigDefaultsYamlFile
+    dependsOn ':stroom-config:stroom-config-app:generateConfigDefaultsYamlFile'
 
     from releaseBuildDir
 }
@@ -717,12 +706,14 @@ tasks.register('buildDistribution', Zip) {
 def thisProject = project
 rootProject.subprojects { subProj ->
     //println "subProj ${subProj.name} project ${thisProject.name}"
-    if (!subProj.name.equals(thisProject.name)) {
-        subProj.tasks.withType(Test) { otherTestTask ->
-            //println "subProj ${subProj}, task ${it.name} thisProject.tasks.test ${thisProject.tasks.test}"
-            thisProject.tasks.test.mustRunAfter otherTestTask.path
-            thisProject.tasks.jar.mustRunAfter otherTestTask.path
-            thisProject.tasks.shadowJar.mustRunAfter otherTestTask.path
+    if (subProj.name != thisProject.name) {
+        subProj.tasks.withType(Test).tap {
+            configureEach { otherTestTask ->
+                //println "subProj ${subProj}, task ${it.name} thisProject.tasks.test ${thisProject.tasks.test}"
+                thisProject.tasks.test.mustRunAfter otherTestTask.path
+                thisProject.tasks.jar.mustRunAfter otherTestTask.path
+                thisProject.tasks.shadowJar.mustRunAfter otherTestTask.path
+            }
         }
     }
 }

Diff for: stroom-config/stroom-config-app/build.gradle

@@ -1,5 +1,9 @@
 ext.moduleName = 'stroom.config.app'
 
+def releaseBuildDir = "${projectDir}/../../stroom-app/build/release"
+def configDefaultsFile = "${releaseBuildDir}/config/config-defaults.yml"
+def configSchemaFile = "${releaseBuildDir}/config/config-schema.yml"
+
 dependencies {
     implementation project(':stroom-activity:stroom-activity-impl-db')
     implementation project(':stroom-analytics:stroom-analytics-impl')
@@ -90,3 +94,13 @@ dependencies {
     testRuntimeOnly libs.logback.classic
     testRuntimeOnly libs.logback.core
 }
+
+// Create an example yaml config file from the compile-time defaults
+tasks.register('generateConfigDefaultsYamlFile', JavaExec) {
+    dependsOn compileJava
+    dependsOn compileTestJava
+
+    classpath = sourceSets.test.runtimeClasspath
+    mainClass = 'stroom.config.app.GenerateExpectedYaml'
+    args = [configDefaultsFile, configSchemaFile]
+}