org.apache.taverna.engine etc
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/47ed9d6c Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/47ed9d6c Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/47ed9d6c Branch: refs/heads/master Commit: 47ed9d6c2bad5d04da37d01cb97e0a0b86927ba7 Parents: 1e68144 Author: Stian Soiland-Reyes <[email protected]> Authored: Fri Mar 6 22:15:46 2015 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Fri Mar 6 22:15:46 2015 +0000 ---------------------------------------------------------------------- pom.xml | 2 -- taverna-disabled-activity-ui/pom.xml | 6 ++-- taverna-workbench-activity-palette-impl/pom.xml | 8 ++--- taverna-workbench-iteration-strategy-ui/pom.xml | 8 ++--- taverna-workbench-monitor-view/pom.xml | 4 +-- .../pom.xml | 4 +-- taverna-workbench-perspective-results/pom.xml | 2 +- taverna-workbench-reference-ui/pom.xml | 4 +-- taverna-workbench-renderers-api/pom.xml | 2 +- taverna-workbench-renderers-exts/pom.xml | 2 +- taverna-workbench-renderers-impl/pom.xml | 2 +- taverna-workbench-report-explainer/pom.xml | 32 ++++++++++---------- taverna-workbench-report-impl/pom.xml | 4 +-- taverna-workbench-results-view/pom.xml | 10 +++--- taverna-workbench-run-ui/pom.xml | 4 +-- 15 files changed, 46 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4d24ebf..8db98c2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,9 +33,7 @@ <taverna.language.version>0.15.0-incubating-SNAPSHOT</taverna.language.version> <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version> <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version> - <!-- should not use: <taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version> - --> </properties> <modules> <module>taverna-dataflow-activity-ui</module> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-disabled-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/pom.xml b/taverna-disabled-activity-ui/pom.xml index 528ebcf..c26dcdc 100644 --- a/taverna-disabled-activity-ui/pom.xml +++ b/taverna-disabled-activity-ui/pom.xml @@ -59,9 +59,9 @@ <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.activities</groupId> - <artifactId>beanshell-activity</artifactId> - <version>${t2.activities.version}</version> + <groupId>org.apache.taverna.commonactivities</groupId> + <artifactId>taverna-beanshell-activity</artifactId> + <version>${taverna.commonactivities.version}</version> </dependency> <dependency> <groupId>javax.help</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-activity-palette-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-activity-palette-impl/pom.xml b/taverna-workbench-activity-palette-impl/pom.xml index bed75bb..3508f38 100644 --- a/taverna-workbench-activity-palette-impl/pom.xml +++ b/taverna-workbench-activity-palette-impl/pom.xml @@ -34,9 +34,9 @@ <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-api</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.lang</groupId> @@ -69,9 +69,9 @@ <!-- TODO Remove non-test impl dependency --> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-impl</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-iteration-strategy-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-iteration-strategy-ui/pom.xml b/taverna-workbench-iteration-strategy-ui/pom.xml index f143153..ce47f16 100644 --- a/taverna-workbench-iteration-strategy-ui/pom.xml +++ b/taverna-workbench-iteration-strategy-ui/pom.xml @@ -29,9 +29,9 @@ <description>An SPI system for building UI menues</description> <dependencies> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-api</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.lang</groupId> @@ -70,9 +70,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-impl</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> <!-- <scope>test</scope> --> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-monitor-view/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-monitor-view/pom.xml b/taverna-workbench-monitor-view/pom.xml index 2e3b3f6..962367f 100644 --- a/taverna-workbench-monitor-view/pom.xml +++ b/taverna-workbench-monitor-view/pom.xml @@ -53,12 +53,12 @@ <version>${t2.lang.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-report-api</artifactId> <version>${platform.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-run-api</artifactId> <version>${platform.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-perspective-biocatalogue/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-perspective-biocatalogue/pom.xml b/taverna-workbench-perspective-biocatalogue/pom.xml index f967fc4..4188449 100644 --- a/taverna-workbench-perspective-biocatalogue/pom.xml +++ b/taverna-workbench-perspective-biocatalogue/pom.xml @@ -41,9 +41,9 @@ <!-- <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>perspective-core</artifactId> <version>${project.parent.version}</version> </dependency> --> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-impl</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> <groupId>${project.parent.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-perspective-results/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-perspective-results/pom.xml b/taverna-workbench-perspective-results/pom.xml index 44ee583..bed0f48 100644 --- a/taverna-workbench-perspective-results/pom.xml +++ b/taverna-workbench-perspective-results/pom.xml @@ -55,7 +55,7 @@ <version>${t2.lang.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-run-api</artifactId> <version>${platform.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-reference-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-reference-ui/pom.xml b/taverna-workbench-reference-ui/pom.xml index cd6153e..3d54f71 100644 --- a/taverna-workbench-reference-ui/pom.xml +++ b/taverna-workbench-reference-ui/pom.xml @@ -59,12 +59,12 @@ <version>${t2.baclava.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-run-api</artifactId> <version>${platform.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.databundle</groupId> + <groupId>org.apache.taverna.language</groupId> <artifactId>databundle</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-renderers-api/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-renderers-api/pom.xml b/taverna-workbench-renderers-api/pom.xml index 7dbdb62..43dd94e 100644 --- a/taverna-workbench-renderers-api/pom.xml +++ b/taverna-workbench-renderers-api/pom.xml @@ -28,7 +28,7 @@ <name>Renderers API</name> <dependencies> <dependency> - <groupId>uk.org.taverna.databundle</groupId> + <groupId>org.apache.taverna.language</groupId> <artifactId>databundle</artifactId> <version>${taverna.databundle.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-renderers-exts/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-renderers-exts/pom.xml b/taverna-workbench-renderers-exts/pom.xml index 3bfa11e..373d4d5 100644 --- a/taverna-workbench-renderers-exts/pom.xml +++ b/taverna-workbench-renderers-exts/pom.xml @@ -37,7 +37,7 @@ <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.databundle</groupId> + <groupId>org.apache.taverna.language</groupId> <artifactId>databundle</artifactId> <version>0.1.0-SNAPSHOT</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-renderers-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-renderers-impl/pom.xml b/taverna-workbench-renderers-impl/pom.xml index 2355130..89e1d8c 100644 --- a/taverna-workbench-renderers-impl/pom.xml +++ b/taverna-workbench-renderers-impl/pom.xml @@ -52,7 +52,7 @@ <version>${t2.lang.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.databundle</groupId> + <groupId>org.apache.taverna.language</groupId> <artifactId>databundle</artifactId> <version>${taverna.databundle.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-report-explainer/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-report-explainer/pom.xml b/taverna-workbench-report-explainer/pom.xml index cf9f5ac..9ca8d50 100644 --- a/taverna-workbench-report-explainer/pom.xml +++ b/taverna-workbench-report-explainer/pom.xml @@ -38,27 +38,27 @@ <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>retry-ui</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.ui-activities</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>dataflow-activity-ui</artifactId> - <version>${t2.ui.activities.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.ui-activities</groupId> - <artifactId>disabled-activity-ui</artifactId> - <version>${t2.ui.activities.version}</version> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-disabled-activity-ui</artifactId> + <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.activities</groupId> - <artifactId>wsdl-activity</artifactId> - <version>${t2.activities.version}</version> + <groupId>org.apache.taverna.commonactivities</groupId> + <artifactId>taverna-wsdl-activity</artifactId> + <version>${taverna.commonactivities.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.activities</groupId> - <artifactId>dataflow-activity</artifactId> - <version>${t2.activities.version}</version> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-dataflow-activity</artifactId> + <version>${taverna.engine.version}</version> </dependency> <dependency> <groupId>junit</groupId> @@ -66,9 +66,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-api</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> <groupId>${project.parent.groupId}</groupId> @@ -96,9 +96,9 @@ <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-impl</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.lang</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-report-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-report-impl/pom.xml b/taverna-workbench-report-impl/pom.xml index ee86323..d0c6c16 100644 --- a/taverna-workbench-report-impl/pom.xml +++ b/taverna-workbench-report-impl/pom.xml @@ -28,9 +28,9 @@ <name>Reporting Implementation</name> <dependencies> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>workflowmodel-api</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> <groupId>${project.parent.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-results-view/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-results-view/pom.xml b/taverna-workbench-results-view/pom.xml index 941ec9b..c0aa290 100644 --- a/taverna-workbench-results-view/pom.xml +++ b/taverna-workbench-results-view/pom.xml @@ -87,24 +87,24 @@ <version>${taverna.configuration.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-report-api</artifactId> <version>${platform.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-run-api</artifactId> <version>${platform.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.databundle</groupId> + <groupId>org.apache.taverna.language</groupId> <artifactId>databundle</artifactId> </dependency> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>provenanceconnector</artifactId> - <version>${t2.core.version}</version> + <version>${taverna.engine.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/47ed9d6c/taverna-workbench-run-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-workbench-run-ui/pom.xml b/taverna-workbench-run-ui/pom.xml index 20dcd95..a71b48a 100644 --- a/taverna-workbench-run-ui/pom.xml +++ b/taverna-workbench-run-ui/pom.xml @@ -58,12 +58,12 @@ <version>${t2.lang.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-run-api</artifactId> <version>${platform.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-execution-api</artifactId> <version>${platform.version}</version> </dependency>
