From c211e0154e5dd0a8839dccc4e55b99d0f4086583 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 8 Dec 2025 07:31:58 -0800 Subject: [PATCH 1/3] Remove use of versioning plugin and update gradle plugins version --- build.gradle | 9 ++++++++- gradle.properties | 3 +-- gradle/settings/all.gradle | 2 -- gradle/settings/distributions.gradle | 2 -- gradle/settings/ehr.gradle | 2 -- settings.gradle | 11 ++--------- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 6d6067aa4c..958f7caed3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ import org.apache.commons.lang3.SystemUtils import org.labkey.gradle.plugin.NpmRun import org.labkey.gradle.task.PurgeNpmAlphaVersions +import org.labkey.gradle.task.PurgeNpmVersions import org.labkey.gradle.task.ShowDiscrepancies import org.labkey.gradle.util.BuildUtils import org.labkey.gradle.util.GroupNames @@ -11,7 +12,6 @@ plugins { id "org.owasp.dependencycheck" version "${owaspDependencyCheckPluginVersion}" apply false // id "com.github.ben-manes.versions" version "0.39.0" id "org.labkey.build.multiGit" - id 'org.labkey.versioning' apply false // Need this for our 'base' plugin to get the version specified in settings.gradle } allprojects { @@ -562,3 +562,10 @@ project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) { "removes all packages with versions that match that prefix from Artifactory (e.g., @labkey/components-1.2.3-yourPrefix.0 and @labkey/premium-0.3.4-yourPrefix.1). " + " Use -PdryRun to see what versions would be deleted without actually doing the deletion." } + +project.tasks.register('purgeNpmVersions', PurgeNpmVersions) { + group = GroupNames.NPM_RUN + description = "Given an package name via -P${PurgeNpmVersions.PACKAGE_NAME_PROP}=component (without the @labkey prefix) and a version list via -P${PurgeNpmVersions.VERSION_LIST_PROP}=fileName for npm package, " + + "removes the versions specified from Artifactory. " + + " Use -PdryRun to see what versions would be deleted without actually doing the deletion." +} diff --git a/gradle.properties b/gradle.properties index 14ba6dec44..fa3cdf4d12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,9 +59,8 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=7.1.0 +gradlePluginsVersion=7.2.0-miscCleaning-SNAPSHOT owaspDependencyCheckPluginVersion=12.1.9 -versioningPluginVersion=1.1.3 # Versions of node and npm to use during the build. If set, these versions # will be downloaded and used. If not set, the existing local installations will be used diff --git a/gradle/settings/all.gradle b/gradle/settings/all.gradle index c3583950e5..052c516a05 100644 --- a/gradle/settings/all.gradle +++ b/gradle/settings/all.gradle @@ -17,7 +17,6 @@ buildscript { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } if (gradlePluginsVersion.contains("SNAPSHOT")) @@ -30,7 +29,6 @@ buildscript { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } diff --git a/gradle/settings/distributions.gradle b/gradle/settings/distributions.gradle index 1f2a7daa81..39eb3fda9b 100644 --- a/gradle/settings/distributions.gradle +++ b/gradle/settings/distributions.gradle @@ -13,7 +13,6 @@ buildscript { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } if (gradlePluginsVersion.contains("SNAPSHOT")) @@ -26,7 +25,6 @@ buildscript { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } diff --git a/gradle/settings/ehr.gradle b/gradle/settings/ehr.gradle index 97b02840be..5a191fff15 100644 --- a/gradle/settings/ehr.gradle +++ b/gradle/settings/ehr.gradle @@ -13,7 +13,6 @@ buildscript { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } if (gradlePluginsVersion.contains("SNAPSHOT")) @@ -26,7 +25,6 @@ buildscript { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } diff --git a/settings.gradle b/settings.gradle index 6301df1fbf..b9b9a8e2bd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,10 +14,9 @@ pluginManagement { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } - if (gradlePluginsVersion.contains("SNAPSHOT") || versioningPluginVersion.contains("SNAPSHOT")) + if (gradlePluginsVersion.contains("SNAPSHOT")) { mavenLocal() maven { @@ -27,19 +26,13 @@ pluginManagement { } content { includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" } } } } resolutionStrategy { eachPlugin { - if (requested.id.id == 'org.labkey.versioning') - { - // Versioning isn't published with plugin markers - useModule("org.labkey.build:versioning:${versioningPluginVersion}") - } - else if (requested.id.namespace == 'org.labkey.build') + if (requested.id.namespace == 'org.labkey.build') { // This doesn't really do anything. The jar on the classpath will take precedence useVersion("${gradlePluginsVersion}") From 10444bd6fed55fc9cadd6d1567e3d4c966f813e6 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 11 Dec 2025 06:59:04 -0800 Subject: [PATCH 2/3] Grammar --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 958f7caed3..d1c64b6255 100644 --- a/build.gradle +++ b/build.gradle @@ -565,7 +565,7 @@ project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) { project.tasks.register('purgeNpmVersions', PurgeNpmVersions) { group = GroupNames.NPM_RUN - description = "Given an package name via -P${PurgeNpmVersions.PACKAGE_NAME_PROP}=component (without the @labkey prefix) and a version list via -P${PurgeNpmVersions.VERSION_LIST_PROP}=fileName for npm package, " + + description = "Given a package name via -P${PurgeNpmVersions.PACKAGE_NAME_PROP}=name (without the @labkey prefix) and a version list via -P${PurgeNpmVersions.VERSION_LIST_PROP}=fileName for npm package, " + "removes the versions specified from Artifactory. " + " Use -PdryRun to see what versions would be deleted without actually doing the deletion." } From 5253a80d82a94023abf37f2c4e230fd91a8020b6 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 11 Dec 2025 06:59:22 -0800 Subject: [PATCH 3/3] gradlePluginsVersion 7.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fa3cdf4d12..26af89a122 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=7.2.0-miscCleaning-SNAPSHOT +gradlePluginsVersion=7.2.0 owaspDependencyCheckPluginVersion=12.1.9 # Versions of node and npm to use during the build. If set, these versions