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 2016/01/11 17:19:40 UTC
incubator-taverna-engine git commit: Fix pom.xml whitespace
Repository: incubator-taverna-engine
Updated Branches:
refs/heads/master 79d52b964 -> 1c635c7a9
Fix pom.xml whitespace
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/1c635c7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/1c635c7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/1c635c7a
Branch: refs/heads/master
Commit: 1c635c7a9c4f63fcc0ce75917eb139faa49ecd63
Parents: 79d52b9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 11 16:19:21 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 11 16:19:21 2016 +0000
----------------------------------------------------------------------
pom.xml | 179 ++++++++++++------------
taverna-observer/pom.xml | 11 +-
taverna-platform-integration-tests/pom.xml | 59 +++++---
taverna-prov-owl-bindings/pom.xml | 18 +--
taverna-prov/pom.xml | 160 +++++++++++----------
taverna-provenanceconnector/pom.xml | 80 +++++------
taverna-reference-api/pom.xml | 7 +-
taverna-reference-impl/pom.xml | 19 +--
taverna-reference-testhelpers/pom.xml | 5 +-
taverna-reference-types/pom.xml | 3 +-
taverna-report-api/pom.xml | 5 +-
taverna-run-api/pom.xml | 3 +-
taverna-run-impl/pom.xml | 13 +-
taverna-services-api/pom.xml | 3 +-
taverna-services-impl/pom.xml | 3 +-
taverna-stringconstant-activity/pom.xml | 3 +-
taverna-workflowmodel-api/pom.xml | 13 +-
taverna-workflowmodel-extensions/pom.xml | 45 +++---
taverna-workflowmodel-impl/pom.xml | 21 +--
19 files changed, 334 insertions(+), 316 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c9e202..72b866e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,100 +1,95 @@
<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">
+ 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>org.apache.taverna</groupId>
- <artifactId>taverna-parent</artifactId>
- <version>1-incubating</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna</groupId>
+ <artifactId>taverna-parent</artifactId>
+ <version>1-incubating</version>
+ </parent>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-engine</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache Taverna Engine and Platform</name>
-
- <properties>
- <taverna.language.version>0.15.0-incubating</taverna.language.version>
- <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version>
- </properties>
-
- <modules>
- <!-- Avoid spaghetti dependencies
- <module>taverna-platform-integration-tests</module>
- <module>taverna-integration-tests</module>
- -->
- <module>taverna-activity-archetype</module>
- <module>taverna-activity-test-utils</module>
- <module>taverna-capability-api</module>
- <module>taverna-capability-impl</module>
- <module>taverna-credential-manager</module>
- <module>taverna-credential-manager-impl</module>
- <module>taverna-database-configuration-api</module>
- <module>taverna-database-configuration-impl</module>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Taverna Engine and Platform</name>
- <module>taverna-dataflow-activity</module>
- <module>taverna-execution-api</module>
- <module>taverna-execution-hadoop</module>
- <module>taverna-execution-impl</module>
- <module>taverna-execution-local</module>
- <module>taverna-execution-remote</module>
- <module>taverna-observer</module>
+ <properties>
+ <taverna.language.version>0.15.0-incubating</taverna.language.version>
+ <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version>
+ </properties>
- <!-- FIXME: Upgrade to T3
- <module>taverna-prov</module>
- -->
- <module>taverna-prov-owl-bindings</module>
- <!--
- <module>taverna-provenanceconnector</module>
- -->
- <module>taverna-reference-api</module>
- <module>taverna-reference-impl</module>
- <module>taverna-reference-testhelpers</module>
- <module>taverna-reference-types</module>
- <module>taverna-report-api</module>
- <module>taverna-run-api</module>
- <module>taverna-run-impl</module>
- <module>taverna-services-api</module>
- <module>taverna-services-impl</module>
- <module>taverna-stringconstant-activity</module>
- <module>taverna-workflowmodel-api</module>
- <module>taverna-workflowmodel-extensions</module>
- <module>taverna-workflowmodel-impl</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</developerConnection>
- <url>https://github.com/apache/incubator-taverna-engine</url>
- <tag>HEAD</tag>
- </scm>
+ <modules>
+ <!-- Avoid spaghetti dependencies -->
+ <!-- <module>taverna-platform-integration-tests</module> -->
+ <!-- <module>taverna-integration-tests</module> -->
+ <module>taverna-activity-archetype</module>
+ <module>taverna-activity-test-utils</module>
+ <module>taverna-capability-api</module>
+ <module>taverna-capability-impl</module>
+ <module>taverna-credential-manager</module>
+ <module>taverna-credential-manager-impl</module>
+ <module>taverna-database-configuration-api</module>
+ <module>taverna-database-configuration-impl</module>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
+ <module>taverna-dataflow-activity</module>
+ <module>taverna-execution-api</module>
+ <module>taverna-execution-hadoop</module>
+ <module>taverna-execution-impl</module>
+ <module>taverna-execution-local</module>
+ <module>taverna-execution-remote</module>
+ <module>taverna-observer</module>
+
+ <!-- FIXME: Upgrade to T3 <module>taverna-prov</module> -->
+ <module>taverna-prov-owl-bindings</module>
+ <!-- <module>taverna-provenanceconnector</module> -->
+ <module>taverna-reference-api</module>
+ <module>taverna-reference-impl</module>
+ <module>taverna-reference-testhelpers</module>
+ <module>taverna-reference-types</module>
+ <module>taverna-report-api</module>
+ <module>taverna-run-api</module>
+ <module>taverna-run-impl</module>
+ <module>taverna-services-api</module>
+ <module>taverna-services-impl</module>
+ <module>taverna-stringconstant-activity</module>
+ <module>taverna-workflowmodel-api</module>
+ <module>taverna-workflowmodel-extensions</module>
+ <module>taverna-workflowmodel-impl</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</developerConnection>
+ <url>https://github.com/apache/incubator-taverna-engine</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-observer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-observer/pom.xml b/taverna-observer/pom.xml
index 4b94a2e..81df1f3 100644
--- a/taverna-observer/pom.xml
+++ b/taverna-observer/pom.xml
@@ -1,13 +1,14 @@
<?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>org.apache.taverna.engine</groupId>
- <artifactId>taverna-engine</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-observer</artifactId>
- <packaging>bundle</packaging>
+ <packaging>bundle</packaging>
<name>Apache Taverna Observer pattern</name>
<description>impl of the Observer pattern</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-platform-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/pom.xml b/taverna-platform-integration-tests/pom.xml
index e99c469..0820c5a 100644
--- a/taverna-platform-integration-tests/pom.xml
+++ b/taverna-platform-integration-tests/pom.xml
@@ -222,10 +222,11 @@
</dependency>
<!-- Taverna OSGI Services -->
- <!-- <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>
+ <!-- <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>org.apache.taverna.osgi</groupId>
<artifactId>xml-transformer-service</artifactId>
@@ -274,13 +275,9 @@
<artifactId>taverna-observer</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <!-- is this needed here? (Why?)
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>ui</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- -->
+ <!-- is this needed here? (Why?) -->
+ <!-- <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>ui</artifactId>
+ <version>${project.parent.version}</version> </dependency> -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-credential-manager</artifactId>
@@ -378,7 +375,7 @@
<version>2.0-SNAPSHOT</version>
</dependency>
- <!-- Dependencies declared as provided by some poms - specified here to
+ <!-- Dependencies declared as provided by some poms - specified here to
ensure that they are in the local repository for the testing framework -->
<dependency>
<groupId>commons-dbcp</groupId>
@@ -564,11 +561,21 @@
</exclusion>
</exclusions>
</dependency>
- <!-- <dependency> <groupId>org.apache.ws</groupId> <artifactId>com.springsource.org.apache.ws.security</artifactId>
- <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.apache.ws</groupId>
+ <artifactId>com.springsource.org.apache.ws.security</artifactId>
+ <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>
@@ -579,7 +586,8 @@
<artifactId>martservice</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- -->
+ -->
+
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>com.springsource.org.dom4j</artifactId>
@@ -595,10 +603,19 @@
<artifactId>com.springsource.org.jdom</artifactId>
<version>1.1.0</version>
</dependency>
- <!-- <dependency> <groupId>org.odftoolkit</groupId> <artifactId>odfdom-java.bundle</artifactId>
- <version>0.7.0</version> <exclusions> <exclusion> <groupId>org.apache.xerces</groupId>
- <artifactId>com.springsource.org.apache.xerces</artifactId> </exclusion>
- </exclusions> </dependency> -->
+ <!--
+ <dependency>
+ <groupId>org.odftoolkit</groupId>
+ <artifactId>odfdom-java.bundle</artifactId>
+ <version>0.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>com.springsource.org.apache.xerces</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ -->
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>com.springsource.org.opensaml</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-prov-owl-bindings/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-prov-owl-bindings/pom.xml b/taverna-prov-owl-bindings/pom.xml
index 276386b..207ca7f 100644
--- a/taverna-prov-owl-bindings/pom.xml
+++ b/taverna-prov-owl-bindings/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
-<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>org.apache.taverna.engine</groupId>
@@ -16,19 +17,18 @@
<artifactId>commons-beanutils</artifactId>
<version>1.8.3</version>
</dependency>
-<!--
+ <!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
</dependency>
- -->
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>${jena.version}</version>
- </dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
</dependencies>
<description>OWL bindings using Jena</description>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-prov/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-prov/pom.xml b/taverna-prov/pom.xml
index 79e38ff..aae23c7 100644
--- a/taverna-prov/pom.xml
+++ b/taverna-prov/pom.xml
@@ -1,83 +1,79 @@
-<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>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-engine</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-prov</artifactId>
- <name>Apache Taverna PROV support</name>
- <dependencies>
- <dependency>
- <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>
- <version>${t2.results.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-provenanceconnector</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${taverna.language.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-scufl2-wfbundle</artifactId>
- <version>${taverna.language.version}</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-scufl2-wfdesc</artifactId>
- <version>${taverna.language.version}</version>
- </dependency>
- -->
-
- <dependency>
- <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>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-prov-owl-bindings</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>1.8.3</version>
- </dependency>
-
- </dependencies>
-
+<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>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-prov</artifactId>
+ <name>Apache Taverna PROV support</name>
+ <dependencies>
+ <dependency>
+ <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>
+ <version>${t2.results.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-provenanceconnector</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-wfbundle</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-wfdesc</artifactId>
+ <version>${taverna.language.version}</version>
+ </dependency>
+ -->
+ <dependency>
+ <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>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-prov-owl-bindings</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-provenanceconnector/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-provenanceconnector/pom.xml b/taverna-provenanceconnector/pom.xml
index 98c1a0e..f6a2a0b 100644
--- a/taverna-provenanceconnector/pom.xml
+++ b/taverna-provenanceconnector/pom.xml
@@ -1,15 +1,16 @@
<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
+<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.apache.taverna.engine</groupId>
<artifactId>taverna-engine</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-provenanceconnector</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Provenance Connector</name>
- <description>Database storage and analysis of provenance info (LEGACY)</description>
+ </parent>
+ <artifactId>taverna-provenanceconnector</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Provenance Connector</name>
+ <description>Database storage and analysis of provenance info (LEGACY)</description>
<build>
<plugins>
<plugin>
@@ -54,53 +55,48 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
+ <version>${jdom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons.dbcp.version}</version>
+ <version>${log4j.version}</version>
</dependency>
- <!--
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.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>
+ <version>${commons.io.version}</version> </dependency> -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.lang</artifactId>
- <version>${commons.lang.version}</version>
+ <version>${commons.lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.tupeloproject</groupId>
+ <artifactId>tupelo-cet</artifactId>
+ <version>${tupelo.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.tupeloproject</groupId>
+ <artifactId>tupelo-kernel</artifactId>
+ <version>${tupelo.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openprovenance</groupId>
+ <artifactId>opm-core</artifactId>
+ <version>${opm.version}</version>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.tupeloproject</groupId>
- <artifactId>tupelo-cet</artifactId>
- <version>${tupelo.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.tupeloproject</groupId>
- <artifactId>tupelo-kernel</artifactId>
- <version>${tupelo.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.openprovenance</groupId>
- <artifactId>opm-core</artifactId>
- <version>${opm.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-reference-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-api/pom.xml b/taverna-reference-api/pom.xml
index 1c2664d..3b1f932 100644
--- a/taverna-reference-api/pom.xml
+++ b/taverna-reference-api/pom.xml
@@ -1,5 +1,6 @@
<?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>org.apache.taverna.engine</groupId>
@@ -22,8 +23,8 @@
<configuration>
<instructions>
<Import-Package>
- org.hibernate.proxy;resolution:=optional,
- org.springframework.transaction.*;resolution:=optional, *
+ org.hibernate.proxy;resolution:=optional,
+ org.springframework.transaction.*;resolution:=optional, *
</Import-Package>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-reference-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/pom.xml b/taverna-reference-impl/pom.xml
index 6f530bd..bf2f35f 100644
--- a/taverna-reference-impl/pom.xml
+++ b/taverna-reference-impl/pom.xml
@@ -1,5 +1,6 @@
<?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>org.apache.taverna.engine</groupId>
@@ -36,8 +37,8 @@
org.springframework.orm.*,
*
</Import-Package>
- <!-- <Import-Package> org.aspectj.lang;resolution:=optional, org.springframework.orm.*;resolution:=optional,
- org.hibernate.*;resolution:=optional, org.hibernate.proxy;resolution:=optional,
+ <!-- <Import-Package> org.aspectj.lang;resolution:=optional, org.springframework.orm.*;resolution:=optional,
+ org.hibernate.*;resolution:=optional, org.hibernate.proxy;resolution:=optional,
org.apache.derby.jdbc, * </Import-Package> -->
</instructions>
</configuration>
@@ -86,15 +87,15 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-reference-testhelpers/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/pom.xml b/taverna-reference-testhelpers/pom.xml
index a9730e3..3bece43 100644
--- a/taverna-reference-testhelpers/pom.xml
+++ b/taverna-reference-testhelpers/pom.xml
@@ -1,5 +1,6 @@
<?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>org.apache.taverna.engine</groupId>
@@ -32,7 +33,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-reference-types/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/pom.xml b/taverna-reference-types/pom.xml
index 7e26efb..70302ab 100644
--- a/taverna-reference-types/pom.xml
+++ b/taverna-reference-types/pom.xml
@@ -1,5 +1,6 @@
<?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>org.apache.taverna.engine</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-report-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-api/pom.xml b/taverna-report-api/pom.xml
index 117cf86..08c1d83 100644
--- a/taverna-report-api/pom.xml
+++ b/taverna-report-api/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
<groupId>org.apache.taverna.engine</groupId>
@@ -32,7 +33,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-run-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-api/pom.xml b/taverna-run-api/pom.xml
index 9095fee..fe07c56 100644
--- a/taverna-run-api/pom.xml
+++ b/taverna-run-api/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
<groupId>org.apache.taverna.engine</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-run-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-impl/pom.xml b/taverna-run-impl/pom.xml
index 6620081..23de811 100644
--- a/taverna-run-impl/pom.xml
+++ b/taverna-run-impl/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
<groupId>org.apache.taverna.engine</groupId>
@@ -60,14 +61,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-services-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-services-api/pom.xml b/taverna-services-api/pom.xml
index 51fab93..e452580 100644
--- a/taverna-services-api/pom.xml
+++ b/taverna-services-api/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
<groupId>org.apache.taverna.engine</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-services-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-services-impl/pom.xml b/taverna-services-impl/pom.xml
index 2086a63..b841b7e 100644
--- a/taverna-services-impl/pom.xml
+++ b/taverna-services-impl/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
<groupId>org.apache.taverna.engine</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-stringconstant-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity/pom.xml b/taverna-stringconstant-activity/pom.xml
index 190e806..22a856d 100644
--- a/taverna-stringconstant-activity/pom.xml
+++ b/taverna-stringconstant-activity/pom.xml
@@ -1,5 +1,6 @@
<?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>org.apache.taverna.engine</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-workflowmodel-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-api/pom.xml b/taverna-workflowmodel-api/pom.xml
index 5c6e63d..c73b85c 100644
--- a/taverna-workflowmodel-api/pom.xml
+++ b/taverna-workflowmodel-api/pom.xml
@@ -1,10 +1,11 @@
<?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>org.apache.taverna.engine</groupId>
- <artifactId>taverna-engine</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-workflowmodel-api</artifactId>
<packaging>bundle</packaging>
@@ -17,12 +18,12 @@
</description>
<dependencies>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-reference-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-observer</artifactId>
<version>${project.parent.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-workflowmodel-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-extensions/pom.xml b/taverna-workflowmodel-extensions/pom.xml
index 4f1be7a..3d6b2a3 100644
--- a/taverna-workflowmodel-extensions/pom.xml
+++ b/taverna-workflowmodel-extensions/pom.xml
@@ -1,30 +1,31 @@
-<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">
+<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>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-engine</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ </parent>
<artifactId>taverna-workflowmodel-extensions</artifactId>
<packaging>bundle</packaging>
<name>Apache Taverna Workflow Model Extension Points</name>
<description>Implementation of core extension points to the workflow model</description>
<dependencies>
- <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.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <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.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/1c635c7a/taverna-workflowmodel-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/pom.xml b/taverna-workflowmodel-impl/pom.xml
index 97367e5..85fd28e 100644
--- a/taverna-workflowmodel-impl/pom.xml
+++ b/taverna-workflowmodel-impl/pom.xml
@@ -1,10 +1,11 @@
<?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>org.apache.taverna.engine</groupId>
- <artifactId>taverna-engine</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-engine</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-workflowmodel-impl</artifactId>
<packaging>bundle</packaging>
@@ -23,9 +24,9 @@
<configuration>
<instructions>
<Export-Package>
- net.sf.taverna.t2.invocation.impl,
- net.sf.taverna.t2.workflowmodel.impl,
- net.sf.taverna.t2.workflowmodel.processor.iteration.impl,
+ net.sf.taverna.t2.invocation.impl,
+ net.sf.taverna.t2.workflowmodel.impl,
+ net.sf.taverna.t2.workflowmodel.processor.iteration.impl,
</Export-Package>
</instructions>
</configuration>
@@ -41,7 +42,7 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
+ <version>${jdom.version}</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -58,13 +59,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>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>
</dependencies>