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
7 changes: 0 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ allprojects {
configurations
{
driver
utilities
}
configurations.configureEach {
// exclude log4j 1.x, which may come in transitively, from all configurations to avoid its potential vulnerabilities
Expand All @@ -88,17 +87,11 @@ allprojects {
exclude group: "org.springframework.boot", module:"spring-boot-starter-logging"
}
configurations.driver.setDescription("Dependencies used for Gradle SetUpProperties task")
configurations.utilities.setDescription("Utility binaries for use on Windows platform")

dependencies
{
driver "org.postgresql:postgresql:${postgresqlDriverVersion}"
driver "com.microsoft.sqlserver:mssql-jdbc:${mssqlJdbcVersion}"

if (SystemUtils.IS_OS_WINDOWS)
{
utilities "org.labkey.tools.windows:utils:${windowsUtilsVersion}@zip"
}
}

// We apply the base module here so we get the configurations (in particular external and modules)
Expand Down
8 changes: 2 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ buildFromSource=true
labkeyVersion=26.5-SNAPSHOT
labkeyClientApiVersion=7.2.0

# Version numbers for the various binary artifacts that are included when
# deploying via deployApp or deployDist and when creating distributions.
windowsUtilsVersion=1.0
# Uncomment the following line to download proteomics binaries
#includeProteomicsBinaries
linuxProteomicsBinariesVersion=2.0
Expand All @@ -59,7 +56,7 @@ windowsProteomicsBinariesVersion=1.0
# The current version numbers for the gradle plugins.
artifactoryPluginVersion=5.2.5
gradleNodePluginVersion=7.1.0
gradlePluginsVersion=8.0.0
gradlePluginsVersion=8.1.0
owaspDependencyCheckPluginVersion=12.2.1

# Versions of node and npm to use during the build. If set, these versions
Expand Down Expand Up @@ -167,15 +164,14 @@ googleOauthClientVersion=1.39.0
googleProtocolBufVersion=3.25.9

graphSupportVersion=1.5.2
grpcVersion=1.80.0

# Cloud and SequenceAnalysis bring gson in as a transitive dependency.
# We resolve to the later version here to keep things consistent
# Note: Current jclouds seems to require 2.8.9; attempting to upgrade to 2.9.0 cratered the S3 test suite with many
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
gsonVersion=2.8.9

grpcVersion=1.80.0

guavaVersion=33.6.0-jre

# Note: You won't find usages in the product sources; this property is used by the gradle plugin.
Expand Down
4 changes: 2 additions & 2 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ dependencies

configurations
{
binaries.extendsFrom(utilities)
binaries
}
configurations.binaries.setDescription("Utility and proteomics binaries")
configurations.binaries.setDescription("Proteomics binaries")

if (project.hasProperty('includeProteomicsBinaries'))
{
Expand Down
Loading