Skip to content

Commit adeffce

Browse files
Update labkeyVersion to 26.3.4
2 parents 0cd6c68 + 5213677 commit adeffce

2 files changed

Lines changed: 21 additions & 17 deletions

File tree

build.gradle

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ allprojects {
3434
if (project.hasProperty('ossIndexUsername') && project.hasProperty('ossIndexPassword'))
3535
{
3636
analyzers.ossIndex.username = project.property('ossIndexUsername')
37-
analyzers.ossIndex.password = project.property('ossIndexPassword');
37+
analyzers.ossIndex.password = project.property('ossIndexPassword')
38+
analyzers.ossIndex.url = "https://api.guide.sonatype.com"
3839
}
3940
else
4041
{
@@ -563,16 +564,19 @@ project.tasks.register('ijConfigure') {
563564
task.dependsOn(project.tasks.ijRunConfigurationsSetup)
564565
}
565566

566-
project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) {
567-
group = GroupNames.NPM_RUN
568-
description = "Given an alpha version prefix for npm packages via the property -P${PurgeNpmAlphaVersions.ALPHA_PREFIX_PROPERTY}=yourPrefix, " +
569-
"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). " +
570-
" Use -PdryRun to see what versions would be deleted without actually doing the deletion."
571-
}
567+
if (project.hasProperty('artifactory_contextUrl') && project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
568+
{
569+
project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) {
570+
group = GroupNames.NPM_RUN
571+
description = "Given an alpha version prefix for npm packages via the property -P${PurgeNpmAlphaVersions.ALPHA_PREFIX_PROPERTY}=yourPrefix, " +
572+
"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). " +
573+
" Use -PdryRun to see what versions would be deleted without actually doing the deletion."
574+
}
572575

573-
project.tasks.register('purgeNpmVersions', PurgeNpmVersions) {
574-
group = GroupNames.NPM_RUN
575-
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, " +
576-
"removes the versions specified from Artifactory. " +
577-
" Use -PdryRun to see what versions would be deleted without actually doing the deletion."
576+
project.tasks.register('purgeNpmVersions', PurgeNpmVersions) {
577+
group = GroupNames.NPM_RUN
578+
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, " +
579+
"removes the versions specified from Artifactory. " +
580+
" Use -PdryRun to see what versions would be deleted without actually doing the deletion."
581+
}
578582
}

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ buildFromSource=true
4444

4545
# The default version for LabKey artifacts that are built or that we depend on.
4646
# override in an individual module's gradle.properties file as necessary
47-
labkeyVersion=26.3.3
47+
labkeyVersion=26.3.4
4848
labkeyClientApiVersion=7.2.0
4949

5050
# Version numbers for the various binary artifacts that are included when
@@ -100,7 +100,7 @@ apacheDirectoryVersion=2.1.7
100100
apacheMinaVersion=2.2.5
101101

102102
# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
103-
apacheTomcatVersion=11.0.18
103+
apacheTomcatVersion=11.0.21
104104

105105
# (mothership) -> json-path -> json-smart -> accessor-smart
106106
# (core) -> graalvm
@@ -169,7 +169,7 @@ googleProtocolBufVersion=3.25.8
169169
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
170170
gsonVersion=2.8.9
171171

172-
grpcVersion=1.78.0
172+
grpcVersion=1.80.0
173173

174174
guavaVersion=33.5.0-jre
175175

@@ -246,7 +246,7 @@ jxlVersion=2.6.3
246246

247247
kaptchaVersion=2.3
248248

249-
log4j2Version=2.25.3
249+
log4j2Version=2.25.4
250250

251251
lombokVersion=1.18.42
252252

@@ -294,7 +294,7 @@ slf4jLog4jApiVersion=2.0.17
294294
snappyJavaVersion=1.1.10.8
295295

296296
# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
297-
springBootVersion=4.0.4
297+
springBootVersion=4.0.5
298298
# This usually matches the Spring Framework version dictated by springBootVersion
299299
springVersion=7.0.6
300300
springAiVersion=2.0.0-M4

0 commit comments

Comments
 (0)