You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/03/06 23:34:30 UTC

[34/50] [abbrv] incubator-taverna-workbench git commit: org.apache.taverna.* updates for poms

org.apache.taverna.* updates for poms


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/c19de831
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/c19de831
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/c19de831

Branch: refs/heads/master
Commit: c19de831a8db81be4d158e5e01a8d5424bf22bed
Parents: 4d2409a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Mar 6 22:06:52 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Mar 6 22:06:52 2015 +0000

----------------------------------------------------------------------
 taverna-disabled-activity-ui/pom.xml            | 14 ++++++-------
 taverna-stringconstant-activity-ui/pom.xml      | 16 +++++++-------
 taverna-unrecognized-activity-ui/pom.xml        |  4 ++--
 taverna-workbench-activity-icons-api/pom.xml    |  2 +-
 taverna-workbench-activity-palette-api/pom.xml  |  6 +++---
 taverna-workbench-activity-palette-impl/pom.xml |  2 +-
 taverna-workbench-activity-palette-ui/pom.xml   | 12 +++++------
 taverna-workbench-activity-tools/pom.xml        |  6 +++---
 taverna-workbench-configuration-impl/pom.xml    |  6 +++---
 taverna-workbench-contextual-views-api/pom.xml  | 16 +++++++-------
 taverna-workbench-contextual-views-impl/pom.xml |  6 +++---
 taverna-workbench-contextual-views/pom.xml      |  8 +++----
 taverna-workbench-credential-manager-ui/pom.xml |  6 +++---
 .../pom.xml                                     |  4 ++--
 taverna-workbench-design-ui/pom.xml             | 10 ++++-----
 taverna-workbench-edits-api/pom.xml             |  2 +-
 taverna-workbench-edits-impl/pom.xml            |  8 +++----
 taverna-workbench-file-api/pom.xml              |  2 +-
 taverna-workbench-file-impl/pom.xml             | 18 ++++++++--------
 taverna-workbench-graph-model/pom.xml           | 12 +++++------
 taverna-workbench-graph-view/pom.xml            | 16 +++++++-------
 taverna-workbench-helper-api/pom.xml            |  2 +-
 taverna-workbench-helper/pom.xml                |  2 +-
 taverna-workbench-httpproxy-config/pom.xml      |  2 +-
 taverna-workbench-iteration-strategy-ui/pom.xml | 10 ++++-----
 taverna-workbench-loop-ui/pom.xml               | 16 +++++++-------
 taverna-workbench-menu-api/pom.xml              |  2 +-
 taverna-workbench-menu-impl/pom.xml             |  6 +++---
 taverna-workbench-menu-items/pom.xml            | 16 +++++++-------
 taverna-workbench-monitor-view/pom.xml          |  8 +++----
 taverna-workbench-parallelize-ui/pom.xml        |  8 +++----
 .../pom.xml                                     | 12 +++++------
 taverna-workbench-perspective-design/pom.xml    | 22 ++++++++++----------
 .../pom.xml                                     |  6 +++---
 taverna-workbench-perspective-results/pom.xml   |  8 +++----
 taverna-workbench-plugin-manager/pom.xml        |  4 ++--
 taverna-workbench-plugins-gui/pom.xml           |  4 ++--
 taverna-workbench-reference-ui/pom.xml          |  6 +++---
 taverna-workbench-renderers-exts/pom.xml        |  4 ++--
 taverna-workbench-renderers-impl/pom.xml        |  2 +-
 taverna-workbench-report-api/pom.xml            |  4 ++--
 taverna-workbench-report-explainer/pom.xml      | 14 ++++++-------
 taverna-workbench-report-impl/pom.xml           |  6 +++---
 taverna-workbench-report-view/pom.xml           | 18 ++++++++--------
 taverna-workbench-results-view/pom.xml          |  8 +++----
 taverna-workbench-retry-ui/pom.xml              |  8 +++----
 taverna-workbench-run-ui/pom.xml                | 10 ++++-----
 taverna-workbench-selection-api/pom.xml         |  4 ++--
 taverna-workbench-selection-impl/pom.xml        |  6 +++---
 taverna-workbench-update-manager/pom.xml        |  2 +-
 taverna-workbench-workbench-impl/pom.xml        | 16 +++++++-------
 taverna-workbench-workflow-explorer/pom.xml     | 20 +++++++++---------
 taverna-workbench-workflow-view/pom.xml         | 14 ++++++-------
 53 files changed, 223 insertions(+), 223 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-disabled-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-disabled-activity-ui/pom.xml b/taverna-disabled-activity-ui/pom.xml
index b02dd87..528ebcf 100644
--- a/taverna-disabled-activity-ui/pom.xml
+++ b/taverna-disabled-activity-ui/pom.xml
@@ -29,32 +29,32 @@
 	<name>Taverna 2 Disabled Activity UI</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-icons-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-tools</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -74,7 +74,7 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-stringconstant-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/pom.xml b/taverna-stringconstant-activity-ui/pom.xml
index ced319e..d48fb57 100644
--- a/taverna-stringconstant-activity-ui/pom.xml
+++ b/taverna-stringconstant-activity-ui/pom.xml
@@ -29,27 +29,27 @@
 	<name>Taverna 2 StringConstant Activity UI</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-icons-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-palette-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -72,18 +72,18 @@
 			<scope>test</scope>
 		</dependency>
 		<!-- <dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-palette-impl</artifactId>
 			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency> -->
 		<!-- <dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-tools</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency> -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-tools</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-unrecognized-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-unrecognized-activity-ui/pom.xml b/taverna-unrecognized-activity-ui/pom.xml
index c69f4b4..05349a8 100644
--- a/taverna-unrecognized-activity-ui/pom.xml
+++ b/taverna-unrecognized-activity-ui/pom.xml
@@ -29,12 +29,12 @@
 	<name>Taverna 2 Unrecognized Activity UI</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-activity-icons-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-icons-api/pom.xml b/taverna-workbench-activity-icons-api/pom.xml
index 94f41b0..6f73b2f 100644
--- a/taverna-workbench-activity-icons-api/pom.xml
+++ b/taverna-workbench-activity-icons-api/pom.xml
@@ -29,7 +29,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-activity-palette-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-palette-api/pom.xml b/taverna-workbench-activity-palette-api/pom.xml
index 56ed37b..1ba3c41 100644
--- a/taverna-workbench-activity-palette-api/pom.xml
+++ b/taverna-workbench-activity-palette-api/pom.xml
@@ -44,12 +44,12 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -63,7 +63,7 @@
 			<artifactId>taverna-configuration-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-activity-palette-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-palette-impl/pom.xml b/taverna-workbench-activity-palette-impl/pom.xml
index 38178ec..bed75bb 100644
--- a/taverna-workbench-activity-palette-impl/pom.xml
+++ b/taverna-workbench-activity-palette-impl/pom.xml
@@ -29,7 +29,7 @@
 	<description>Activity Palette Implementation</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-palette-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-activity-palette-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-palette-ui/pom.xml b/taverna-workbench-activity-palette-ui/pom.xml
index fb25d1e..23d6fff 100644
--- a/taverna-workbench-activity-palette-ui/pom.xml
+++ b/taverna-workbench-activity-palette-ui/pom.xml
@@ -29,32 +29,32 @@
 	<description>Activity Palette UI</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-icons-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-palette-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-activity-tools/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-tools/pom.xml b/taverna-workbench-activity-tools/pom.xml
index 4524c47..a3d9ded 100644
--- a/taverna-workbench-activity-tools/pom.xml
+++ b/taverna-workbench-activity-tools/pom.xml
@@ -29,17 +29,17 @@
 	<description>Tools useful for ui-activitys</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-configuration-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-configuration-impl/pom.xml b/taverna-workbench-configuration-impl/pom.xml
index 3e94509..3665c8c 100644
--- a/taverna-workbench-configuration-impl/pom.xml
+++ b/taverna-workbench-configuration-impl/pom.xml
@@ -30,17 +30,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-contextual-views-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-contextual-views-api/pom.xml b/taverna-workbench-contextual-views-api/pom.xml
index 7a75d4b..e396c15 100644
--- a/taverna-workbench-contextual-views-api/pom.xml
+++ b/taverna-workbench-contextual-views-api/pom.xml
@@ -29,37 +29,37 @@
 	<description>Contextual views for the activities</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-icons-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-palette-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -73,7 +73,7 @@
 			<artifactId>observer</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-contextual-views-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-contextual-views-impl/pom.xml b/taverna-workbench-contextual-views-impl/pom.xml
index c36e1e5..bb078e4 100644
--- a/taverna-workbench-contextual-views-impl/pom.xml
+++ b/taverna-workbench-contextual-views-impl/pom.xml
@@ -29,17 +29,17 @@
 	<description>Contextual views for the activities</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 			<version>${scufl2.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-contextual-views/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-contextual-views/pom.xml b/taverna-workbench-contextual-views/pom.xml
index dbcd271..5985cfe 100644
--- a/taverna-workbench-contextual-views/pom.xml
+++ b/taverna-workbench-contextual-views/pom.xml
@@ -28,22 +28,22 @@
 	<name>Contextual views</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-credential-manager-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-credential-manager-ui/pom.xml b/taverna-workbench-credential-manager-ui/pom.xml
index ca06780..7b8fa18 100644
--- a/taverna-workbench-credential-manager-ui/pom.xml
+++ b/taverna-workbench-credential-manager-ui/pom.xml
@@ -31,17 +31,17 @@
 	</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
         <dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-data-management-config-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-data-management-config-ui/pom.xml b/taverna-workbench-data-management-config-ui/pom.xml
index 355cc5f..654865f 100644
--- a/taverna-workbench-data-management-config-ui/pom.xml
+++ b/taverna-workbench-data-management-config-ui/pom.xml
@@ -33,12 +33,12 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<!--<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>run-ui</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-design-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-design-ui/pom.xml b/taverna-workbench-design-ui/pom.xml
index 77533da..9046a52 100644
--- a/taverna-workbench-design-ui/pom.xml
+++ b/taverna-workbench-design-ui/pom.xml
@@ -28,22 +28,22 @@
 	<packaging>bundle</packaging>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-icons-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -53,7 +53,7 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-edits-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-edits-api/pom.xml b/taverna-workbench-edits-api/pom.xml
index 59fab76..178b077 100644
--- a/taverna-workbench-edits-api/pom.xml
+++ b/taverna-workbench-edits-api/pom.xml
@@ -29,7 +29,7 @@
 	<description>API for doing workflow edits and undo.</description>
 	<dependencies>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-edits-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-edits-impl/pom.xml b/taverna-workbench-edits-impl/pom.xml
index 8e5c6a4..0e3e072 100644
--- a/taverna-workbench-edits-impl/pom.xml
+++ b/taverna-workbench-edits-impl/pom.xml
@@ -31,17 +31,17 @@
 	</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -51,7 +51,7 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 			<version>${scufl2.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-file-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-file-api/pom.xml b/taverna-workbench-file-api/pom.xml
index 0e4aa55..197cabf 100644
--- a/taverna-workbench-file-api/pom.xml
+++ b/taverna-workbench-file-api/pom.xml
@@ -40,7 +40,7 @@
 			<artifactId>observer</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-file-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-file-impl/pom.xml b/taverna-workbench-file-impl/pom.xml
index 4be85f1..c96712b 100644
--- a/taverna-workbench-file-impl/pom.xml
+++ b/taverna-workbench-file-impl/pom.xml
@@ -32,27 +32,27 @@
 	</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -67,7 +67,7 @@
 			<version>${taverna.configuration.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 			<version>${scufl2.version}</version>
 		</dependency>
@@ -99,19 +99,19 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-impl</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-t2flow</artifactId>
 			<version>${scufl2.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-rdfxml</artifactId>
 			<version>${scufl2.version}</version>
 			<scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-graph-model/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-graph-model/pom.xml b/taverna-workbench-graph-model/pom.xml
index 88ee714..26dd8a2 100644
--- a/taverna-workbench-graph-model/pom.xml
+++ b/taverna-workbench-graph-model/pom.xml
@@ -82,27 +82,27 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -117,7 +117,7 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-graph-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-graph-view/pom.xml b/taverna-workbench-graph-view/pom.xml
index efdd637..dcb0d3b 100644
--- a/taverna-workbench-graph-view/pom.xml
+++ b/taverna-workbench-graph-view/pom.xml
@@ -28,37 +28,37 @@
 	<name>Graph View</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>design-ui</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>graph-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -82,7 +82,7 @@
 			<artifactId>taverna-services-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-helper-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-helper-api/pom.xml b/taverna-workbench-helper-api/pom.xml
index 4da2343..4b40e30 100644
--- a/taverna-workbench-helper-api/pom.xml
+++ b/taverna-workbench-helper-api/pom.xml
@@ -42,7 +42,7 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-helper/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-helper/pom.xml b/taverna-workbench-helper/pom.xml
index 2ad3e43..bdf1641 100644
--- a/taverna-workbench-helper/pom.xml
+++ b/taverna-workbench-helper/pom.xml
@@ -27,7 +27,7 @@
 	<name>Help System (legacy dependency)</name>
 	<dependencies>
 		<dependency>
-            <groupId>net.sf.taverna.t2.ui-api</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>helper-api</artifactId>
             <version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-httpproxy-config/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-httpproxy-config/pom.xml b/taverna-workbench-httpproxy-config/pom.xml
index 5ed865b..9513f1c 100644
--- a/taverna-workbench-httpproxy-config/pom.xml
+++ b/taverna-workbench-httpproxy-config/pom.xml
@@ -38,7 +38,7 @@
 			<version>${taverna.configuration.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-iteration-strategy-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-iteration-strategy-ui/pom.xml b/taverna-workbench-iteration-strategy-ui/pom.xml
index a61fe99..f143153 100644
--- a/taverna-workbench-iteration-strategy-ui/pom.xml
+++ b/taverna-workbench-iteration-strategy-ui/pom.xml
@@ -39,27 +39,27 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-loop-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-loop-ui/pom.xml b/taverna-workbench-loop-ui/pom.xml
index 1250986..36130b4 100644
--- a/taverna-workbench-loop-ui/pom.xml
+++ b/taverna-workbench-loop-ui/pom.xml
@@ -28,24 +28,24 @@
     <name>Loop layer contextual view</name>
     <dependencies>
         <dependency>
-            <groupId>net.sf.taverna.t2.ui-api</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>contextual-views-api</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 
 
         <dependency>
-            <groupId>net.sf.taverna.t2.ui-api</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>file-api</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.sf.taverna.t2.ui-api</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>edits-api</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.sf.taverna.t2.ui-api</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>helper-api</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
@@ -56,26 +56,26 @@
         </dependency>
 
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-impl</artifactId>
 			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-impl</artifactId>
 			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
 
         <dependency>
-            <groupId>net.sf.taverna.t2.ui-impl</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>contextual-views-impl</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
             <dependency>
-            <groupId>net.sf.taverna.t2.ui-impl</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>selection-impl</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-menu-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-menu-api/pom.xml b/taverna-workbench-menu-api/pom.xml
index 90130b8..1758bfe 100644
--- a/taverna-workbench-menu-api/pom.xml
+++ b/taverna-workbench-menu-api/pom.xml
@@ -30,7 +30,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-menu-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-menu-impl/pom.xml b/taverna-workbench-menu-impl/pom.xml
index 33df6ea..b9898ed 100644
--- a/taverna-workbench-menu-impl/pom.xml
+++ b/taverna-workbench-menu-impl/pom.xml
@@ -43,17 +43,17 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-menu-items/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-menu-items/pom.xml b/taverna-workbench-menu-items/pom.xml
index dc4c66c..07566e2 100644
--- a/taverna-workbench-menu-items/pom.xml
+++ b/taverna-workbench-menu-items/pom.xml
@@ -28,37 +28,37 @@
 	<name>Additional menu items</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>design-ui</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>graph-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -80,7 +80,7 @@
 		</dependency>
 		<!-- TODO remove dependencies on implementations -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-monitor-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-monitor-view/pom.xml b/taverna-workbench-monitor-view/pom.xml
index 70762ad..2e3b3f6 100644
--- a/taverna-workbench-monitor-view/pom.xml
+++ b/taverna-workbench-monitor-view/pom.xml
@@ -28,22 +28,22 @@
 	<name>Monitor View</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>graph-model</artifactId>
 			<version>${project.version}</version>
 		</dependency>
  		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>results-view</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>graph-view</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-parallelize-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-parallelize-ui/pom.xml b/taverna-workbench-parallelize-ui/pom.xml
index 799de45..e74c474 100644
--- a/taverna-workbench-parallelize-ui/pom.xml
+++ b/taverna-workbench-parallelize-ui/pom.xml
@@ -28,22 +28,22 @@
 	<name>Parallelize layer contextual view</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-perspective-biocatalogue/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-perspective-biocatalogue/pom.xml b/taverna-workbench-perspective-biocatalogue/pom.xml
index 3750fda..f967fc4 100644
--- a/taverna-workbench-perspective-biocatalogue/pom.xml
+++ b/taverna-workbench-perspective-biocatalogue/pom.xml
@@ -38,7 +38,7 @@
 	</repositories>
 
 	<dependencies>
-		<!-- <dependency> <groupId>net.sf.taverna.t2.ui-api</groupId> <artifactId>perspective-core</artifactId>
+		<!-- <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>perspective-core</artifactId>
 			<version>${project.parent.version}</version> </dependency> -->
 		<dependency>
 			<groupId>net.sf.taverna.t2.core</groupId>
@@ -46,12 +46,12 @@
 			<version>${t2.core.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -63,7 +63,7 @@
 		<!-- required for providing contextual views in the bottom-left area of
 			Design perspective -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -81,13 +81,13 @@
 		</dependency>
 		<!-- required for inserting a processor into the current workflow -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<!-- required registering with and opening help window -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-perspective-design/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-perspective-design/pom.xml b/taverna-workbench-perspective-design/pom.xml
index eadee0f..627c52c 100644
--- a/taverna-workbench-perspective-design/pom.xml
+++ b/taverna-workbench-perspective-design/pom.xml
@@ -28,52 +28,52 @@
 	<name>Design perspective</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-palette-ui</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>graph-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-explorer</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<!-- <dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency> -->
@@ -84,7 +84,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-perspective-myexperiment/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-perspective-myexperiment/pom.xml b/taverna-workbench-perspective-myexperiment/pom.xml
index 370cc97..82dded6 100644
--- a/taverna-workbench-perspective-myexperiment/pom.xml
+++ b/taverna-workbench-perspective-myexperiment/pom.xml
@@ -51,17 +51,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-perspective-results/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-perspective-results/pom.xml b/taverna-workbench-perspective-results/pom.xml
index a00d1ac..44ee583 100644
--- a/taverna-workbench-perspective-results/pom.xml
+++ b/taverna-workbench-perspective-results/pom.xml
@@ -30,22 +30,22 @@
 	intermediate and final results, as well as previous workflow runs.</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>monitor-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>results-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-plugin-manager/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-plugin-manager/pom.xml b/taverna-workbench-plugin-manager/pom.xml
index 9168aa3..dc996d1 100644
--- a/taverna-workbench-plugin-manager/pom.xml
+++ b/taverna-workbench-plugin-manager/pom.xml
@@ -28,12 +28,12 @@
 	<name>Taverna Workbench Plugin Manager</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-plugins-gui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-plugins-gui/pom.xml b/taverna-workbench-plugins-gui/pom.xml
index 2d5b3dd..d3eca15 100644
--- a/taverna-workbench-plugins-gui/pom.xml
+++ b/taverna-workbench-plugins-gui/pom.xml
@@ -27,12 +27,12 @@
 	<name>Raven plugin manager GUI</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-reference-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-reference-ui/pom.xml b/taverna-workbench-reference-ui/pom.xml
index 2e3e223..cd6153e 100644
--- a/taverna-workbench-reference-ui/pom.xml
+++ b/taverna-workbench-reference-ui/pom.xml
@@ -34,17 +34,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>graph-view</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- <dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-view</artifactId>
 			<version>${project.version}</version>
 		</dependency> -->

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-renderers-exts/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-renderers-exts/pom.xml b/taverna-workbench-renderers-exts/pom.xml
index aa2b0f3..3bfa11e 100644
--- a/taverna-workbench-renderers-exts/pom.xml
+++ b/taverna-workbench-renderers-exts/pom.xml
@@ -27,12 +27,12 @@
 	<name>Renderers extensions</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>renderers-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-renderers-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-renderers-impl/pom.xml b/taverna-workbench-renderers-impl/pom.xml
index a49783e..2355130 100644
--- a/taverna-workbench-renderers-impl/pom.xml
+++ b/taverna-workbench-renderers-impl/pom.xml
@@ -42,7 +42,7 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>renderers-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-report-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-report-api/pom.xml b/taverna-workbench-report-api/pom.xml
index bc5f75e..a692450 100644
--- a/taverna-workbench-report-api/pom.xml
+++ b/taverna-workbench-report-api/pom.xml
@@ -36,11 +36,11 @@
 			<artifactId>taverna-configuration-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-validation</artifactId>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-report-explainer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-report-explainer/pom.xml b/taverna-workbench-report-explainer/pom.xml
index 09ef9d6..cf9f5ac 100644
--- a/taverna-workbench-report-explainer/pom.xml
+++ b/taverna-workbench-report-explainer/pom.xml
@@ -31,12 +31,12 @@
 	</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-exts</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>retry-ui</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -71,27 +71,27 @@
 			<version>${t2.core.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>design-ui</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-report-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-report-impl/pom.xml b/taverna-workbench-report-impl/pom.xml
index 8a88a89..ee86323 100644
--- a/taverna-workbench-report-impl/pom.xml
+++ b/taverna-workbench-report-impl/pom.xml
@@ -33,17 +33,17 @@
 			<version>${t2.core.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-report-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-report-view/pom.xml b/taverna-workbench-report-view/pom.xml
index f095fad..c130d57 100644
--- a/taverna-workbench-report-view/pom.xml
+++ b/taverna-workbench-report-view/pom.xml
@@ -41,47 +41,47 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 <!-- 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
  -->		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-results-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-results-view/pom.xml b/taverna-workbench-results-view/pom.xml
index e576519..941ec9b 100644
--- a/taverna-workbench-results-view/pom.xml
+++ b/taverna-workbench-results-view/pom.xml
@@ -52,22 +52,22 @@
 			<version>${t2.baclava.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>renderers-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>graph-view</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-retry-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-retry-ui/pom.xml b/taverna-workbench-retry-ui/pom.xml
index 5345c61..6a21450 100644
--- a/taverna-workbench-retry-ui/pom.xml
+++ b/taverna-workbench-retry-ui/pom.xml
@@ -28,22 +28,22 @@
 	<name>Retry layer contextual view</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-run-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-run-ui/pom.xml b/taverna-workbench-run-ui/pom.xml
index 79c5cac..20dcd95 100644
--- a/taverna-workbench-run-ui/pom.xml
+++ b/taverna-workbench-run-ui/pom.xml
@@ -28,27 +28,27 @@
 	<name>Results UI</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>reference-ui</artifactId>
 			<version>${project.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-selection-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-selection-api/pom.xml b/taverna-workbench-selection-api/pom.xml
index 33bf821..7697433 100644
--- a/taverna-workbench-selection-api/pom.xml
+++ b/taverna-workbench-selection-api/pom.xml
@@ -30,13 +30,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-selection-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-selection-impl/pom.xml b/taverna-workbench-selection-impl/pom.xml
index 6adac93..627ed8d 100644
--- a/taverna-workbench-selection-impl/pom.xml
+++ b/taverna-workbench-selection-impl/pom.xml
@@ -28,17 +28,17 @@
 	<name>Selection Implementation</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-update-manager/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-update-manager/pom.xml b/taverna-workbench-update-manager/pom.xml
index 392f9be..b7b724e 100644
--- a/taverna-workbench-update-manager/pom.xml
+++ b/taverna-workbench-update-manager/pom.xml
@@ -29,7 +29,7 @@
 	<name>Taverna Workbench Update Manager</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-workbench-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-workbench-impl/pom.xml b/taverna-workbench-workbench-impl/pom.xml
index c6fb5dd..6200015 100644
--- a/taverna-workbench-workbench-impl/pom.xml
+++ b/taverna-workbench-workbench-impl/pom.xml
@@ -43,37 +43,37 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>configuration-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>selection-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -103,7 +103,7 @@
 			<version>${taverna.configuration.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 			<version>${scufl2.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-workflow-explorer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-workflow-explorer/pom.xml b/taverna-workbench-workflow-explorer/pom.xml
index 36c14b0..855e1f3 100644
--- a/taverna-workbench-workflow-explorer/pom.xml
+++ b/taverna-workbench-workflow-explorer/pom.xml
@@ -29,47 +29,47 @@
 	<description>Workflow Explorer</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>file-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>report-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>menu-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-icons-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>design-ui</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>helper</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-impl</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workflow-view</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -78,7 +78,7 @@
 			<artifactId>taverna-services-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/c19de831/taverna-workbench-workflow-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-workflow-view/pom.xml b/taverna-workbench-workflow-view/pom.xml
index c80d7b5..4147d56 100644
--- a/taverna-workbench-workflow-view/pom.xml
+++ b/taverna-workbench-workflow-view/pom.xml
@@ -43,32 +43,32 @@
 			<version>${t2.lang.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>workbench-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>edits-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-palette-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>contextual-views-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>activity-tools</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>design-ui</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -77,7 +77,7 @@
 			<artifactId>taverna-services-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
+			<groupId>org.apache.taverna.language</groupId>
 			<artifactId>scufl2-api</artifactId>
 		</dependency>