summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy2
-rw-r--r--idrop-web/pom.xml1
-rw-r--r--pom.xml105
3 files changed, 63 insertions, 45 deletions
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index a580bc7..9fcb7b3 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -26,7 +26,7 @@ grails.project.dependency.resolution = {
}
dependencies {
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
- test 'org.irods.jargon:jargon-test:2.4.1-SNAPSHOT'
+ test 'org.irods:jargon-test:2.4.1-SNAPSHOT'
compile 'org.irods:jargon-core:2.4.1-SNAPSHOT'
compile 'org.irods:jargon-security:2.4.1-SNAPSHOT'
compile 'org.springframework.security:spring-security-core:3.0.5.RELEASE'
diff --git a/idrop-web/pom.xml b/idrop-web/pom.xml
index cc8cb5f..955b1fb 100644
--- a/idrop-web/pom.xml
+++ b/idrop-web/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
<scope>runtime</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 90a64a6..9747387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,12 @@
<packaging>pom</packaging>
<version>0.9.0-SNAPSHOT</version>
<name>Jargon</name>
- <description>iRODS :: iDrop</description>
+ <description>iRODS iDrop - personal web and desktop grid access clients</description>
<url>https://code.renci.org/gf/project/irodsidrop/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jargon.version>2.4.1-SNAPSHOT</jargon.version>
+ <spring.core.version>3.0.5.RELEASE</spring.core.version>
</properties>
<issueManagement>
<system>gForge</system>
@@ -98,7 +99,6 @@
<checksumPolicy>fail</checksumPolicy>
</snapshots>
</repository>
-
</repositories>
<distributionManagement>
<repository>
@@ -163,11 +163,33 @@
</reporting>
<dependencyManagement>
<dependencies>
- <dependency>
+
+
+ <dependency>
<groupId>org.irods</groupId>
<artifactId>jargon-core</artifactId>
<version>${jargon.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-test</artifactId>
+ <version>${jargon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-transfer-engine</artifactId>
+ <version>${jargon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-user-tagging</artifactId>
+ <version>${jargon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-security</artifactId>
+ <version>${jargon.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -204,26 +226,6 @@
<version>1.8.1</version>
</dependency>
<dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-test</artifactId>
- <version>${jargon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.irods</groupId>
- <artifactId>jargon-security</artifactId>
- <version>${jargon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-user-tagging</artifactId>
- <version>${jargon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-transfer-engine</artifactId>
- <version>${jargon.version}</version>
- </dependency>
- <dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
@@ -241,7 +243,24 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.1.RELEASE</version>
+ <version>${spring.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring.core.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.core.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>hibernate</groupId>
@@ -294,25 +313,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>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-test</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-user-tagging</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods</groupId>
+ <artifactId>jargon-transfer-engine</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>