From 730e9f67980d9852e229537168fae9db9ce72ec7 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 23 Sep 2025 11:38:59 -0700 Subject: [PATCH 1/4] Update owaspDependencyCheckPlugin version and add configuration for ossIndex analyzer authentication --- build.gradle | 10 +++++++++- gradle.properties | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7b67e31e77..52d835983e 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,6 @@ plugins { allprojects { if (project.hasProperty('enableOwaspDependencyCheck')) { - // Comment in to enable the tasks for owasp dependency checking apply plugin: 'org.owasp.dependencycheck' dependencyCheck { outputDirectory = project.rootProject.layout.buildDirectory.file("reports/dependencyCheck/${project.path.replaceAll(':', '_').substring(1)}").get().asFile @@ -32,6 +31,15 @@ allprojects { enabled = false } } + if (project.hasProperty('ossIndexUsername') && project.hasProperty('ossIndexPassword')) + { + analyzers.ossIndex.username = project.property('ossIndexUsername') + analyzers.ossIndex.password = project.property('ossIndexPassword'); + } + else + { + analyzers.ossIndex.enabled = false + } formats = ['HTML', 'JUNIT'] skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly'] skipProjects = [':server:testAutomation'] diff --git a/gradle.properties b/gradle.properties index b8d00e529e..fd8ec08f00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0 artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 gradlePluginsVersion=6.3.0 -owaspDependencyCheckPluginVersion=12.1.3 +owaspDependencyCheckPluginVersion=12.1.5 versioningPluginVersion=1.1.2 # Versions of node and npm to use during the build. If set, these versions From aa2d6ab5dc7ac588e19d38ff8c70aefba6e86549 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 24 Sep 2025 11:43:30 -0700 Subject: [PATCH 2/4] owaspDependencyCheckPluginVersion 12.1.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fd8ec08f00..13f9379af5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0 artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 gradlePluginsVersion=6.3.0 -owaspDependencyCheckPluginVersion=12.1.5 +owaspDependencyCheckPluginVersion=12.1.6 versioningPluginVersion=1.1.2 # Versions of node and npm to use during the build. If set, these versions From a51c0f40bdcdb5b66d3460a01e4199dae3b6b553 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 24 Sep 2025 15:02:20 -0700 Subject: [PATCH 3/4] Update netty to 4.2.5.Final --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 13f9379af5..bd82d06fad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -247,7 +247,7 @@ luceneVersion=9.12.2 mssqlJdbcVersion=12.10.1.jre11 # force for docker -nettyVersion=4.2.2.Final +nettyVersion=4.2.5.Final objenesisVersion=1.0 From e2aba4a2239d2d1b14f85de07f85e7cc5b4a7d09 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 24 Sep 2025 15:12:30 -0700 Subject: [PATCH 4/4] Update spring version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index bd82d06fad..e0a292343c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -289,7 +289,7 @@ snappyJavaVersion=1.1.10.7 # Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version springBootVersion=3.5.3 # This usually matches the Spring Framework version dictated by springBootVersion -springVersion=6.2.10 +springVersion=6.2.11 sqliteJdbcVersion=3.50.3.0