summaryrefslogtreecommitdiffstats
path: root/idrop-web/grails-app
diff options
context:
space:
mode:
Diffstat (limited to 'idrop-web/grails-app')
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy14
-rw-r--r--idrop-web/grails-app/views/browse/listCart.gsp2
2 files changed, 10 insertions, 6 deletions
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index d4dfed3..62d59c4 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -29,12 +29,16 @@ grails.project.dependency.resolution = {
test 'org.mockito:mockito-all:1.8.1'
compile 'commons-io:commons-io:2.1'
provided 'junit:junit:4.8.1'
- compile ('org.irods.jargon:jargon-core:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-core:3.2.1.2-SNAPSHOT') {
+
+ excludes "org.bouncycastle"
+
+ }
//compile 'org.irods.jargon:jargon-security:3.2.0-SNAPSHOT'
- compile ('org.irods.jargon:jargon-data-utils:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-ticket:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-profile:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-tagging:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-data-utils:3.2.1.2-SNAPSHOT')
+ compile ('org.irods.jargon:jargon-ticket:3.2.1.2-SNAPSHOT')
+ compile ('org.irods.jargon:jargon-user-profile:3.2.1.2-SNAPSHOT')
+ compile ('org.irods.jargon:jargon-user-tagging:3.2.1.2-SNAPSHOT')
/*compile 'org.springframework.security:spring-security-core:3.0.5.RELEASE'
compile 'org.springframework.security:spring-security-web:3.0.5.RELEASE'
compile 'org.springframework.security:spring-security-config:3.0.5.RELEASE'
diff --git a/idrop-web/grails-app/views/browse/listCart.gsp b/idrop-web/grails-app/views/browse/listCart.gsp
index 590ccf5..2d56e15 100644
--- a/idrop-web/grails-app/views/browse/listCart.gsp
+++ b/idrop-web/grails-app/views/browse/listCart.gsp
@@ -22,7 +22,7 @@
<!-- cart table -->
</div>
</div>
-<div id="cartAppletDiv">
+<div id="cartAppletDiv" style="overflow:visible;height:90%;">
<!-- empty div --></div>
</div>
<script type="text/javascript">