summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-swing/pom.xml202
-rw-r--r--pom.xml21
2 files changed, 29 insertions, 194 deletions
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index 107d4e1..bc434b9 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -1,64 +1,18 @@
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.irods</groupId>
+ <artifactId>irods-idrop</artifactId>
+ <version>0.0.9-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.irods.jargon</groupId>
- <artifactId>iDropDesktop</artifactId>
+ <artifactId>idrop-swing</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>iDropDesktop</name>
- <url>http://www.irods.org</url>
- <issueManagement>
- <system>Bugzilla</system>
- <url>https://www.irods.org/bugzilla/index.cgi</url>
- </issueManagement>
- <scm>
- <connection>scm:javasvn:svn://irodssvn.ucsd.edu/jargon_x_prototypes/iDropDesktop/trunk</connection>
- <developerConnection>scm:javasvn:svn://irodssvn.ucsd.edu/jargon_x_prototypes/iDropDesktop/trunk</developerConnection>
- <url>svn://irodssvn.ucsd.edu/jargon_x_prototypes/iDropDesktop/</url>
- </scm>
- <organization>
- <name>DICE</name>
- <url>http://www.irods.org</url>
- </organization>
- <developers>
- <developer>
- <id>mconway</id>
- <name>Mike Conway</name>
- <email>michael_conway@unc.edu</email>
- <url>http://www.irods.org</url>
- <organization>DICE</organization>
- <organizationUrl>http://www.irods.org</organizationUrl>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
+ <name>irods-idrop</name>
+
<build>
<plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
- <dependencies>
- <dependency>
- <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
- <artifactId>maven-scm-provider-svnjava</artifactId>
- <version>1.10</version>
- </dependency>
- </dependencies>
- <configuration>
- <!--
- <tagBase>scm:javasvn:svn://intranet.lib.unc.edu/cdr/cdr-metadata/tags</tagBase>
- -->
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
- <resume>false</resume>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo.webstart</groupId>
<artifactId>webstart-maven-plugin</artifactId>
@@ -70,7 +24,6 @@
</execution>
</executions>
<configuration>
-
<!--
Set to true to exclude all transitive dependencies. Default is false.
@@ -80,7 +33,6 @@
<!-- The path where the libraries are stored within the jnlp structure. not required. by default the libraries are within the working directory -->
<libPath>lib</libPath>
-
<!-- JNLP generation -->
<jnlp>
<!-- default values -->
@@ -93,7 +45,6 @@
<mainClass>org.irods.jargon.idrop.desktop.systraygui.iDrop</mainClass>
</jnlp>
-
<!-- SIGNING -->
<!-- defining this will automatically sign the jar and its dependencies, if necessary -->
<sign>
@@ -132,153 +83,18 @@
<!--install>false</install--> <!-- not yet supported -->
<verbose>true</verbose>
-
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/alternateLocation</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <fork>true</fork>
- <compilerVersion>1.6</compilerVersion>
- <source>1.6</source>
- <target>1.6</target>
- <compilerArgument>-Xlint:-unchecked</compilerArgument>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>production</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <debug>false</debug>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <type>jar</type>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.irods</groupId>
- <artifactId>jargon-core</artifactId>
- <version>2.4.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-test</artifactId>
- <version>2.4.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-user-tagging</artifactId>
- <version>2.4.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-transfer-engine</artifactId>
- <version>2.4.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swing-layout</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/sun_checks.xml</configLocation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
diff --git a/pom.xml b/pom.xml
index 840f7af..fab2e19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.irods</groupId>
<artifactId>irods-idrop</artifactId>
<packaging>pom</packaging>
- <version>0.0.9-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<name>Jargon</name>
<description>iRODS :: iDrop</description>
<url>https://code.renci.org/gf/project/irodsidrop/</url>
@@ -263,6 +263,25 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods.jargon</groupId>
+ <artifactId>jargon-test</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</groupId>
+ <artifactId>jargon-transfer-engine</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>