Skip to content

Update tomcat and springboot versions and don't register purge tasks without atrifactory properties #1332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-susanh wants to merge 2 commits into
base: release26.3-SNAPSHOT
Choose a base branch
from
+16 −13
Open

Update tomcat and springboot versions and don't register purge tasks without atrifactory properties #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
907821c
Update springBoot and apacheTomcat versions for minor CVEs
labkey-susanh Apr 10, 2026
b118089
Don't register tasks that need artifactory properties if properties a…
labkey-susanh Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,19 @@ project.tasks.register('ijConfigure') {
task.dependsOn(project.tasks.ijRunConfigurationsSetup)
}

project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) {
group = GroupNames.NPM_RUN
description = "Given an alpha version prefix for npm packages via the property -P${PurgeNpmAlphaVersions.ALPHA_PREFIX_PROPERTY}=yourPrefix, " +
"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."
}
if (project.hasProperty('artifactory_contextUrl') && project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
{
project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) {
group = GroupNames.NPM_RUN
description = "Given an alpha version prefix for npm packages via the property -P${PurgeNpmAlphaVersions.ALPHA_PREFIX_PROPERTY}=yourPrefix, " +
"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 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."
project.tasks.register('purgeNpmVersions', PurgeNpmVersions) {
group = GroupNames.NPM_RUN
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."
}
}
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ apacheDirectoryVersion=2.1.7
apacheMinaVersion=2.2.5

# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
apacheTomcatVersion=11.0.18
apacheTomcatVersion=11.0.20

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand Down Expand Up @@ -294,7 +294,7 @@ slf4jLog4jApiVersion=2.0.17
snappyJavaVersion=1.1.10.8

# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
springBootVersion=4.0.4
springBootVersion=4.0.5
# This usually matches the Spring Framework version dictated by springBootVersion
springVersion=7.0.6
springAiVersion=2.0.0-M4
Expand Down
Loading