diff --git a/build.gradle b/build.gradle index e626b3f2fa..342d1b266e 100644 --- a/build.gradle +++ b/build.gradle @@ -71,12 +71,11 @@ allprojects { // exclude log4j, which may come in transitively, from all configurations to avoid its potential vulnerabilities exclude group: "log4j", module:"log4j" } - configurations.driver.setDescription("Dependencies used for SqlUtils") + configurations.driver.setDescription("Dependencies used for Gradle SetUpProperties task") configurations.utilities.setDescription("Utility binaries for use on Windows platform") dependencies { - //for SqlUtils driver "org.postgresql:postgresql:${postgresqlDriverVersion}" driver "com.microsoft.sqlserver:mssql-jdbc:${mssqlJdbcVersion}" @@ -436,17 +435,6 @@ subprojects { } }) } - project.tasks.register("showConfigs") { - task -> - task.group = GroupNames.HELP - task.description = "Show all the configurations available in the project and their published artifacts" - task.doLast({ - project.configurations.forEach({ - Configuration config -> - println(config.name + ": (${config.getDescription()})") - }) - }) - } project.tasks.register("allDepInsight", DependencyInsightReportTask) { DependencyInsightReportTask t -> @@ -465,6 +453,7 @@ project.tasks.register("showDiscrepancies", ShowDiscrepancies) { task -> task.group = "Help" task.description = "Report external dependencies that have more than one version referenced in the modules in this build" + task.notCompatibleWithConfigurationCache("Walks the project tree") } project.tasks.register('getModulesManifest', DefaultTask) { @@ -517,24 +506,7 @@ project.tasks.register('getModulesManifest', DefaultTask) { }) manifestFile.text = manifestString.toString() }) -} - -project.tasks.register('listNpmProjects', DefaultTask) { - task -> - task.group = GroupNames.NPM_RUN - task.description ="List all projects that employ npm in their build" - task.doLast({ - List npmProjects = [] - project.allprojects({Project p -> - if (p.getPlugins().hasPlugin(NpmRun.class)) - npmProjects.add(p.path) - }) - if (npmProjects.size() == 0) - println("No projects found containing ${NpmRun.NPM_PROJECT_FILE}") - else { - println("The following projects use NPM in their builds:\n\t${npmProjects.join("\n\t")}\n") - } - }) + task.notCompatibleWithConfigurationCache("Walks the project tree") } project.tasks.register('ijWorkspaceSetup', Copy) { diff --git a/gradle.properties b/gradle.properties index d27a568178..d113270ae1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=6.3.0 +gradlePluginsVersion=7.0.0 owaspDependencyCheckPluginVersion=12.1.3 versioningPluginVersion=1.1.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..8bdaf60c75 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da476..2a84e188b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9367..ef07e0162b 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/server/build.gradle b/server/build.gradle index cf944dad2f..02d2316d06 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,7 +1,7 @@ import org.apache.commons.lang3.SystemUtils -import org.labkey.gradle.plugin.JsDoc import org.labkey.gradle.plugin.XsdDoc import org.labkey.gradle.task.CreateModule +import org.labkey.gradle.task.CreateJsDocs import org.labkey.gradle.util.BuildUtils import org.labkey.gradle.util.GroupNames import org.labkey.gradle.util.PomFileHelper @@ -162,13 +162,13 @@ project.publishing { } -project.tasks.register("cleanDocs", DefaultTask) { - DefaultTask task -> +project.tasks.register("cleanDocs", Delete) { + Delete task -> task.group = GroupNames.DOCUMENTATION task.description = "Remove directories created for xsd and js doc tasks" - task.doLast({ - project.delete(XsdDoc.getXsdDocDirectory(project)) - project.delete(JsDoc.getJsDocDirectory(project)) + task.configure({ DeleteSpec delete -> + delete.delete(XsdDoc.getXsdDocDirectory(project)) + delete.delete(CreateJsDocs.getJsDocDirectory(project)) }) } @@ -180,6 +180,7 @@ tasks.register('createModule', CreateModule) { "Use createFiles to control which subdirectories are created. Include some subset of api, test, and/or schema " + "in a comma delimited list to create those subdirectories in the new module. If none are required, still " + "include -PcreateFiles with no value to avoid being prompted." + task.notCompatibleWithConfigurationCache("Class needs to declare more input and output properties.") } project.tasks.register("reportVersionToTeamCity", DefaultTask) { @@ -199,7 +200,7 @@ if (project.hasProperty("teamcity")) else { var cleanJspRecompileSetup = project.tasks.register("cleanJspRecompileSetup", Delete) { - DeleteSpec task -> + Delete task -> task.group = GroupNames.BUILD task.delete project.rootProject.layout.buildDirectory.dir("jspRecompiling").get() task.description = "Remove build/jspRecompiling directory" @@ -226,16 +227,8 @@ else // We add this configuration here so we have a single location to link to for the npm and node executables. // Each project that requires node will have its own downloaded version of node and npm, but for the symlinkNode // task we need a single location, and one that works even when not building from source (Issue 35207) -if (BuildUtils.useServerNode(project)) -{ - project.node { - workDir = project.file("${project.rootProject.projectDir}/.node") - npmWorkDir = project.file("${project.rootProject.projectDir}/.node") - } -} else { - project.node { - workDir = BuildUtils.getRootBuildDirFile(project, ".node") - npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") - } +project.node { + workDir = project.file("${project.rootProject.projectDir}/.node") + npmWorkDir = project.file("${project.rootProject.projectDir}/.node") } project.tasks.named('deployApp').configure { dependsOn(project.tasks.npmSetup) } diff --git a/server/configs/application.properties b/server/configs/application.properties index fdf7676483..380533df84 100644 --- a/server/configs/application.properties +++ b/server/configs/application.properties @@ -108,7 +108,7 @@ mail.smtpUser=@@smtpUser@@ #context.resources.ldap.ConfigFactory.useSsl=false #context.resources.ldap.ConfigFactory.sslProtocol=SSLv3 -#useLocalBuild#spring.devtools.restart.additional-paths=@@pathToServer@@/build/deploy/modules +#useLocalBuild#spring.devtools.restart.additional-paths=@@pathToServer@@/build/deploy #useLocalBuild#spring.devtools.restart.trigger-file=.restartTrigger # HTTP session timeout for users - defaults to 30 minutes