summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@mid-campus-03519.wireless.unc.edu>2011-09-07 17:50:29 (GMT)
committer Mike Conway <mikeconway@mid-campus-03519.wireless.unc.edu>2011-09-07 17:50:29 (GMT)
commit01d292c3b327c56896887b077f5a727296c59035 (patch)
tree5bb978c81e74d9ac8e1bf91e4cdd95401ec8b620
parentde4379babb57a5043c8e4b0f034456915d854225 (diff)
downloadQCG-Data-01d292c3b327c56896887b077f5a727296c59035.zip
QCG-Data-01d292c3b327c56896887b077f5a727296c59035.tar.gz
QCG-Data-01d292c3b327c56896887b077f5a727296c59035.tar.bz2
[#464] iDrop 1.0.0 release activities - prepare to release 1.0.0 beta
-rw-r--r--idrop-swing/src/main/resources/idrop.properties2
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy10
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy2
-rw-r--r--pom.xml2
4 files changed, 8 insertions, 8 deletions
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 24c6e71..c15f2d1 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -38,4 +38,4 @@ idrop.irods.parallel.timeout=60
# maximum threads allowed for parallel transfer
idrop.parallel.transfer.max.threads=4
# use executor pool for parallel transfers (true to use pool, false to use normal th
-idrop.parallel.use.pool=true
+idrop.parallel.use.pool=false
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index f28791c..6a072c4 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -26,13 +26,13 @@ grails.project.dependency.resolution = {
}
dependencies {
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
- test 'org.irods.jargon:jargon-test:2.5.0-beta3-SNAPSHOT'
+ test 'org.irods.jargon:jargon-test:3.0.0-beta2-SNAPSHOT'
test 'org.mockito:mockito-all:1.8.1'
provided 'junit:junit:4.8.1'
- 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') {
+ compile 'org.irods.jargon:jargon-core:3.0.0-beta2-SNAPSHOT'
+ compile 'org.irods.jargon:jargon-security:3.0.0-beta2-SNAPSHOT'
+ compile 'org.irods.jargon:jargon-data-utils:3.0.0-beta2-SNAPSHOT'
+ compile ('org.irods.jargon:jargon-user-tagging:3.0.0-beta2-SNAPSHOT') {
exclude 'junit'
}
compile 'org.springframework.security:spring-security-core:3.0.5.RELEASE'
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy
index 5abf249..3f32883 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy
@@ -45,7 +45,7 @@ class IdropLiteController {
UserAO userAO = irodsAccessObjectFactory.getUserAO(irodsAccount)
def password = userAO.getTemporaryPasswordForConnectedUser()
- DataCacheService dataCacheService = new DataCacheServiceImpl();
+ DataCacheService dataCacheService = new DataCacheServiceImpl()
dataCacheService.irodsAccessObjectFactory = irodsAccessObjectFactory
dataCacheService.irodsAccount = irodsAccount
dataCacheService.putStringValueIntoCache(irodsAccount.password, password)
diff --git a/pom.xml b/pom.xml
index e9c2208..abf1c72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<url>https://code.renci.org/gf/project/irodsidrop/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jargon.version>2.5.0-beta3-SNAPSHOT</jargon.version>
+ <jargon.version>3.0.0-beta1</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>