summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael_conway@unc.edu>2013-11-08 14:34:14 (GMT)
committer mconway <michael_conway@unc.edu>2013-11-08 14:34:14 (GMT)
commit9300b5f96fdc3989d232051a68e765d376200cf3 (patch)
tree9a8aab21968df25fb904c80b25d8873925468b63
parentb99489017207c4a1812bec89d2657179b7e295f4 (diff)
downloadQCG-Data-9300b5f96fdc3989d232051a68e765d376200cf3.zip
QCG-Data-9300b5f96fdc3989d232051a68e765d376200cf3.tar.gz
QCG-Data-9300b5f96fdc3989d232051a68e765d376200cf3.tar.bz2
[#964] align versions for move to development
-rw-r--r--idrop-lite/pom.xml2
-rw-r--r--idrop-swing/pom.xml2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java11
-rw-r--r--idrop-web/application.properties2
-rw-r--r--pom.xml2
5 files changed, 5 insertions, 14 deletions
diff --git a/idrop-lite/pom.xml b/idrop-lite/pom.xml
index f29c910..9473d72 100644
--- a/idrop-lite/pom.xml
+++ b/idrop-lite/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>idrop</artifactId>
<groupId>org.irods</groupId>
- <version>b964-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.irods.idrop</groupId>
<artifactId>idrop-lite</artifactId>
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index d163fd4..4c1a7c1 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
- <version>b964-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.irods.idrop</groupId>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java
index 159410d..a7f5584 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java
@@ -133,17 +133,8 @@ public class AboutDialog extends javax.swing.JDialog {
pnlButtons.add(btnOK);
getContentPane().add(pnlButtons, java.awt.BorderLayout.SOUTH);
-
- lblIdropVersion.setText(Version.VERSION + " - " + Version.BUILD_TIME);
- lblJargonVersion.setText(JargonVersion.VERSION + "-"
- + JargonVersion.BUILD_TIME);
-
- lblProjectHomeLink = IDropUtils.linkify("Click to open browser to the iDrop project home", "https://code.renci.org/gf/project/irodsidrop/", "iDrop GForge project page");
- pnlItems.add(lblProjectHomeLink, new java.awt.GridBagConstraints());
- lblProjectTrackerLink = IDropUtils.linkify("iDrop project feature and bug tracker", "https://code.renci.org/gf/project/irodsidrop/tracker/", "iDrop GForge bug and feature tracker page");
- pnlItems.add(lblProjectTrackerLink, new java.awt.GridBagConstraints());
- pack();
+ pack();
}// </editor-fold>//GEN-END:initComponents
private void btnOKPressed(final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnOKPressed
diff --git a/idrop-web/application.properties b/idrop-web/application.properties
index cd3ca13..8d46448 100644
--- a/idrop-web/application.properties
+++ b/idrop-web/application.properties
@@ -3,4 +3,4 @@
app.grails.version=2.2.3
app.name=idrop-web2
app.servlet.version=2.5
-app.version=2.0.1
+app.version=2.1.0
diff --git a/pom.xml b/pom.xml
index 32ffb27..94ce602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
<packaging>pom</packaging>
- <version>b964-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</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>