summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-11-28 22:12:21 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-11-28 22:12:21 (GMT)
commit1c6da5f452ba06f11cda1baab829ecf835870a28 (patch)
tree8a4e4905a2966dbc01f2f6383eb8167fa389e9d0
parentac651a0c8e29e497e5e98ce7992ec2da87b91d2f (diff)
downloadQCG-Data-1c6da5f452ba06f11cda1baab829ecf835870a28.zip
QCG-Data-1c6da5f452ba06f11cda1baab829ecf835870a28.tar.gz
QCG-Data-1c6da5f452ba06f11cda1baab829ecf835870a28.tar.bz2
[#1081] 1.0.2 release activities
-rw-r--r--idrop-lite/release_notes.txt7
-rw-r--r--idrop-swing/release_notes.txt6
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy10
-rw-r--r--idrop-web/grails-app/views/browse/_browseTabContent.gsp2
-rw-r--r--idrop-web/release_notes.txt9
-rw-r--r--pom.xml2
-rw-r--r--release_notes.txt8
7 files changed, 22 insertions, 22 deletions
diff --git a/idrop-lite/release_notes.txt b/idrop-lite/release_notes.txt
index f5b8582..3fcbaf7 100644
--- a/idrop-lite/release_notes.txt
+++ b/idrop-lite/release_notes.txt
@@ -1,9 +1,8 @@
*'''Project''': iDrop-lite transfer applet
-*'''Date''': 11/26/2012
-*'''Release Version''': 1.0.2-beta2
-*'''git tag''': 1.0.2-beta1
-*'''download jar with dependencies (run java -jar jarname)''': https://code.renci.org/gf/project/irodsidrop/frs/?action=FrsReleaseBrowse&frs_package_id=4
+*'''Date''': 11/28/2012
+*'''Release Version''': 1.0.2
+*'''git tag''': 1.0.2
NOTE: the release notes were not yet in place for this project, going forward bugs and features addressed will be reflected here
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index 15c97fd..ab0cc47 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -1,8 +1,8 @@
*'''Project''': iDrop-swing- Desktop iRODS transfer manager
-*'''Date''': 11/26/2012
-*'''Release Version''': 1.0.2-beta2
-*'''git tag''': 1.0.2-beta2
+*'''Date''': 11/28/2012
+*'''Release Version''': 1.0.2
+*'''git tag''': 1.0.2
==News==
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index 62d59c4..0752101 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-SNAPSHOT') {
+ compile ('org.irods.jargon:jargon-core:3.2.1.2') {
excludes "org.bouncycastle"
}
//compile 'org.irods.jargon:jargon-security:3.2.0-SNAPSHOT'
- 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.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.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/_browseTabContent.gsp b/idrop-web/grails-app/views/browse/_browseTabContent.gsp
index de09171..3fb0881 100644
--- a/idrop-web/grails-app/views/browse/_browseTabContent.gsp
+++ b/idrop-web/grails-app/views/browse/_browseTabContent.gsp
@@ -17,7 +17,7 @@
<div id="browser" class="wrapper" style="height:85%;width:100%;clear:both;">
<div id="dataTreeView" style="width: 100%; height: 700px; overflow: hidden;">
- <div id="dataTreeDivWrapper" class="ui-layout-west" style="width: 25%; height: 100%; position:relative;">
+ <div id="dataTreeDivWrapper" class="ui-layout-west" style="width: 25%; height: 100%; position:relative;overflow:hidden;">
<div id="dataTreeToolbar" style="width:100%; height:3%;display:block;" class="fg-toolbar">
<div id="dataTreeMenu" class="fg-buttonset fg-buttonset-multi"
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index cb31bc6..1f5af9a 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -1,11 +1,12 @@
-*'''Project''': idrop-web
+ime*'''Project''': idrop-web
*'''Date''': 11/26/12
-*'''Release Version''': 1.0.2-beta2
-*'''git tag''': 1.0.2-beta2
+*'''Release Version''': 1.0.2
+*'''git tag''': 1.0.2
==News==
-This is a release of iDrop web version 1.0.2
+This is a release of iDrop web version 1.0.2. This is a terminal release of the 1.0 iDrop. Further feature development will
+occur in iDrop 2.0.
==Requirements==
diff --git a/pom.xml b/pom.xml
index 31112fa..871fa4c 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.2.1.2-SNAPSHOT</jargon.version>
+ <jargon.version>3.2.1.2</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>
diff --git a/release_notes.txt b/release_notes.txt
index 1a92814..cfa30f4 100644
--- a/release_notes.txt
+++ b/release_notes.txt
@@ -1,11 +1,11 @@
*'''Project''': iDrop Suite - iDrop Clients
-*'''Date''': 4/13/2012
-*'''Release Version''': 1.0.0
-*'''git tag''': 1.0.0
+*'''Date''': 11/28/2012
+*'''Release Version''': 1.0.2
+*'''git tag''': 1.0.2
==News==
-This is an initial release of the iDrop Suite components. This serves as an initial checkpoint, and will be followed on by regular updates.
+See the release notes in the individual subprojects for details.
Please go to [[https://code.renci.org/gf/project/irodsidrop/]] for the latest news and info.