Skip to content

Commit fe304c2

Browse files
Update labkeyVersion to 25.7.11
2 parents 0a7fed0 + 0fd56e2 commit fe304c2

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ plugins {
1717
allprojects {
1818
if (project.hasProperty('enableOwaspDependencyCheck'))
1919
{
20-
// Comment in to enable the tasks for owasp dependency checking
2120
apply plugin: 'org.owasp.dependencycheck'
2221
dependencyCheck {
2322
outputDirectory = project.rootProject.layout.buildDirectory.file("reports/dependencyCheck/${project.path.replaceAll(':', '_').substring(1)}").get().asFile
@@ -32,6 +31,15 @@ allprojects {
3231
enabled = false
3332
}
3433
}
34+
if (project.hasProperty('ossIndexUsername') && project.hasProperty('ossIndexPassword'))
35+
{
36+
analyzers.ossIndex.username = project.property('ossIndexUsername')
37+
analyzers.ossIndex.password = project.property('ossIndexPassword');
38+
}
39+
else
40+
{
41+
analyzers.ossIndex.enabled = false
42+
}
3543
formats = ['HTML', 'JUNIT']
3644
skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly']
3745
skipProjects = [':server:testAutomation']

gradle.properties

Lines changed: 2 additions & 2 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=25.7.10
47+
labkeyVersion=25.7.11
4848
labkeyClientApiVersion=6.3.0
4949

5050
# Version numbers for the various binary artifacts that are included when
@@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
6060
artifactoryPluginVersion=5.2.5
6161
gradleNodePluginVersion=7.1.0
6262
gradlePluginsVersion=6.3.0
63-
owaspDependencyCheckPluginVersion=12.1.3
63+
owaspDependencyCheckPluginVersion=12.1.6
6464
versioningPluginVersion=1.1.2
6565

6666
# Versions of node and npm to use during the build. If set, these versions

0 commit comments

Comments
 (0)