diff --git a/build.gradle b/build.gradle index ac68ece6e9..a9f0b9fbd6 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,8 @@ allprojects { if (project.hasProperty('ossIndexUsername') && project.hasProperty('ossIndexPassword')) { analyzers.ossIndex.username = project.property('ossIndexUsername') - analyzers.ossIndex.password = project.property('ossIndexPassword'); + analyzers.ossIndex.password = project.property('ossIndexPassword') + analyzers.ossIndex.url = "https://api.guide.sonatype.com" } else { @@ -43,11 +44,9 @@ allprojects { formats = ['HTML', 'JUNIT'] skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly'] skipProjects = [':server:testAutomation'] - if (project.hasProperty('nvdApiKey')) - { - nvd { - apiKey = "${project.property('nvdApiKey')}" - } + + nvd { + datafeedUrl = 'https://dependency-check.github.io/DependencyCheck_Builder/nvd_cache/nvdcve-{0}.json.gz' } } } @@ -591,16 +590,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." + } } diff --git a/gradle.properties b/gradle.properties index 2bf3d4511d..2d765e5bf3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.21 # (mothership) -> json-path -> json-smart -> accessor-smart # (core) -> graalvm @@ -172,7 +172,7 @@ googleProtocolBufVersion=3.25.8 # "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.(java.util.Map)'" errors gsonVersion=2.8.9 -grpcVersion=1.79.0 +grpcVersion=1.80.0 guavaVersion=33.5.0-jre @@ -252,7 +252,7 @@ jxlVersion=2.6.3 kaptchaVersion=2.3 -log4j2Version=2.25.3 +log4j2Version=2.25.4 lombokVersion=1.18.42 @@ -308,7 +308,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