summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLisa Stillwell <lisa@renci.org>2012-10-24 15:37:05 (GMT)
committer Lisa Stillwell <lisa@renci.org>2012-10-24 15:37:05 (GMT)
commit3dc11f3d486468834845fa2a615d4dfec3543c0f (patch)
tree243527268da653de592e4cad9565ad0299ea3c4d
parent6d46c90aaa8408f7b9115ad24a4703dcb51ba673 (diff)
downloadQCG-Data-3dc11f3d486468834845fa2a615d4dfec3543c0f.zip
QCG-Data-3dc11f3d486468834845fa2a615d4dfec3543c0f.tar.gz
QCG-Data-3dc11f3d486468834845fa2a615d4dfec3543c0f.tar.bz2
[#983] fix up files that needed merging due to stash on branch change
-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.xml2
3 files changed, 3 insertions, 3 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..a1c6c10 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-1006";
}
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..fabe28c 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-1006";
}
diff --git a/pom.xml b/pom.xml
index 78a0ab7..212e2e5 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-SNAPSHOT</jargon.version>
+ <jargon.version>3.2.1-beta2</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>