From 1db4ff50f8cca2d7c73077d82d398f619f9dd251 Mon Sep 17 00:00:00 2001
From: Rick Herrick <jrherrick@wustl.edu>
Date: Mon, 23 May 2016 19:40:06 -0500
Subject: [PATCH] XNAT-482 Fix to build issue found when updating plexiviewer
dependency. This exposed circular dependency where xnat-web war was included
in xnat-web war, with predictably terrible results.
---
build.gradle | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 107eecba..fa82b81e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -265,6 +265,9 @@ configurations {
all*.exclude group: 'jms', module: 'jms'
all*.exclude group: 'jython', module: 'jython'
all*.exclude group: 'org.nrg', module: 'nrg'
+ all*.exclude group: 'org.nrg', module: 'plexiviewer'
+ all*.exclude group: 'org.nrg.xdat', module: 'beans'
+ all*.exclude group: 'org.nrg.xnat', module: 'web'
all*.exclude group: 'net.sf.saxon', module: 'saxon'
all*.exclude group: 'stax', module: 'stax-api'
all*.exclude group: 'xml-apis', module: 'xml-apis'
@@ -311,7 +314,9 @@ dependencies {
compile "org.nrg.xnat.pipeline:xnat_pipeline:${vXnatPipeline}"
compile "org.nrg.xnat.pipeline:xnat_tools:${vXnatPipeline}"
- compile "org.nrg:plexiviewer:${vXnat}"
+ compile("org.nrg.xnat:plexiviewer:${vXnat}") {
+ transitive = false
+ }
compile "dcm4che:dcm4che-core:2.0.25"
compile "dcm4che:dcm4che-image:2.0.25"
--
GitLab