summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-11-30 14:33:37 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-11-30 14:33:37 (GMT)
commite9f3f942af4c0399faeee233efb07091be94de9b (patch)
tree6711078faac96be95072ebfda39f74ff6ecda7ff
parent6345b9138584573eb53cbb38297a1f762708ffad (diff)
downloadQCG-Data-e9f3f942af4c0399faeee233efb07091be94de9b.zip
QCG-Data-e9f3f942af4c0399faeee233efb07091be94de9b.tar.gz
QCG-Data-e9f3f942af4c0399faeee233efb07091be94de9b.tar.bz2
[#1062] 1.0.2 release activities
-rw-r--r--idrop-lite/pom.xml2
-rw-r--r--idrop-swing/pom.xml2
-rw-r--r--idrop-web/application.properties2
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy10
-rw-r--r--pom.xml4
5 files changed, 10 insertions, 10 deletions
diff --git a/idrop-lite/pom.xml b/idrop-lite/pom.xml
index fafae2f..774d65c 100644
--- a/idrop-lite/pom.xml
+++ b/idrop-lite/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>idrop</artifactId>
<groupId>org.irods</groupId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<groupId>org.irods.idrop</groupId>
<artifactId>idrop-lite</artifactId>
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index d3d1944..d133c73 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.irods.idrop</groupId>
diff --git a/idrop-web/application.properties b/idrop-web/application.properties
index eb5fdfa..6879854 100644
--- a/idrop-web/application.properties
+++ b/idrop-web/application.properties
@@ -5,4 +5,4 @@ app.name=idrop-web
app.servlet.version=2.5
app.version=1.0.2
plugins.hibernate=2.1.1
-plugins.tomcat=2.1.1
+#plugins.tomcat=2.1.1
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index 0752101..aa7905f 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -29,16 +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.2') {
+ compile ('org.irods.jargon:jargon-core:3.2.1.3') {
excludes "org.bouncycastle"
}
//compile 'org.irods.jargon:jargon-security:3.2.0-SNAPSHOT'
- compile ('org.irods.jargon:jargon-data-utils:3.2.1.2')
- compile ('org.irods.jargon:jargon-ticket:3.2.1.2')
- compile ('org.irods.jargon:jargon-user-profile:3.2.1.2')
- compile ('org.irods.jargon:jargon-user-tagging:3.2.1.2')
+ compile ('org.irods.jargon:jargon-data-utils:3.2.1.3')
+ compile ('org.irods.jargon:jargon-ticket:3.2.1.3')
+ compile ('org.irods.jargon:jargon-user-profile:3.2.1.3')
+ compile ('org.irods.jargon:jargon-user-tagging:3.2.1.3')
/*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 5ef6588..95a9018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
<packaging>pom</packaging>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.2</version>
<name>iRODS iDrop</name>
<description>iRODS iDrop - personal web and desktop grid access clients</description>
<url>https://code.renci.org/gf/project/irodsidrop/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jargon.version>3.2.1.2</jargon.version>
+ <jargon.version>3.2.1.3</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>