Cleaning up some of the dependencies and their versioning.
diff --git a/activity-palette-ui/pom.xml b/activity-palette-ui/pom.xml
index cf5acba..52549d0 100644
--- a/activity-palette-ui/pom.xml
+++ b/activity-palette-ui/pom.xml
@@ -56,12 +56,11 @@
<dependency>
<groupId>uk.org.taverna.commons</groupId>
<artifactId>taverna-services-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
diff --git a/data-management-config-ui/pom.xml b/data-management-config-ui/pom.xml
index 15ff6af..4afb4ad 100644
--- a/data-management-config-ui/pom.xml
+++ b/data-management-config-ui/pom.xml
@@ -55,8 +55,8 @@
<version>${aspectj.version}</version>
</dependency> -->
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
diff --git a/design-ui/pom.xml b/design-ui/pom.xml
index 02b10cb..f88f676 100644
--- a/design-ui/pom.xml
+++ b/design-ui/pom.xml
@@ -39,7 +39,6 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/graph-model/pom.xml b/graph-model/pom.xml
index a0a9725..8e255ba 100644
--- a/graph-model/pom.xml
+++ b/graph-model/pom.xml
@@ -104,22 +104,20 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.batik</groupId>
<artifactId>batik-osgi</artifactId>
- <version>1.7.0</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
diff --git a/graph-view/pom.xml b/graph-view/pom.xml
index ba5bd54..df8cdc9 100644
--- a/graph-view/pom.xml
+++ b/graph-view/pom.xml
@@ -64,22 +64,19 @@
<dependency>
<groupId>uk.org.taverna.commons</groupId>
<artifactId>taverna-services-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.batik</groupId>
<artifactId>batik-osgi</artifactId>
- <version>1.7.0</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
diff --git a/monitor-view/pom.xml b/monitor-view/pom.xml
index 0c13967..b4e102f 100644
--- a/monitor-view/pom.xml
+++ b/monitor-view/pom.xml
@@ -49,13 +49,13 @@
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index fe1674b..bfe072c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,10 +79,30 @@
<version>1.5.1</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>uk.org.taverna.databundle</groupId>
+ <artifactId>databundle</artifactId>
+ <version>0.2.0</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>org.apache.batik</groupId>
+ <artifactId>batik-osgi</artifactId>
+ <version>1.7.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/reference-ui/pom.xml b/reference-ui/pom.xml
index fcc1431..3755c20 100644
--- a/reference-ui/pom.xml
+++ b/reference-ui/pom.xml
@@ -51,7 +51,6 @@
<dependency>
<groupId>uk.org.taverna.databundle</groupId>
<artifactId>databundle</artifactId>
- <version>0.2.0</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.configuration</groupId>
@@ -60,19 +59,8 @@
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>2.11.0</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/results-view/pom.xml b/results-view/pom.xml
index 3ab13e9..063e6cc 100644
--- a/results-view/pom.xml
+++ b/results-view/pom.xml
@@ -84,7 +84,6 @@
<dependency>
<groupId>uk.org.taverna.databundle</groupId>
<artifactId>databundle</artifactId>
- <version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -106,8 +105,8 @@
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/workflow-explorer/pom.xml b/workflow-explorer/pom.xml
index 7ede6ef..8076b99 100644
--- a/workflow-explorer/pom.xml
+++ b/workflow-explorer/pom.xml
@@ -60,17 +60,15 @@
<dependency>
<groupId>uk.org.taverna.commons</groupId>
<artifactId>taverna-services-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
<version>${commons.beanutils.version}</version>
</dependency>
</dependencies>
diff --git a/workflow-view/pom.xml b/workflow-view/pom.xml
index 418687f..b2bd0ef 100644
--- a/workflow-view/pom.xml
+++ b/workflow-view/pom.xml
@@ -60,17 +60,15 @@
<dependency>
<groupId>uk.org.taverna.commons</groupId>
<artifactId>taverna-services-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
</dependencies>
</project>
