summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@mid-campus-00188.wireless.unc.edu>2011-08-10 16:06:10 (GMT)
committer Mike Conway <mikeconway@mid-campus-00188.wireless.unc.edu>2011-08-10 16:06:10 (GMT)
commit53fdeea49f4930ca9023a3f5b537cef1c1905391 (patch)
tree3f9bab8f5cfc39ebc01e8fb093c87d278da05c06
parentcb336e850f2f31f4cd0dd79d759acce8bf108748 (diff)
downloadQCG-Data-53fdeea49f4930ca9023a3f5b537cef1c1905391.zip
QCG-Data-53fdeea49f4930ca9023a3f5b537cef1c1905391.tar.gz
QCG-Data-53fdeea49f4930ca9023a3f5b537cef1c1905391.tar.bz2
move to jargon beta3 snapshot, fix grails web.xml error
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy8
-rw-r--r--idrop-web/pom.xml1
-rw-r--r--pom.xml2
3 files changed, 5 insertions, 6 deletions
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index 33ed09b..0007d39 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -29,10 +29,10 @@ grails.project.dependency.resolution = {
test 'org.irods.jargon:jargon-test:2.4.1-SNAPSHOT'
test 'org.mockito:mockito-all:1.8.1'
provided 'junit:junit:4.8.1'
- compile 'org.irods.jargon:jargon-core:2.5.0-beta2-SNAPSHOT'
- compile 'org.irods.jargon:jargon-security:2.5.0-beta2-SNAPSHOT'
- compile 'org.irods.jargon:jargon-data-utils:2.5.0-beta2-SNAPSHOT'
- compile ('org.irods.jargon:jargon-user-tagging:2.5.0-beta2-SNAPSHOT') {
+ compile 'org.irods.jargon:jargon-core:2.5.0-beta3-SNAPSHOT'
+ compile 'org.irods.jargon:jargon-security:2.5.0-beta3-SNAPSHOT'
+ compile 'org.irods.jargon:jargon-data-utils:2.5.0-beta3-SNAPSHOT'
+ compile ('org.irods.jargon:jargon-user-tagging:2.5.0-beta3-SNAPSHOT') {
exclude 'junit'
}
compile 'org.springframework.security:spring-security-core:3.0.5.RELEASE'
diff --git a/idrop-web/pom.xml b/idrop-web/pom.xml
index 5063fa7..13eb1c5 100644
--- a/idrop-web/pom.xml
+++ b/idrop-web/pom.xml
@@ -11,7 +11,6 @@
<packaging>war</packaging>
<name>idrop-web</name>
-
<dependencies>
<dependency>
<groupId>org.grails</groupId>
diff --git a/pom.xml b/pom.xml
index ea3811a..9a820a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<url>https://code.renci.org/gf/project/irodsidrop/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jargon.version>2.5.0-beta2-SNAPSHOT</jargon.version>
+ <jargon.version>2.5.0-beta3-SNAPSHOT</jargon.version>
<spring.core.version>3.0.5.RELEASE</spring.core.version>
<commons.io.version>2.0.1</commons.io.version>
<netbeans.version>RELEASE701</netbeans.version>