From 3c448f813e3653bdeef8b7b9a70c7a151286e743 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sat, 13 Apr 2024 17:08:23 -0700 Subject: [PATCH 1/2] Use old JAXB property --- mcc/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mcc/build.gradle b/mcc/build.gradle index f96ede315..b71865f32 100644 --- a/mcc/build.gradle +++ b/mcc/build.gradle @@ -4,7 +4,7 @@ import org.labkey.gradle.util.ExternalDependency configurations.all { resolutionStrategy { // NOTE: this should be kept in sync with SequenceAnalysis module - force "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" + force "jakarta.xml.bind:jakarta.xml.bind-api:${jaxbApiOldVersion}" } } @@ -60,6 +60,7 @@ dependencies { "Parsing XML Data" ), { + // Exclude in favor of angus activation from API exclude group: 'jakarta.activation', module: 'jakarta.activation-api' } ) From 7902f2b6b2fdb52b57aec4f48716955462757702 Mon Sep 17 00:00:00 2001 From: bbimber Date: Sun, 14 Apr 2024 11:44:44 -0700 Subject: [PATCH 2/2] Drop force for jakarta.xml.bind --- mcc/build.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mcc/build.gradle b/mcc/build.gradle index b71865f32..8414afb8b 100644 --- a/mcc/build.gradle +++ b/mcc/build.gradle @@ -1,13 +1,6 @@ import org.labkey.gradle.util.BuildUtils import org.labkey.gradle.util.ExternalDependency -configurations.all { - resolutionStrategy { - // NOTE: this should be kept in sync with SequenceAnalysis module - force "jakarta.xml.bind:jakarta.xml.bind-api:${jaxbApiOldVersion}" - } -} - dependencies { BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:DiscvrLabKeyModules:Studies", depProjectConfig: "apiJarFile") BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:DiscvrLabKeyModules:jbrowse", depProjectConfig: "apiJarFile")