summaryrefslogtreecommitdiffstats
path: root/idrop-swing/pom.xml
diff options
context:
space:
mode:
authorJason Reilly <jdr0887@renci.org>2011-07-05 14:06:53 (GMT)
committer Jason Reilly <jdr0887@renci.org>2011-07-05 14:06:53 (GMT)
commitfdfe7790123941f8e66d9564ccbb687c877256bb (patch)
tree2015c7a5829ed0751e8c64a1f01e7a149b754128 /idrop-swing/pom.xml
parent4a280fc1b84cd5a56f75448c23cfd47f332d767c (diff)
parent90c8a0f23b1d2aeee79c42860215175b2d8b34a3 (diff)
downloadQCG-Data-fdfe7790123941f8e66d9564ccbb687c877256bb.zip
QCG-Data-fdfe7790123941f8e66d9564ccbb687c877256bb.tar.gz
QCG-Data-fdfe7790123941f8e66d9564ccbb687c877256bb.tar.bz2
Merge branch 'jdr0887-55-227' into jdr0887-55-227-merge
Conflicts: idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DeleteIRODSDialog.java idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/DeleteLocalFileDialog.java idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/MoveOrCopyiRODSDialog.java idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSOutlineModel.java idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/LocalFileTree.java idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/LocalTreeTransferHandler.java
Diffstat (limited to 'idrop-swing/pom.xml')
-rw-r--r--idrop-swing/pom.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index afd7435..8b94388 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -107,7 +107,22 @@
<scope>runtime</scope>
</dependency>
-->
-
+ <dependency>
+ <groupId>com.jgoodies</groupId>
+ <artifactId>validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cookxml</groupId>
+ <artifactId>cookswing</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cookxml</groupId>
+ <artifactId>cookxml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cookxml</groupId>
+ <artifactId>cookswing</artifactId>
+ </dependency>
<dependency>
<groupId>org.irods.jargon</groupId>
<artifactId>jargon-data-utils</artifactId>