Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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']
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down