Skip to content

Commit e80924d

Browse files
authored
Stop copying Graphviz/DOT executables during the build (#1346)
1 parent acd02e6 commit e80924d

3 files changed

Lines changed: 4 additions & 15 deletions

File tree

build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ allprojects {
7979
configurations
8080
{
8181
driver
82-
utilities
8382
}
8483
configurations.configureEach {
8584
// exclude log4j 1.x, which may come in transitively, from all configurations to avoid its potential vulnerabilities
@@ -88,17 +87,11 @@ allprojects {
8887
exclude group: "org.springframework.boot", module:"spring-boot-starter-logging"
8988
}
9089
configurations.driver.setDescription("Dependencies used for Gradle SetUpProperties task")
91-
configurations.utilities.setDescription("Utility binaries for use on Windows platform")
9290

9391
dependencies
9492
{
9593
driver "org.postgresql:postgresql:${postgresqlDriverVersion}"
9694
driver "com.microsoft.sqlserver:mssql-jdbc:${mssqlJdbcVersion}"
97-
98-
if (SystemUtils.IS_OS_WINDOWS)
99-
{
100-
utilities "org.labkey.tools.windows:utils:${windowsUtilsVersion}@zip"
101-
}
10295
}
10396

10497
// We apply the base module here so we get the configurations (in particular external and modules)

gradle.properties

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ buildFromSource=true
4747
labkeyVersion=26.5-SNAPSHOT
4848
labkeyClientApiVersion=7.2.0
4949

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

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

169166
graphSupportVersion=1.5.2
167+
grpcVersion=1.80.0
170168

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

177-
grpcVersion=1.80.0
178-
179175
guavaVersion=33.6.0-jre
180176

181177
# Note: You won't find usages in the product sources; this property is used by the gradle plugin.

server/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ dependencies
3939

4040
configurations
4141
{
42-
binaries.extendsFrom(utilities)
42+
binaries
4343
}
44-
configurations.binaries.setDescription("Utility and proteomics binaries")
44+
configurations.binaries.setDescription("Proteomics binaries")
4545

4646
if (project.hasProperty('includeProteomicsBinaries'))
4747
{

0 commit comments

Comments
 (0)