diff --git a/build.gradle b/build.gradle index 5f530565bd..d5e6b50ae7 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { id "com.jfrog.artifactory" version "${artifactoryPluginVersion}" apply false id "com.github.node-gradle.node" version "${gradleNodePluginVersion}" apply false id "org.owasp.dependencycheck" version "${owaspDependencyCheckPluginVersion}" apply false -// id "com.github.ben-manes.versions" version "0.39.0" + id "com.github.ben-manes.versions" version "0.54.0" id "org.labkey.build.multiGit" } @@ -586,7 +586,7 @@ project.tasks.register('ijConfigure') { task.dependsOn(project.tasks.ijRunConfigurationsSetup) } -if (project.hasProperty('artifactory_contextUrl') && project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password')) +if (BuildUtils.hasArtifactoryProperties(project as Project)) { project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) { group = GroupNames.NPM_RUN diff --git a/gradle.properties b/gradle.properties index 800c8a914c..aa30a943c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,7 +56,7 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=8.1.0 +gradlePluginsVersion=8.2.0-pluginValidation-SNAPSHOT owaspDependencyCheckPluginVersion=12.2.2 # Versions of node and npm to use during the build. If set, these versions