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:46 UTC
[40/50] [abbrv] incubator-taverna-engine git commit:
org.apache.taverna.engine in POMs
org.apache.taverna.engine in POMs
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/a70229fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/a70229fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/a70229fa
Branch: refs/heads/master
Commit: a70229facaf3690b84495b63bb6e6252cf60cf61
Parents: 9ca55d5
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sat Dec 27 13:39:29 2014 -0600
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sat Dec 27 13:39:29 2014 -0600
----------------------------------------------------------------------
pom.xml | 1 -
taverna-activity-archetype/pom.xml | 9 +-
taverna-activity-test-utils/pom.xml | 62 ++-----
taverna-capability-api/pom.xml | 44 ++---
taverna-capability-impl/pom.xml | 48 ++----
taverna-credential-manager-impl/pom.xml | 87 +++++-----
taverna-credential-manager/pom.xml | 47 ++---
taverna-database-configuration-api/pom.xml | 37 +---
taverna-database-configuration-impl/pom.xml | 55 ++----
taverna-dataflow-activity/pom.xml | 57 ++-----
taverna-execution-api/pom.xml | 61 +++----
taverna-execution-hadoop/pom.xml | 57 ++-----
taverna-execution-impl/pom.xml | 46 ++---
taverna-execution-local/pom.xml | 89 ++++------
taverna-execution-remote/pom.xml | 50 ++----
taverna-integration-tests/pom.xml | 59 +++----
taverna-observer/pom.xml | 21 +--
taverna-platform-integration-tests/pom.xml | 190 ++++++++++-----------
taverna-prov-owl-bindings/pom.xml | 15 +-
taverna-prov/pom.xml | 77 ++++-----
taverna-provenanceconnector/pom.xml | 49 +++---
taverna-reference-api/pom.xml | 12 +-
taverna-reference-impl/pom.xml | 44 ++---
taverna-reference-testhelpers/pom.xml | 38 ++---
taverna-reference-types/pom.xml | 50 ++----
taverna-report-api/pom.xml | 53 +++---
taverna-run-api/pom.xml | 55 ++----
taverna-run-impl/pom.xml | 59 +++----
taverna-services-api/pom.xml | 38 +----
taverna-services-impl/pom.xml | 46 ++---
taverna-stringconstant-activity/pom.xml | 58 ++-----
taverna-workflowmodel-api/pom.xml | 31 ++--
taverna-workflowmodel-core-extensions/pom.xml | 62 +++----
taverna-workflowmodel-impl/pom.xml | 34 ++--
34 files changed, 628 insertions(+), 1113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3b0bcd..32c587f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
<module>taverna-activity-test-utils</module>
<module>taverna-capability-api</module>
<module>taverna-capability-impl</module>
- <module>taverna-component-repository</module>
<module>taverna-credential-manager</module>
<module>taverna-credential-manager-impl</module>
<module>taverna-database-configuration-api</module>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-activity-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/pom.xml b/taverna-activity-archetype/pom.xml
index 548df6a..90d7227 100644
--- a/taverna-activity-archetype/pom.xml
+++ b/taverna-activity-archetype/pom.xml
@@ -2,14 +2,13 @@
<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.archetypes</groupId>
- <artifactId>archetypes</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.archetypes</groupId>
<artifactId>taverna-activity-archetype</artifactId>
<packaging>maven-archetype</packaging>
- <name>Taverna activity archetype</name>
+ <name>Apache Taverna Activity archetype</name>
<description>Archetype to build a Taverna 3 service activity.
Includes engine and UI parts, and a test class to run the workbench with the new activity.
</description>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-activity-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/pom.xml b/taverna-activity-test-utils/pom.xml
index 81c2300..bbd36a1 100644
--- a/taverna-activity-test-utils/pom.xml
+++ b/taverna-activity-test-utils/pom.xml
@@ -2,60 +2,32 @@
<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>activity-test-utils</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- <name>Taverna activity test utils</name>
+ <artifactId>taverna-activity-test-utils</artifactId>
+ <name>Apache Taverna Activity test utils</name>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-impl</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-workflowmodel-impl</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>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-impl</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-impl</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-core-extensions</artifactId>
- <version>${t2.reference-core-extensions.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-types</artifactId>
+ <version>${project.parent.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>
- <scm>
- <connection>scm:git:https://github.com/taverna/taverna-activity-test-utils.git</connection>
- <developerConnection>scm:git:ssh://git@github.com:taverna/taverna-activity-test-utils.git</developerConnection>
- <url>https://github.com/taverna/taverna-activity-test-utils</url>
- <tag>master</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-capability-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-capability-api/pom.xml b/taverna-capability-api/pom.xml
index a32cec2..e0cb3f7 100644
--- a/taverna-capability-api/pom.xml
+++ b/taverna-capability-api/pom.xml
@@ -2,50 +2,28 @@
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>
- <artifactId>platform</artifactId>
- <groupId>uk.org.taverna</groupId>
- <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-capability-api</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Platform Capability API</name>
+ <name>Apache Taverna Platform Capability API</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>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>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.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-capability-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-capability-impl/pom.xml b/taverna-capability-impl/pom.xml
index 00431f0..2937f9e 100644
--- a/taverna-capability-impl/pom.xml
+++ b/taverna-capability-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-capability-impl</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Platform Capability Implementation</name>
+ <name>Apache Taverna Platform Capability Implementation</name>
<build>
<plugins>
<plugin>
@@ -25,18 +24,19 @@
</build>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-capability-api</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<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>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>
@@ -53,28 +53,8 @@
<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>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-credential-manager-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-impl/pom.xml b/taverna-credential-manager-impl/pom.xml
index a871b97..193e1b3 100644
--- a/taverna-credential-manager-impl/pom.xml
+++ b/taverna-credential-manager-impl/pom.xml
@@ -3,30 +3,61 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>security</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.security</groupId>
- <artifactId>credential-manager-impl</artifactId>
+ <artifactId>taverna-credential-manager-impl</artifactId>
<packaging>bundle</packaging>
- <name>Credential Manager Implementation</name>
+ <name>Apache Taverna Credential Manager Implementation</name>
+
+ <profiles>
+ <profile>
+ <id>strongEncryption</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <forkMode>always</forkMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager</artifactId>
- <version>${project.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-credential-manager</artifactId>
+ <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.configuration.version}</version>
+ <version>${taverna.osgi.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>org.bouncycastle</groupId>
@@ -36,17 +67,17 @@
<dependency>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -56,24 +87,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>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-credential-manager/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager/pom.xml b/taverna-credential-manager/pom.xml
index 98ff9a3..90a5999 100644
--- a/taverna-credential-manager/pom.xml
+++ b/taverna-credential-manager/pom.xml
@@ -2,24 +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.t2</groupId>
- <artifactId>security</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.security</groupId>
- <artifactId>credential-manager</artifactId>
+ <artifactId>taverna-credential-manager</artifactId>
<packaging>bundle</packaging>
- <name>Credential manager</name>
+ <name>Apache Taverna Credential manager</name>
<dependencies>
<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>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<!-- <dependency>
<groupId>org.bouncycastle</groupId>
@@ -34,19 +33,19 @@
<dependency>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>${commons.io.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -56,24 +55,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>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-database-configuration-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-database-configuration-api/pom.xml b/taverna-database-configuration-api/pom.xml
index 6604c94..fa8b820 100644
--- a/taverna-database-configuration-api/pom.xml
+++ b/taverna-database-configuration-api/pom.xml
@@ -2,41 +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>
- <artifactId>taverna-commons</artifactId>
- <groupId>uk.org.taverna.commons</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <groupId>uk.org.taverna.configuration</groupId>
- <version>0.1.1-SNAPSHOT</version>
<artifactId>taverna-database-configuration-api</artifactId>
<packaging>bundle</packaging>
+ <name>Apache Taverna Database Configuration API</name>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.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>
- <name>Taverna Database Configuration API</name>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-database-configuration-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-database-configuration-impl/pom.xml b/taverna-database-configuration-impl/pom.xml
index 3ecceae..7bb33d8 100644
--- a/taverna-database-configuration-impl/pom.xml
+++ b/taverna-database-configuration-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>
- <artifactId>taverna-commons</artifactId>
- <groupId>uk.org.taverna.commons</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <groupId>uk.org.taverna.configuration</groupId>
- <version>0.1.1-SNAPSHOT</version>
<artifactId>taverna-database-configuration-impl</artifactId>
<packaging>bundle</packaging>
+ <name>Apache Taverna Database Configuration implementation</name>
<build>
<plugins>
<plugin>
@@ -29,19 +28,19 @@
</build>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>taverna-database-configuration-api</artifactId>
- <version>${taverna.configuration.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.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
@@ -59,11 +58,11 @@
<artifactId>com.springsource.org.apache.derby.drda</artifactId>
<version>${derbynet.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
- <version>${commons.dbcp.version}</version>
- </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons.dbcp.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
@@ -77,26 +76,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>
- <name>Taverna Database Configuration implementation</name>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-dataflow-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity/pom.xml b/taverna-dataflow-activity/pom.xml
index e6692e8..4e5ada8 100644
--- a/taverna-dataflow-activity/pom.xml
+++ b/taverna-dataflow-activity/pom.xml
@@ -3,25 +3,23 @@
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>dataflow-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <artifactId>taverna-dataflow-activity</artifactId>
<packaging>bundle</packaging>
- <name>Taverna 2 Dataflow Activity</name>
+ <name>Apache Taverna Dataflow 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>
@@ -42,37 +40,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-dataflow-activity.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-dataflow-activity.git</developerConnection>
- <url>https://github.com/taverna/taverna-dataflow-activity/</url>
- <tag>HEAD</tag>
- </scm>
</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-execution-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-api/pom.xml b/taverna-execution-api/pom.xml
index ba7e453..836996c 100644
--- a/taverna-execution-api/pom.xml
+++ b/taverna-execution-api/pom.xml
@@ -2,64 +2,45 @@
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-execution-api</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Platform Execution Service API</name>
+ <name>Apache Taverna Platform Execution Service API</name>
<description>A Service for executing Taverna workflows</description>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-capability-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-report-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>org.purl.wf4ever.robundle</groupId>
- <artifactId>robundle</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-robundle</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-execution-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-hadoop/pom.xml b/taverna-execution-hadoop/pom.xml
index 5bb8ca1..8b44dbc 100644
--- a/taverna-execution-hadoop/pom.xml
+++ b/taverna-execution-hadoop/pom.xml
@@ -2,24 +2,23 @@
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.2-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>execution-hadoop</artifactId>
- <name>Taverna Hadoop Workflow Execution Service</name>
- <description>An Execution Service for executing Taverna workflows using Hadoop</description>
+ <artifactId>taverna-execution-hadoop</artifactId>
+ <name>Apache Taverna Hadoop Workflow Execution Service</name>
+ <description>An (experimental) Execution Service for executing Taverna workflows using Hadoop</description>
<dependencies>
<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>
- <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>${pjoject.parent.version}</version>
</dependency> -->
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -32,34 +31,4 @@
<version>0.23.0-SNAPSHOT</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>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>apache-snapshot-repository</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots/</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-execution-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-impl/pom.xml b/taverna-execution-impl/pom.xml
index 47f5f79..421717d 100644
--- a/taverna-execution-impl/pom.xml
+++ b/taverna-execution-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-execution-impl</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Platform Execution Environment Service Implementation</name>
+ <name>Apache Taverna Platform Execution Service Implementation</name>
<description>A Service for executing Taverna workflows</description>
<build>
<plugins>
@@ -26,38 +25,19 @@
</build>
<dependencies>
<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>
</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-execution-local/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-local/pom.xml b/taverna-execution-local/pom.xml
index 8b55f45..9a25980 100644
--- a/taverna-execution-local/pom.xml
+++ b/taverna-execution-local/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-execution-local</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Platform Local Execution Service</name>
+ <name>Apache Taverna Platform Local Execution Service</name>
<description>An Execution Service for executing Taverna workflows using a local Taverna Dataflow Engine</description>
<build>
<plugins>
@@ -26,85 +25,67 @@
</build>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-capability-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.platform</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-report-api</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<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>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-core-extensions</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-types</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
- <!--
+ <!--
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>provenanceconnector</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-provenanceconnector</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>uk.org.taverna.configuration</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-database-configuration-api</artifactId>
- <version>${taverna.configuration.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>
</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-execution-remote/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-remote/pom.xml b/taverna-execution-remote/pom.xml
index a3b7aae..66c26f9 100644
--- a/taverna-execution-remote/pom.xml
+++ b/taverna-execution-remote/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-execution-remote</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Platform Remote Execution Service</name>
+ <name>Apache Taverna Platform Remote Execution Service</name>
<description>An Execution Service for executing Taverna workflows on a Taverna Server
</description>
<build>
@@ -27,43 +26,24 @@
</build>
<dependencies>
<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.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.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>
</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-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-integration-tests/pom.xml b/taverna-integration-tests/pom.xml
index 285801c..9e46ecc 100644
--- a/taverna-integration-tests/pom.xml
+++ b/taverna-integration-tests/pom.xml
@@ -2,16 +2,16 @@
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-integration-tests</artifactId>
+ <name>Apache Taverna Integration Tests</name>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.osgi</groupId>
- <artifactId>taverna-starter</artifactId>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine-product</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
@@ -26,15 +26,15 @@
</exclusions>
</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>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.databundle</groupId>
- <artifactId>databundle</artifactId>
- <version>${taverna.databundle.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-databundle</artifactId>
+ <version>${taverna.language.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -43,21 +43,21 @@
</exclusions>
</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>
<scope>test</scope>
</dependency>
<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>
<scope>test</scope>
</dependency>
<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>
<scope>test</scope>
</dependency>
<dependency>
@@ -90,25 +90,4 @@
<scope>provided</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-observer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-observer/pom.xml b/taverna-observer/pom.xml
index 76e8140..b58ba1f 100644
--- a/taverna-observer/pom.xml
+++ b/taverna-observer/pom.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>lang</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.lang</groupId>
- <artifactId>observer</artifactId>
- <packaging>bundle</packaging>
- <name>Observer pattern</name>
- <description>Implementation of the Observer pattern.</description>
+ <artifactId>taverna-observer</artifactId>
+ <name>Apache Taverna Observer pattern</name>
+ <description>Implementation of the Observer pattern</description>
<dependencies>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-platform-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/pom.xml b/taverna-platform-integration-tests/pom.xml
index 3d72e43..28f94e7 100644
--- a/taverna-platform-integration-tests/pom.xml
+++ b/taverna-platform-integration-tests/pom.xml
@@ -2,13 +2,12 @@
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>
- <artifactId>platform</artifactId>
- <groupId>uk.org.taverna</groupId>
- <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>integration-tests</artifactId>
- <name>Taverna Platform integration tests</name>
+ <artifactId>taverna-integration-tests</artifactId>
+ <name>Apache Taverna Platform integration tests</name>
<properties>
<spring.dm.version>2.0.0.M1</spring.dm.version>
<spring.version>3.0.0.RC1</spring.version>
@@ -57,18 +56,6 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>spring-maven-milestone</id>
- <name>Springframework Maven Repository</name>
- <url>http://maven.springframework.org/milestone</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </repository>
- </repositories>
<dependencies>
<!-- Spring OSGI testing framework -->
<dependency>
@@ -235,14 +222,14 @@
</dependency>
<!-- Taverna OSGI Services -->
- <!-- <dependency> <groupId>uk.org.taverna.osgi.services</groupId> <artifactId>xml-parser-service</artifactId>
- <version>0.0.1-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.apache.xerces</groupId>
+ <!-- <dependency> <groupId>org.apache.taverna.osgi</groupId> <artifactId>xml-parser-service</artifactId>
+ <version>${taverna.osgi.version}</version> <exclusions> <exclusion> <groupId>org.apache.xerces</groupId>
<artifactId>com.springsource.org.apache.xerces</artifactId> </exclusion>
</exclusions> </dependency> -->
<dependency>
- <groupId>uk.org.taverna.osgi.services</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>xml-transformer-service</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.xalan</groupId>
@@ -253,158 +240,155 @@
<!-- Taverna -->
<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>workflowmodel-core-extensions</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-workflowmodel-core-extensions</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-impl</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-workflowmodel-impl</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>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-core-extensions</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-types</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>reference-impl</artifactId>
- <version>${t2.core.version}</version>
+ <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>
+ <!-- is this needed here? (Why?)
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
+ -->
<dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager</artifactId>
- <version>${t2.security.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-credential-manager</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager-impl</artifactId>
- <version>${t2.security.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-credential-manager-impl</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-database-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-database-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<!-- Taverna Platform -->
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-capability-impl</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>data</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.platform</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-execution-impl</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-run-impl</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>execution-local</artifactId>
- <version>${project.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-execution-local</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>report</artifactId>
- <version>${project.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-report-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<!-- Scufl2 -->
<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>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-t2flow</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-rdfxml</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-rdfxml</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-ucfpackage</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-ucfpackage</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-validation</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation-correctness</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-validation-correctness</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation-structural</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-validation-structural</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<!-- Taverna CommandLine Tool -->
<dependency>
- <groupId>net.sf.taverna.t2.taverna-commandline</groupId>
+ <groupId>org.apache.taverna.commandline</groupId>
<artifactId>taverna-commandline-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -599,6 +583,7 @@
<version>1.5.8</version> <scope>test</scope> <exclusions> <exclusion> <groupId>org.apache.xalan</groupId>
<artifactId>com.springsource.org.apache.xalan</artifactId> </exclusion> </exclusions>
</dependency> -->
+ <!--
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>com.springsource.bsh</artifactId>
@@ -609,6 +594,7 @@
<artifactId>martservice</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ -->
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>com.springsource.org.dom4j</artifactId>
@@ -646,4 +632,4 @@
<version>1.1.3.4-O</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-prov-owl-bindings/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-prov-owl-bindings/pom.xml b/taverna-prov-owl-bindings/pom.xml
index c1e4138..773a6bb 100644
--- a/taverna-prov-owl-bindings/pom.xml
+++ b/taverna-prov-owl-bindings/pom.xml
@@ -2,13 +2,12 @@
<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>org.purl.wf4ever.provtaverna</groupId>
- <artifactId>prov-taverna</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>prov-taverna-owl-bindings</artifactId>
- <name>Taverna PROV OWL bindings</name>
-
+ <artifactId>taverna-prov-owl-bindings</artifactId>
+ <name>Apache Taverna PROV OWL bindings</name>
<build>
</build>
<dependencies>
@@ -17,7 +16,7 @@
<artifactId>commons-beanutils</artifactId>
<version>1.8.3</version>
</dependency>
-<!--
+<!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -31,6 +30,6 @@
<version>${jena.version}</version>
</dependency>
</dependencies>
-
+
<description>OWL bindings using Jena</description>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-prov/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-prov/pom.xml b/taverna-prov/pom.xml
index 0e0671f..6330255 100644
--- a/taverna-prov/pom.xml
+++ b/taverna-prov/pom.xml
@@ -1,20 +1,20 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>prov-taverna</artifactId>
- <groupId>org.purl.wf4ever.provtaverna</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>prov-taverna-export</artifactId>
- <name>Taverna PROV export</name>
+ <artifactId>taverna-prov</artifactId>
+ <name>Apache Taverna PROV support</name>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>data-management-config</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-database-configuration-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
+<!--
<dependency>
<groupId>net.sf.taverna.t2.results</groupId>
<artifactId>results</artifactId>
@@ -26,63 +26,44 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>provenanceconnector</artifactId>
- <version>${t2.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>provenance-derby</artifactId>
- <version>${t2.core.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-provenanceconnector</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
+
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-rdfxml</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-t2flow</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-rdfxml</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>org.purl.wf4ever</groupId>
- <artifactId>scufl2-wfdesc</artifactId>
- <version>${scufl2.wfdesc.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-wfdesc</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.databundle</groupId>
- <artifactId>databundle</artifactId>
- <version>${databundle.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-databundle</artifactId>
+ <version>${taverna.language.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>prov-taverna-owl-bindings</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-prov-owl-bindings</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-provenanceconnector/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-provenanceconnector/pom.xml b/taverna-provenanceconnector/pom.xml
index 2c0e37f..176f2cb 100644
--- a/taverna-provenanceconnector/pom.xml
+++ b/taverna-provenanceconnector/pom.xml
@@ -3,15 +3,14 @@
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>provenanceconnector</artifactId>
+ <artifactId>taverna-provenanceconnector</artifactId>
<packaging>bundle</packaging>
- <name>Database storage and analysis of provenance info</name>
-
+ <name>Apache Taverna Provenance Connector</name>
+ <description>Database storage and analysis of provenance info (LEGACY)</description>
<build>
<plugins>
<plugin>
@@ -29,29 +28,29 @@
</build>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-impl</artifactId>
- <version>${project.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-impl</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<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>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-impl</artifactId>
- <version>${project.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-workflowmodel-impl</artifactId>
+ <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>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-database-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
@@ -64,11 +63,11 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
- <version>${commons.dbcp.version}</version>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons.dbcp.version}</version>
</dependency>
- <!--
+ <!--
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-reference-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-api/pom.xml b/taverna-reference-api/pom.xml
index 8220dd6..48f397d 100644
--- a/taverna-reference-api/pom.xml
+++ b/taverna-reference-api/pom.xml
@@ -2,14 +2,13 @@
<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>reference-api</artifactId>
+ <artifactId>taverna-reference-api</artifactId>
<packaging>bundle</packaging>
- <name>API package for the T2 reference manager</name>
+ <name>Apache Taverna Reference Manager API</name>
<description>
Core APIs and extension points for the T2 reference manager.
This includes the SPIs for external references, translators and
@@ -35,6 +34,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.transaction</artifactId>
+ <version>${spring.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-reference-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/pom.xml b/taverna-reference-impl/pom.xml
index 01cfdc1..9280d36 100644
--- a/taverna-reference-impl/pom.xml
+++ b/taverna-reference-impl/pom.xml
@@ -3,21 +3,21 @@
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>reference-impl</artifactId>
+ <artifactId>taverna-reference-impl</artifactId>
<packaging>bundle</packaging>
- <name>Implementation package for the T2 reference manager</name>
+ <name>Apache Taverna Reference Manager Implementation</name>
<description>
Implementations of the core APIs, not including extension point
- implementations. The extension point implementations that can be
- considered as core functionality (files, URLs etc) are held in
- the t2reference-core-extensions package. This package contains
- implementations of the data access objects, translator
+ implementations.
+ This package contains implementations of the data access objects, translator
infrastructure etc.
+ The extension point implementations that can be
+ considered as core functionality (files, URLs etc) are held in
+ the taverna-reference-types module.
</description>
<properties>
@@ -49,14 +49,14 @@
</build>
<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>uk.org.taverna.configuration</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-database-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -66,17 +66,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.transaction</artifactId>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>${aspectj.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-testhelpers</artifactId>
- <version>${project.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-testhelpers</artifactId>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -109,12 +109,14 @@
<version>${javax.transaction.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>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-reference-testhelpers/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/pom.xml b/taverna-reference-testhelpers/pom.xml
index 9d36420..a822010 100644
--- a/taverna-reference-testhelpers/pom.xml
+++ b/taverna-reference-testhelpers/pom.xml
@@ -2,47 +2,37 @@
<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>reference-testhelpers</artifactId>
+ <artifactId>taverna-reference-testhelpers</artifactId>
<packaging>bundle</packaging>
-
- <name>T2reference dummy implementations for testing</name>
+ <name>Apache Taverna Reference Test Helpers</name>
<description>
- In order to properly test the raven-aware functionality within
- the t2reference modules we need a module that is entire external
+ In order to properly test OSGi-loaded t2ference modules
+ we need a module that is entire external
to t2reference and to the test cases. If the test
implementations are included in either the api, core
implementation or test modules they will be loaded by the root
classloader of the test runner - by putting them in an
- independent artifact we allow them to be loaded through raven's
+ independent artifact we allow them to be loaded through
various SPI discovery mechanisms as they would be in a 'real'
environment.
</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
<dependencies>
<!-- Only depend on the t2reference API package here -->
<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>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-reference-types/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/pom.xml b/taverna-reference-types/pom.xml
index 8539b9d..e9b4ee8 100644
--- a/taverna-reference-types/pom.xml
+++ b/taverna-reference-types/pom.xml
@@ -3,15 +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</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.core</groupId>
- <artifactId>reference-core-extensions</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <artifactId>taverna-reference-types</artifactId>
<packaging>bundle</packaging>
- <name>Taverna engine referencetypes</name>
+ <name>Apache Taverna Engine Reference Types</name>
<description>
Implementations of certain SPIs to provide a core set of
functionality for the reference management framework. This
@@ -37,31 +35,11 @@
</plugin>
</plugins>
</build>
- <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>
<dependencies>
<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>
<groupId>commons-codec</groupId>
@@ -74,15 +52,15 @@
<version>${commons.httpclient.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-testhelpers</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-testhelpers</artifactId>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-impl</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-reference-impl</artifactId>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/a70229fa/taverna-report-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-api/pom.xml b/taverna-report-api/pom.xml
index a7b6650..052d846 100644
--- a/taverna-report-api/pom.xml
+++ b/taverna-report-api/pom.xml
@@ -2,48 +2,39 @@
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-report-api</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Platform Report Service</name>
+ <name>Apache Taverna Platform Report Service</name>
<dependencies>
<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-scufl2-rdfxml</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+ <dependency>
+ <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>
</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>