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 e8e26d24ac..2b80298cda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ buildFromSource=true # The default version for LabKey artifacts that are built or that we depend on. # override in an individual module's gradle.properties file as necessary -labkeyVersion=25.7.10 +labkeyVersion=25.7.11 labkeyClientApiVersion=6.3.0 # Version numbers for the various binary artifacts that are included when @@ -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.6 versioningPluginVersion=1.1.2 # Versions of node and npm to use during the build. If set, these versions