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/02/17 12:32:45 UTC

[39/50] [abbrv] incubator-taverna-engine git commit: org.apache.taverna.engine in POMs

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-run-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-api/pom.xml b/taverna-run-api/pom.xml
index 1b1c8f0..2bf68e3 100644
--- a/taverna-run-api/pom.xml
+++ b/taverna-run-api/pom.xml
@@ -2,65 +2,46 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>uk.org.taverna</groupId>
-		<artifactId>platform</artifactId>
-		<version>0.1.3-SNAPSHOT</version>
+		<groupId>org.apache.taverna.engine</groupId>
+		<artifactId>taverna-engine</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
-	<groupId>uk.org.taverna.platform</groupId>
 	<artifactId>taverna-run-api</artifactId>
 	<packaging>bundle</packaging>
-	<name>Taverna Platform Run Service API</name>
+	<name>Apache Taverna Platform Run Service API</name>
 	<description>A Service for managing runs of Taverna workflows</description>
 	<dependencies>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-report-api</artifactId>
-			<version>${project.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-execution-api</artifactId>
-			<version>${project.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-api</artifactId>
+			<groupId>org.apache.taverna.language</groupId>
+			<artifactId>taverna-scufl2-api</artifactId>
+			<version>${taverna.language.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.databundle</groupId>
-			<artifactId>databundle</artifactId>
+			<groupId>org.apache.taverna.language</groupId>
+			<artifactId>taverna-databundle</artifactId>
+			<version>${taverna.language.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-execution-local</artifactId>
-			<version>${project.version}</version>
+			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<releases />
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>mygrid-repository</id>
-			<name>myGrid Repository</name>
-			<url>http://www.mygrid.org.uk/maven/repository
-			</url>
-		</repository>
-		<repository>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots />
-			<id>mygrid-snapshot-repository</id>
-			<name>myGrid Snapshot Repository</name>
-			<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
-		</repository>
-	</repositories>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-run-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-impl/pom.xml b/taverna-run-impl/pom.xml
index cf6a2e7..a722a70 100644
--- a/taverna-run-impl/pom.xml
+++ b/taverna-run-impl/pom.xml
@@ -2,14 +2,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>uk.org.taverna</groupId>
-		<artifactId>platform</artifactId>
-		<version>0.1.3-SNAPSHOT</version>
+		<groupId>org.apache.taverna.engine</groupId>
+		<artifactId>taverna-engine</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
-	<groupId>uk.org.taverna.platform</groupId>
 	<artifactId>taverna-run-impl</artifactId>
 	<packaging>bundle</packaging>
-	<name>Taverna Platform Run Service Implementation</name>
+	<name>Apache Taverna Platform Run Service Implementation</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -25,39 +24,44 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-run-api</artifactId>
-			<version>${project.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
 			<artifactId>taverna-report-api</artifactId>
-			<version>${project.version}</version>
+			<groupId>${project.parent.groupId}</groupId>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-execution-api</artifactId>
-			<version>${project.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.configuration</groupId>
+			<groupId>org.apache.taverna.osgi</groupId>
 			<artifactId>taverna-app-configuration-api</artifactId>
+			<version>${taverna.osgi.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-api</artifactId>
+			<groupId>org.apache.taverna.language</groupId>
+			<artifactId>taverna-scufl2-api</artifactId>
+			<version>${taverna.language.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.databundle</groupId>
-			<artifactId>databundle</artifactId>
+			<groupId>org.apache.taverna.language</groupId>
+			<artifactId>taverna-databundle</artifactId>
+			<version>${taverna.language.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.compendium</artifactId>
+			<version>${osgi.core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+      <version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -67,25 +71,4 @@
 		    <scope>test</scope>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<releases />
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>mygrid-repository</id>
-			<name>myGrid Repository</name>
-			<url>http://www.mygrid.org.uk/maven/repository
-			</url>
-		</repository>
-		<repository>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots />
-			<id>mygrid-snapshot-repository</id>
-			<name>myGrid Snapshot Repository</name>
-			<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
-		</repository>
-	</repositories>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-services-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-services-api/pom.xml b/taverna-services-api/pom.xml
index e676e29..caa4510 100644
--- a/taverna-services-api/pom.xml
+++ b/taverna-services-api/pom.xml
@@ -2,40 +2,18 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>uk.org.taverna.commons</groupId>
-		<artifactId>taverna-commons</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<groupId>org.apache.taverna.engine</groupId>
+		<artifactId>taverna-engine</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>taverna-services-api</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
-	<name>Taverna Services API</name>
+	<name>Apache Taverna Services API</name>
 	<dependencies>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-api</artifactId>
-			<version>${scufl2.version}</version>
+			<groupId>org.apache.taverna.language</groupId>
+			<artifactId>taverna-scufl2-api</artifactId>
+			<version>${taverna.language.version}</version>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<releases />
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>mygrid-repository</id>
-			<name>myGrid Repository</name>
-			<url>http://www.mygrid.org.uk/maven/repository
-			</url>
-		</repository>
-		<repository>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots />
-			<id>mygrid-snapshot-repository</id>
-			<name>myGrid Snapshot Repository</name>
-			<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
-		</repository>
-	</repositories>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-services-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-services-impl/pom.xml b/taverna-services-impl/pom.xml
index 09b78cc..97c7287 100644
--- a/taverna-services-impl/pom.xml
+++ b/taverna-services-impl/pom.xml
@@ -2,14 +2,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>uk.org.taverna.commons</groupId>
-		<artifactId>taverna-commons</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<groupId>org.apache.taverna.engine</groupId>
+		<artifactId>taverna-engine</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>taverna-services-impl</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
-	<name>Taverna Services Implementation</name>
+	<name>Apache Taverna Platform Services Implementation</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -25,40 +24,19 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>uk.org.taverna.commons</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-services-api</artifactId>
-			<version>${project.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
+			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-capability-api</artifactId>
-			<version>${platform.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-api</artifactId>
-			<version>${scufl2.version}</version>
+			<groupId>org.apache.taverna.language</groupId>
+			<artifactId>taverna-scufl2-api</artifactId>
+			<version>${taverna.language.version}</version>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<releases />
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>mygrid-repository</id>
-			<name>myGrid Repository</name>
-			<url>http://www.mygrid.org.uk/maven/repository
-			</url>
-		</repository>
-		<repository>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots />
-			<id>mygrid-snapshot-repository</id>
-			<name>myGrid Snapshot Repository</name>
-			<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
-		</repository>
-	</repositories>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-stringconstant-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity/pom.xml b/taverna-stringconstant-activity/pom.xml
index 73d167b..b0378b1 100644
--- a/taverna-stringconstant-activity/pom.xml
+++ b/taverna-stringconstant-activity/pom.xml
@@ -2,25 +2,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>net.sf.taverna</groupId>
-		<artifactId>taverna-parent</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<groupId>org.apache.taverna.engine</groupId>
+		<artifactId>taverna-engine</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
-	<groupId>net.sf.taverna.t2.activities</groupId>
-	<artifactId>stringconstant-activity</artifactId>
-	<version>2.0.1-SNAPSHOT</version>
+	<artifactId>taverna-stringconstant-activity</artifactId>
 	<packaging>bundle</packaging>
-	<name>Taverna 2 StringConstant Activity</name>
+	<name>Apache Taverna StringConstant Activity</name>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>workflowmodel-api</artifactId>
-			<version>${t2.core.version}</version>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-workflowmodel-api</artifactId>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>reference-api</artifactId>
-			<version>${t2.core.version}</version>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-reference-api</artifactId>
+			<version>${project.parent.version}</version>
 		</dependency>
 
 		<dependency>
@@ -36,38 +34,10 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>activity-test-utils</artifactId>
-			<version>${t2.activities.version}</version>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-activity-test-utils</artifactId>
+			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-        <repositories>
-                <repository>
-                        <releases />
-                        <snapshots>
-                                <enabled>false</enabled>
-                        </snapshots>
-                        <id>mygrid-repository</id>
-                        <name>myGrid Repository</name>
-                        <url>http://www.mygrid.org.uk/maven/repository</url>
-                </repository>
-                <repository>
-                        <releases>
-                                <enabled>false</enabled>
-                        </releases>
-                        <snapshots />
-                        <id>mygrid-snapshot-repository</id>
-                        <name>myGrid Snapshot Repository</name>
-                        <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
-                </repository>
-        </repositories>
-        <scm>
-                <connection>scm:git:https://github.com/taverna/taverna-stringconstant-activity.git</connection>
-                <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-stringconstant-activity.git</developerConnection>
-                <url>https://github.com/taverna/taverna-stringconstant-activity/</url>
-                <tag>HEAD</tag>
-        </scm>
-	
 </project>
-

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-workflowmodel-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-api/pom.xml b/taverna-workflowmodel-api/pom.xml
index 3e06a51..eebc84c 100644
--- a/taverna-workflowmodel-api/pom.xml
+++ b/taverna-workflowmodel-api/pom.xml
@@ -3,14 +3,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>net.sf.taverna.t2</groupId>
-		<artifactId>core</artifactId>
-		<version>2.0.1-SNAPSHOT</version>
+    <groupId>org.apache.taverna.engine</groupId>
+    <artifactId>taverna-engine</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
 	</parent>
-	<groupId>net.sf.taverna.t2.core</groupId>
-	<artifactId>workflowmodel-api</artifactId>
+	<artifactId>taverna-workflowmodel-api</artifactId>
 	<packaging>bundle</packaging>
-	<name>Workflow Model API</name>
+	<name>Apache Taverna Workflow Model API</name>
 	<description>
 		Core workflow object model for Taverna 2 workflows. Depends on
 		the data layer but nothing else, intended as lightweight
@@ -19,31 +18,35 @@
 	</description>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>reference-api</artifactId>
-			<version>${project.version}</version>
+      <groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-reference-api</artifactId>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.lang</groupId>
-			<artifactId>observer</artifactId>
-			<version>${t2.lang.version}</version>
+      <groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-observer</artifactId>
+			<version>${project.parent.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
+			<version>${jackson-databind.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jdom</groupId>
 			<artifactId>com.springsource.org.jdom</artifactId>
+			<version>${jdom.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-workflowmodel-core-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-core-extensions/pom.xml b/taverna-workflowmodel-core-extensions/pom.xml
index 4c83d02..30a7e8a 100644
--- a/taverna-workflowmodel-core-extensions/pom.xml
+++ b/taverna-workflowmodel-core-extensions/pom.xml
@@ -2,48 +2,30 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>net.sf.taverna.t2</groupId>
-        <artifactId>core</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-engine</artifactId>
+			<version>3.0.0-SNAPSHOT</version>
     </parent>
-	<groupId>net.sf.taverna.t2.core</groupId>
-	<artifactId>workflowmodel-core-extensions</artifactId>
+	<artifactId>taverna-workflowmodel-core-extensions</artifactId>
 	<packaging>bundle</packaging>
-	<name>Implementation of core extension points to the workflow model</name>
+	<name>Apache Taverna Workflow Model Core Extension Points</name>
+	<description>Implementation of core extension points to the workflow model</description>
 	<dependencies>
-		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>workflowmodel-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
+    <dependency>
+        <groupId>${project.parent.groupId}</groupId>
+        <artifactId>taverna-workflowmodel-api</artifactId>
+        <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson-databind.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+    </dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<releases />
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>mygrid-repository</id>
-			<name>myGrid Repository</name>
-			<url>http://www.mygrid.org.uk/maven/repository</url>
-		</repository>
-		<repository>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots />
-			<id>mygrid-snapshot-repository</id>
-			<name>myGrid Snapshot Repository</name>
-			<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
-		</repository>
-	</repositories>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-workflowmodel-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/pom.xml b/taverna-workflowmodel-impl/pom.xml
index c72abea..8e02a37 100644
--- a/taverna-workflowmodel-impl/pom.xml
+++ b/taverna-workflowmodel-impl/pom.xml
@@ -2,16 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>net.sf.taverna.t2</groupId>
-		<artifactId>core</artifactId>
-		<version>2.0.1-SNAPSHOT</version>
+    <groupId>org.apache.taverna.engine</groupId>
+    <artifactId>taverna-engine</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
 	</parent>
-	<groupId>net.sf.taverna.t2.core</groupId>
-	<artifactId>workflowmodel-impl</artifactId>
+	<artifactId>taverna-workflowmodel-impl</artifactId>
 	<packaging>bundle</packaging>
-	<name>Workflow Model implementation</name>
+	<name>Apache Taverna Workflow Model implementation</name>
 	<description> Implementation of the core workflow object model for
-		Taverna 2 workflows including
+		Taverna workflows including
 		concrete instances of the workflow
 		definition objects and enactment behaviours.
 	</description>
@@ -35,32 +34,37 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>workflowmodel-api</artifactId>
-			<version>${project.version}</version>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-workflowmodel-api</artifactId>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jdom</groupId>
 			<artifactId>com.springsource.org.jdom</artifactId>
+      <version>${jdom.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
+			<version>${xstream.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>workflowmodel-core-extensions</artifactId>
-			<version>${project.version}</version>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-workflowmodel-core-extensions</artifactId>
+			<version>${project.parent.version}</version>
 			<!--<scope>test</scope> -->
 		</dependency>
+
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
+      <version>${log4j.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+      <version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>