Skip to content

Commit 87148af

Browse files
authored
Stop copying Graphviz/DOT executables (#243)
1 parent b8b6deb commit 87148af

4 files changed

Lines changed: 16 additions & 42 deletions

File tree

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ If you are making changes to the plugins, please see the [internal docs](https:/
1212
on how to do that, including how to develop and test locally and the versioning information.
1313

1414
## Release Notes
15+
### 8.2.0-SNAPSHOT
16+
*Released*: TBD
17+
(Earliest compatible LabKey version: 26.5.0)
18+
19+
### 8.1.0
20+
*Released*: 22 April 2026
21+
(Earliest compatible LabKey version: 26.5.0)
22+
- [GitHub Issue 1070](https://github.com/LabKey/internal-issues/issues/1070) Stop copying Graphviz/DOT executables
23+
- Temporarily disable stricter published plugins validation that was added in Gradle 9.4.0
24+
1525
### 8.0.0
1626
*Released*: 3 April 2026
1727
(Earliest compatible LabKey version: 26.3.3)

build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ dependencies {
4343
}
4444

4545
group = 'org.labkey.build'
46-
project.version = "8.1.0-SNAPSHOT"
46+
project.version = "8.2.0-SNAPSHOT"
47+
48+
// Stricter plugin validation was added in 9.4.0. Disable it for now. TODO: Address complaints and remove.
49+
tasks.validatePlugins {
50+
enableStricterValidation = false
51+
}
4752

4853
gradlePlugin {
4954
plugins {

src/main/groovy/org/labkey/gradle/plugin/Distribution.groovy

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,11 @@ class Distribution implements Plugin<Project>
7676
embedded
7777
}
7878
project.configurations.embedded.setDescription("Artifacts for creating a LabKey distribution (aka installer) with Tomcat embedded in it")
79-
80-
if (project.configurations.findByName("utilities") == null)
81-
{
82-
project.configurations
83-
{
84-
utilities
85-
}
86-
project.configurations.utilities.setDescription("Utility binaries for use on Windows platform")
87-
}
8879
}
8980

9081

9182
private void addDependencies(Project project)
9283
{
93-
// we package these Windows utilities with each distribution so any distribution can be used on any platform
94-
if (project.hasProperty('windowsUtilsVersion'))
95-
project.dependencies {
96-
utilities "org.labkey.tools.windows:utils:${project.windowsUtilsVersion}@zip"
97-
}
98-
9984
BuildUtils.addLabKeyDependency(project: project, config: "embedded", depProjectPath: BuildUtils.getEmbeddedProjectPath(project.gradle), depVersion: project.labkeyVersion, depProjectConfig: "embedded", transitive: false)
10085
TaskUtils.configureTaskIfPresent(project, 'artifactoryDeploy', { dependsOn(project.tasks.distribution) })
10186
substituteModuleDependencies(project, "distribution")

src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -210,25 +210,6 @@ abstract class ModuleDistribution extends DefaultTask
210210
return "${getDistributionDir()}/${getArchiveName()}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
211211
}
212212

213-
private File getWindowsUtilDir()
214-
{
215-
return project.rootProject.file("external/windows/core")
216-
}
217-
218-
private void copyWindowsCoreUtilities()
219-
{
220-
File utilsDir = getWindowsUtilDir()
221-
if (project.configurations.findByName("utilities") != null && !utilsDir.exists())
222-
{
223-
fs.copy({
224-
CopySpec copy ->
225-
copy.from(project.configurations.utilities.collect { project.zipTree(it) })
226-
copy.into utilsDir
227-
copy.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
228-
})
229-
}
230-
}
231-
232213
private makeEmbeddedTomcatJar()
233214
{
234215
File embeddedJarFile = project.configurations.embedded.singleFile
@@ -271,18 +252,11 @@ abstract class ModuleDistribution extends DefaultTask
271252
if (!serverJarFile.exists())
272253
makeEmbeddedTomcatJar()
273254

274-
copyWindowsCoreUtilities()
275-
def utilsDir = getWindowsUtilDir()
276-
277255
ant.tar(tarfile: getTarArchivePath(),
278256
longfile: "gnu",
279257
compression: "gzip") {
280258
tarfileset(dir: BuildUtils.getBuildDir(project), prefix: archiveName) { include(name: serverJarFile.getName()) }
281259

282-
if (!simpleDistribution) {
283-
tarfileset(dir: utilsDir.path, prefix: "${archiveName}/bin")
284-
}
285-
286260
tarfileset(dir: "${BuildUtils.getBuildDirPath(project)}/embedded", prefix: archiveName)
287261
}
288262
}

0 commit comments

Comments
 (0)