Clean up dependency management.
diff --git a/activity-icons-api/pom.xml b/activity-icons-api/pom.xml
index 2ffa08b..0024571 100644
--- a/activity-icons-api/pom.xml
+++ b/activity-icons-api/pom.xml
@@ -10,11 +10,11 @@
<artifactId>activity-icons-api</artifactId>
<packaging>bundle</packaging>
<name>Activity icon manager API</name>
+
<dependencies>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/activity-palette-api/pom.xml b/activity-palette-api/pom.xml
index 2f5ca5c..1c9ab8c 100644
--- a/activity-palette-api/pom.xml
+++ b/activity-palette-api/pom.xml
@@ -46,18 +46,15 @@
<dependency>
<groupId>uk.org.taverna.configuration</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activity-tools/pom.xml b/activity-tools/pom.xml
index df9213a..c84a263 100644
--- a/activity-tools/pom.xml
+++ b/activity-tools/pom.xml
@@ -25,7 +25,6 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/configuration-api/pom.xml b/configuration-api/pom.xml
index c3d9b6d..81e819f 100644
--- a/configuration-api/pom.xml
+++ b/configuration-api/pom.xml
@@ -17,8 +17,6 @@
<dependency>
<groupId>uk.org.taverna.configuration</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
</dependency>
</dependencies>
-
</project>
diff --git a/contextual-views-api/pom.xml b/contextual-views-api/pom.xml
index fdb6d70..5b8608f 100644
--- a/contextual-views-api/pom.xml
+++ b/contextual-views-api/pom.xml
@@ -48,36 +48,31 @@
<artifactId>workbench-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>observer</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.commons</groupId>
<artifactId>taverna-services-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
</dependencies>
<repositories>
diff --git a/edits-api/pom.xml b/edits-api/pom.xml
index 844a0d3..1b52630 100644
--- a/edits-api/pom.xml
+++ b/edits-api/pom.xml
@@ -15,18 +15,14 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>observer</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson-databind.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/file-api/pom.xml b/file-api/pom.xml
index e5524f7..2b6205d 100644
--- a/file-api/pom.xml
+++ b/file-api/pom.xml
@@ -13,21 +13,19 @@
<description>
API for doing file (ie. workflow) open/save in the workbench.
</description>
+
<dependencies>
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>observer</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/helper-api/pom.xml b/helper-api/pom.xml
index 46c2e37..9f3945f 100644
--- a/helper-api/pom.xml
+++ b/helper-api/pom.xml
@@ -31,32 +31,28 @@
<artifactId>workbench-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
- <version>${javahelp.version}</version>
<scope>provided</scope>
</dependency>
<!-- Required by javahelp -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>com.springsource.javax.servlet</artifactId>
- <version>${javax.servlet.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>com.springsource.javax.servlet.jsp</artifactId>
- <version>${javax.servlet.jsp.version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>com.springsource.javax.el</artifactId>
- <version>${javax.el.version}</version>
</dependency>
<dependency>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/menu-api/pom.xml b/menu-api/pom.xml
index 4df68b5..247cd41 100644
--- a/menu-api/pom.xml
+++ b/menu-api/pom.xml
@@ -11,17 +11,18 @@
<artifactId>menu-api</artifactId>
<packaging>bundle</packaging>
<name>Menu generation API</name>
- <description>An SPI system for building UI menues</description>
+ <description>An SPI system for building UI menus</description>
+
<dependencies>
<dependency>
<groupId>net.sf.taverna.t2.ui-api</groupId>
<artifactId>selection-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>observer</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index c079b91..43f8a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,67 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.lang</groupId>
+ <artifactId>ui</artifactId>
+ <version>${t2.lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.lang</groupId>
+ <artifactId>observer</artifactId>
+ <version>${t2.lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.configuration</groupId>
+ <artifactId>taverna-configuration-api</artifactId>
+ <version>${taverna.configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-api</artifactId>
+ <version>${scufl2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-validation</artifactId>
+ <version>${scufl2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.commons</groupId>
+ <artifactId>taverna-services-api</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-databind.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ <version>${javahelp.version}</version>
+ </dependency>
+ <!-- Required by javahelp -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet</artifactId>
+ <version>${javax.servlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet.jsp</artifactId>
+ <version>${javax.servlet.jsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>com.springsource.javax.el</artifactId>
+ <version>${javax.el.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<repositories>
diff --git a/report-api/pom.xml b/report-api/pom.xml
index d8f2542..706fd17 100644
--- a/report-api/pom.xml
+++ b/report-api/pom.xml
@@ -14,29 +14,27 @@
<description>
API for creating reports about dataflows in the workbench.
</description>
+
<dependencies>
<dependency>
<groupId>uk.org.taverna.configuration</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>observer</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
</dependencies>
- <repositories>
+
+ <repositories>
<repository>
<releases />
<snapshots>
diff --git a/selection-api/pom.xml b/selection-api/pom.xml
index dd5d735..3925201 100644
--- a/selection-api/pom.xml
+++ b/selection-api/pom.xml
@@ -11,24 +11,25 @@
<packaging>bundle</packaging>
<name>Selection API</name>
<description>API for handling selection in the workbench.</description>
+
<dependencies>
<dependency>
<groupId>net.sf.taverna.t2.ui-api</groupId>
<artifactId>workbench-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>observer</artifactId>
- <version>${t2.lang.version}</version>
</dependency>
</dependencies>
- <repositories>
+
+ <repositories>
<repository>
<releases />
<snapshots>
