summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-09-06 15:31:10 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-09-06 15:31:10 (GMT)
commit1e91b914bf6aa68920ea22368d9c037970aa1f9d (patch)
tree0f4a40100334acec64504c7ca158d5e54530cf63
parent845e80d304fc0abcb67c5618989e241e59341284 (diff)
downloadQCG-Data-1e91b914bf6aa68920ea22368d9c037970aa1f9d.zip
QCG-Data-1e91b914bf6aa68920ea22368d9c037970aa1f9d.tar.gz
QCG-Data-1e91b914bf6aa68920ea22368d9c037970aa1f9d.tar.bz2
[#922] User Profile Management cleanups upon first ll deployment
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java4
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy10
-rw-r--r--pom.xml2
3 files changed, 6 insertions, 10 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
index d118c07..fd167a8 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
@@ -1,8 +1,4 @@
package org.irods.jargon.idrop.lite;
public final class Version {
-<<<<<<< HEAD
- public static String VERSION="20120828-1415";
-=======
public static String VERSION="20120828-1442";
->>>>>>> development
}
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index a97098d..4cb6124 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -29,12 +29,12 @@ 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.1.5-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-core:3.2.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
//compile 'org.irods.jargon:jargon-security:3.2.0-SNAPSHOT'
- compile ('org.irods.jargon:jargon-data-utils:3.1.5-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-ticket:3.1.5-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-profile:3.1.5-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-tagging:3.1.5-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-data-utils:3.2.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-ticket:3.2.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-user-profile:3.2.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-user-tagging:3.2.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
/*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/pom.xml b/pom.xml
index 88db692..7a2dd0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<url>https://code.renci.org/gf/project/irodsidrop/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jargon.version>3.1.4</jargon.version>
+ <jargon.version>3.1.5-SNAPSHOT</jargon.version>
<spring.core.version>3.0.5.RELEASE</spring.core.version>
<commons.io.version>2.0.1</commons.io.version>
<netbeans.version>RELEASE711</netbeans.version>