diff --git a/SequenceAnalysis/build.gradle b/SequenceAnalysis/build.gradle index dc0958380..f5f5e4997 100644 --- a/SequenceAnalysis/build.gradle +++ b/SequenceAnalysis/build.gradle @@ -19,7 +19,7 @@ import java.util.regex.Matcher // } //} -configurations.all { +configurations.configureEach { resolutionStrategy { force "org.glassfish.jaxb:jaxb-runtime:${jaxbVersion}" force "org.freemarker:freemarker:2.3.35" // until picard version is updated to use this version or later diff --git a/jbrowse/build.gradle b/jbrowse/build.gradle index 0e597ab4e..9fa5f415d 100644 --- a/jbrowse/build.gradle +++ b/jbrowse/build.gradle @@ -11,6 +11,12 @@ import org.labkey.gradle.util.BuildUtils; // } //} +configurations.configureEach { + resolutionStrategy { + force "org.freemarker:freemarker:2.3.35" // from SequenceAnalysis. Use until picard version is updated to use this version or later + } +} + dependencies { apiImplementation "com.github.samtools:htsjdk:${htsjdkVersion}" BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")