summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README5
-rw-r--r--idrop-swing/pom.xml146
-rw-r--r--pom.xml8
3 files changed, 87 insertions, 72 deletions
diff --git a/README b/README
index f143814..c3ee491 100644
--- a/README
+++ b/README
@@ -12,3 +12,8 @@ To skip tests when building:
mvn clean install -Dmaven.test.skip=true
mvn exec:java -Dexec.mainClass=org.irods.jargon.idrop.desktop.systraygui.IDROPDesktop
+
+To generate a single distributable jar of the iDROP swing binaries:
+
+ cd idrop-swing
+ mvn assembly:assembly -Dmaven.test.skip=true
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index ca7c0a1..82a10a6 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -10,6 +10,73 @@
<artifactId>idrop-swing</artifactId>
<packaging>jar</packaging>
<name>idrop-swing</name>
+ <dependencies>
+ <!--
+ Sun's JnlpDownladServlet takes the template JNLP file and inserts
+ relevant values for $$codebase and other parameters
+ -->
+ <!-- <dependency>
+ <groupId>com.sun.java.jnlp</groupId>
+ <artifactId>jnlp-servlet</artifactId>
+ <version>5.0</version>
+ <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>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods.jargon</groupId>
+ <artifactId>jargon-test</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods.jargon</groupId>
+ <artifactId>jargon-user-tagging</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods.jargon.transfer</groupId>
+ <artifactId>jargon-transfer-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-swing-outline</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>swing-layout</artifactId>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -93,79 +160,16 @@
<verbose>true</verbose>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
</plugins>
</build>
- <dependencies>
- <!--
- Sun's JnlpDownladServlet takes the template JNLP file and inserts
- relevant values for $$codebase and other parameters
- -->
- <!-- <dependency>
- <groupId>com.sun.java.jnlp</groupId>
- <artifactId>jnlp-servlet</artifactId>
- <version>5.0</version>
- <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>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-test</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-user-tagging</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon.transfer</groupId>
- <artifactId>jargon-transfer-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-netbeans-swing-outline</artifactId>
- <version>RELEASE70</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.swinglabs</groupId>
- <artifactId>swing-layout</artifactId>
- <version>1.0.3</version>
- </dependency>
- </dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index d1408b7..15423f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
<jargon.version>2.4.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>RELEASE70</netbeans.version>
</properties>
<issueManagement>
<system>gForge</system>
@@ -169,6 +170,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-netbeans-swing-outline</artifactId>
+ <version>${netbeans.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.irods.jargon</groupId>
<artifactId>jargon-core</artifactId>
<version>${jargon.version}</version>
@@ -201,7 +207,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8</version>
+ <version>4.8.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>