summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-10-24 13:56:19 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-10-24 13:56:19 (GMT)
commitbd5cbf095f7241222c738d77a9d709cbeb57d00e (patch)
tree7c4fdd8e4975f90f9b3a99232bb1a447b0ef3fb6
parentc358ebce9223c7dc902178234bea5b097226836b (diff)
downloadQCG-Data-bd5cbf095f7241222c738d77a9d709cbeb57d00e.zip
QCG-Data-bd5cbf095f7241222c738d77a9d709cbeb57d00e.tar.gz
QCG-Data-bd5cbf095f7241222c738d77a9d709cbeb57d00e.tar.bz2
[#1032] iDrop swing hangs up Looking for configuration information.
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
-rw-r--r--pom.xml4
3 files changed, 4 insertions, 4 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 eb1a04e..11ea40e 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,5 +1,5 @@
package org.irods.jargon.idrop.lite;
public final class Version {
public static String VERSION="1.0.2-SNAPSHOT";
- public static String BUILD_TIME="20121012-1550";
+ public static String BUILD_TIME="20121024-0941";
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index 1bafb4e..4fb7c2a 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
public static String VERSION="1.0.2-SNAPSHOT";
- public static String BUILD_TIME="20121012-1550";
+ public static String BUILD_TIME="20121024-0941";
}
diff --git a/pom.xml b/pom.xml
index 212e2e5..2438c7a 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-beta2</jargon.version>
+ <jargon.version>3.2.1-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>
@@ -284,7 +284,7 @@
<dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
- <version>3.2.3.GA</version>
+ <version>3.6.8.Final</version>
</dependency>
<dependency>
<groupId>c3p0</groupId>