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:37:29 UTC
[69/70] [abbrv] incubator-taverna-common-activities git commit:
org.apache.taverna poms
org.apache.taverna poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/1d3c1506
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/1d3c1506
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/1d3c1506
Branch: refs/heads/master
Commit: 1d3c15066ebda28d4a1d8e4f00297e2a8b0b6cd1
Parents: cdab5fc
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 29 10:16:52 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 29 10:16:52 2015 +0000
----------------------------------------------------------------------
pom.xml | 1 +
taverna-beanshell-activity/pom.xml | 117 ++++++++++---------
taverna-external-tool-activity/pom.xml | 88 ++++++---------
taverna-interaction-activity/pom.xml | 103 ++++++-----------
taverna-rest-activity/pom.xml | 137 ++++++++++-------------
taverna-spreadsheet-import-activity/pom.xml | 85 ++++++--------
taverna-wsdl-activity/pom.xml | 96 ++++++++--------
taverna-wsdl-generic/pom.xml | 54 ++-------
taverna-xpath-activity/pom.xml | 51 ++-------
9 files changed, 289 insertions(+), 443 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 505b5c2..98bfbe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
<taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
</properties>
<modules>
+ <module>taverna-beanshell-activity</module>
<module>taverna-external-tool-activity</module>
<module>taverna-interaction-activity</module>
<module>taverna-rest-activity</module>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/taverna-beanshell-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/pom.xml b/taverna-beanshell-activity/pom.xml
index f95b03e..1654296 100644
--- a/taverna-beanshell-activity/pom.xml
+++ b/taverna-beanshell-activity/pom.xml
@@ -3,45 +3,50 @@
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.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>beanshell-activity</artifactId>
+ <artifactId>taverna-beanshell-activity</artifactId>
<packaging>bundle</packaging>
- <version>2.0.1-SNAPSHOT</version>
- <name>Taverna 2 Beanshell Activity</name>
+ <name>Apache Taverna Beanshell Activity</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>artifactId=bsh</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>dependency-activity</artifactId>
- <version>${t2.activities.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>
- </dependency>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>com.springsource.bsh</artifactId>
- <version>${bsh.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.2.2</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -50,42 +55,36 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>activity-test-utils</artifactId>
- <version>${t2.activities.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-activity-test-utils</artifactId>
+ <version>${taverna.engine.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-impl</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-impl</artifactId>
+ <version>${taverna.engine.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-beanshell-activity.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-beanshell-activity.git</developerConnection>
- <url>https://github.com/taverna/taverna-beanshell-activity/</url>
- <tag>HEAD</tag>
- </scm>
+ <dependency>
+ <groupId>org.apache-extras.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>${bsh.version}</version>
+ </dependency>
+ </dependencies>
+
+<!-- See https://code.google.com/a/apache-extras.org/p/beanshell/issues/detail?id=6
+ TODO: Remove below <repository> once in Maven Central -->
+
+ <repositories>
+ <repository>
+ <id>bintray.beanshell</id>
+ <name>bintray</name>
+ <url>http://dl.bintray.com/beanshell/Beanshell</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/taverna-external-tool-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/pom.xml b/taverna-external-tool-activity/pom.xml
index 17c551f..49ddfbd 100644
--- a/taverna-external-tool-activity/pom.xml
+++ b/taverna-external-tool-activity/pom.xml
@@ -3,41 +3,40 @@
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.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>external-tool-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <artifactId>taverna-external-tool-activity</artifactId>
<packaging>bundle</packaging>
- <name>Taverna 2 External Tool Activity</name>
+ <name>Apache Taverna External Tool Activity</name>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-core-extensions</artifactId>
- <version>${t2.reference-core-extensions.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-credential-manager</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
+
<dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager</artifactId>
- <version>${t2.security.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-types</artifactId>
+ <version>${taverna.engine.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.jdom</groupId>
@@ -58,6 +57,16 @@
<groupId>org.openengsb.wrapped</groupId>
<artifactId>com.jcraft.jsch-all</artifactId>
<version>${jsch.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jzlib</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--dependency>
<groupId>com.jcraft.jsch</groupId>
@@ -71,43 +80,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>activity-test-utils</artifactId>
- <version>${t2.activities.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-activity-test-utils</artifactId>
+ <version>${taverna.engine.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>
- <repository>
- <id>repository.springframework.maven.release</id>
- <name>Spring Framework Maven Release Repository</name>
- <url>http://maven.springframework.org/release</url>
- </repository>
- </repositories>
- <scm>
- <connection>scm:git:https://github.com/taverna/taverna-external-tool-activity.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-external-tool-activity.git</developerConnection>
- <url>https://github.com/taverna/taverna-external-tool-activity/</url>
- <tag>HEAD</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/taverna-interaction-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/pom.xml b/taverna-interaction-activity/pom.xml
index de9cbbd..b32410c 100644
--- a/taverna-interaction-activity/pom.xml
+++ b/taverna-interaction-activity/pom.xml
@@ -3,16 +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</groupId>
- <artifactId>taverna-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>interaction-activity</artifactId>
- <version>2.0.l-SNAPSHOT</version>
+ <artifactId>taverna-interaction-activity</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Interaction activity</name>
-
+ <name>Apache Taverna Interaction Activity</name>
+
<build>
<plugins>
<plugin>
@@ -29,34 +27,30 @@
</plugin>
</plugins>
</build>
-
- <properties>
- <jetty.version>6.1.24</jetty.version>
- <abdera.version>1.1.3</abdera.version>
- <jackson.version>1.9.13</jackson.version>
- <velocity.version>1.7</velocity.version>
- </properties>
<dependencies>
-
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${t2.core.version}</version>
+
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
-
- <dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager</artifactId>
- <version>${t2.core.version}</version>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-credential-manager</artifactId>
+ <version>${taverna.engine.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-activity-test-utils</artifactId>
+ <version>${taverna.engine.version}</version>
+ <scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>activity-test-utils</artifactId>
- <version>${t2.activities.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -69,22 +63,22 @@
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
-
-
+
+
<!-- Mortbay jetty artifacts are bundles -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -95,15 +89,15 @@
<groupId>net.sf.webdav-servlet</groupId>
<artifactId>webdav-servlet</artifactId>
<version>2.0</version>
- </dependency>
-
+ </dependency>
+
<!-- The abdera artifacts are bundles -->
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
<version>${abdera.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-client</artifactId>
@@ -156,36 +150,9 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <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>
- <scm>
- <connection>scm:git:https://github.com/taverna/taverna-interaction-activity.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-interaction-activity.git</developerConnection>
- <url>https://github.com/taverna/taverna-interaction-activity/</url>
- <tag>HEAD</tag>
- </scm>
-
-
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/taverna-rest-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/pom.xml b/taverna-rest-activity/pom.xml
index cb90583..aa0cba3 100644
--- a/taverna-rest-activity/pom.xml
+++ b/taverna-rest-activity/pom.xml
@@ -3,31 +3,29 @@
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.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>rest-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- <name>Taverna REST Activity</name>
+ <artifactId>taverna-rest-activity</artifactId>
+ <name>Apache Taverna REST Activity</name>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager</artifactId>
- <version>${t2.security.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-credential-manager</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
@@ -35,21 +33,51 @@
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>com.springsource.org.apache.httpcomponents.httpclient</artifactId>
- <version>${apache.httpclient.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>com.springsource.org.apache.httpcomponents.httpclient-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>com.springsource.org.apache.httpcomponents.httpmime</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>${apache.httpclient.version}</version>
+ <exclusions>
+ <!-- These are all embedded within httpclient-osgi -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>${apache.httpcore.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
@@ -58,52 +86,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>activity-test-utils</artifactId>
- <version>${t2.activities.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-activity-test-utils</artifactId>
+ <version>${taverna.engine.version}</version>
<scope>test</scope>
</dependency>
- <!--
- for opening configuration dialog of XPath activity
- from 'Solution' area of 'VisitExplainer'
-
- <dependency>
- <groupId>net.sf.taverna.t2.ui-api</groupId>
- <artifactId>report-api</artifactId>
- <version>${t2.ui.api.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-components</groupId>
- <artifactId>report-view</artifactId>
- <version>${t2.ui.components.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-rest-activity.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-rest-activity.git</developerConnection>
- <url>https://github.com/taverna/taverna-rest-activity/</url>
- <tag>HEAD</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/taverna-spreadsheet-import-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/pom.xml b/taverna-spreadsheet-import-activity/pom.xml
index 7369bf6..ff86d5b 100644
--- a/taverna-spreadsheet-import-activity/pom.xml
+++ b/taverna-spreadsheet-import-activity/pom.xml
@@ -2,15 +2,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.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>spreadsheet-import-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <artifactId>taverna-spreadsheet-import-activity</artifactId>
<packaging>bundle</packaging>
- <name>Taverna 2 Spreadsheet Import Activity</name>
+ <name>Apache Taverna Spreadsheet Import Activity</name>
<description>Activity to import data from spreadsheet files</description>
<build>
@@ -41,14 +39,14 @@
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
@@ -67,6 +65,7 @@
</exclusions>
</dependency>
<dependency>
+ <!-- FIXME: Use Apache ODFDom (incubating) -->
<groupId>org.odftoolkit</groupId>
<artifactId>odfdom-java</artifactId>
<version>${odfdom.version}</version>
@@ -84,8 +83,8 @@
<version>${xmlbeans.version}</version>
</dependency>
<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>
@@ -94,45 +93,29 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>activity-test-utils</artifactId>
- <version>${t2.activities.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-activity-test-utils</artifactId>
+ <version>${taverna.engine.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <!-- This repository is down (2012-03-19) and as the project has moved
- to apache it's unclear if it will return. odfdom-java-0.7 artifact has been
- deployed to the mygrid repository. -->
- <!-- <repository> <id>odftoolkit</id> <name>Odftoolkit Repository</name>
- <url>https://svn.odftoolkit.org/svn/odfdom~maven2/release</url> <releases>
- <checksumPolicy>fail</checksumPolicy> </releases> <snapshots> <checksumPolicy>fail</checksumPolicy>
- </snapshots> </repository> -->
- <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-spreadsheet-import-activity.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-spreadsheet-import-activity.git</developerConnection>
- <url>https://github.com/taverna/taverna-spreadsheet-import-activity/</url>
- <tag>HEAD</tag>
- </scm>
+
+ <repositories>
+
+ <!-- for outdated odfdom -->
+ <repository>
+ <id>mygrid-ext-release-local</id>
+ <name>myGrid ext-release-local</name>
+ <url>http://repository.mygrid.org.uk/artifactory/ext-release-local</url>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ </repositories>
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/taverna-wsdl-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/pom.xml b/taverna-wsdl-activity/pom.xml
index 7af8cf8..d92b618 100644
--- a/taverna-wsdl-activity/pom.xml
+++ b/taverna-wsdl-activity/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>
- <artifactId>taverna-parent</artifactId>
- <groupId>net.sf.taverna</groupId>
- <version>3.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>wsdl-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <artifactId>taverna-wsdl-activity</artifactId>
<packaging>bundle</packaging>
- <name>Taverna 2 WSDL Activity</name>
+ <name>Apache Taverna WSDL Activity</name>
<build>
<plugins>
<plugin>
@@ -30,30 +28,31 @@
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna</groupId>
- <artifactId>wsdl-generic</artifactId>
- <version>${wsdl.generic.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-wsdl-generic</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager</artifactId>
- <version>${t2.security.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-credential-manager</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
<version>${jdom.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.ws</groupId>
<artifactId>com.springsource.org.apache.ws.security</artifactId>
@@ -64,9 +63,29 @@
<artifactId>com.springsource.org.apache.xml.security</artifactId>
<version>${xml.security.version}</version>
</dependency>
+-->
+<!--
+<dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>com.springsource.org.apache.axis</artifactId>
+ <version>1.4.0</version>
+</dependency>
+-->
+<dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>${wss4j.version}</version>
+ <!-- NOTE: wss4j 1.6 removes org.apache.ws.axis.security.WSDoAllSender
+ Do we still need this? I can't see how it's used.. -->
+</dependency>
+<dependency>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>${santuario.xmlsec.version}</version>
+</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
@@ -82,39 +101,18 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>activity-test-utils</artifactId>
- <version>${t2.activities.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-activity-test-utils</artifactId>
+ <version>${taverna.engine.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-impl</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-impl</artifactId>
+ <version>${taverna.engine.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-common-activities/blob/1d3c1506/taverna-wsdl-generic/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/pom.xml b/taverna-wsdl-generic/pom.xml
index 7c49241..0b7644f 100644
--- a/taverna-wsdl-generic/pom.xml
+++ b/taverna-wsdl-generic/pom.xml
@@ -3,17 +3,15 @@
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.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna</groupId>
- <artifactId>wsdl-generic</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <artifactId>taverna-wsdl-generic</artifactId>
<packaging>bundle</packaging>
- <name>wsdl-generic</name>
+ <name>Apache Taverna WSDL-generic Library</name>
<description>
- WSDL handling classes bundled for Taverna 3 OSGi
+ Generic WSDL SOAP handling (parsing, calling)
</description>
<build>
@@ -60,8 +58,8 @@
<version>${axis.version}</version>
</dependency>
<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>
@@ -91,40 +89,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <repositories>
- <repository>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository</url>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- </repositories>
- <scm>
- <connection>scm:svn:http://taverna.googlecode.com/svn/taverna/utils/net.sf.taverna.wsdl-generic/trunk/</connection>
- <developerConnection>scm:svn:https://taverna.googlecode.com/svn/taverna/utils/net.sf.taverna.wsdl-generic/trunk/</developerConnection>
- <url>http://code.google.com/p/taverna/source/browse/#svn/taverna/utils/net.sf.taverna.wsdl-generic/trunk/</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1d3c1506/taverna-xpath-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/pom.xml b/taverna-xpath-activity/pom.xml
index ecf89fa..1012b73 100644
--- a/taverna-xpath-activity/pom.xml
+++ b/taverna-xpath-activity/pom.xml
@@ -2,14 +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>
- <groupId>net.sf.taverna</groupId>
- <artifactId>taverna-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.commonactivities</groupId>
+ <artifactId>taverna-common-activities</artifactId>
+ <version>2.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>xpath-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- <name>Taverna XPath Activity</name>
+ <artifactId>taverna-xpath-activity</artifactId>
+ <name>Apache Taverna XPath Activity</name>
<packaging>bundle</packaging>
<build>
<plugins>
@@ -25,43 +23,16 @@
</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>
- <scm>
- <connection>scm:git:https://github.com/taverna/taverna-xpath-activity.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-xpath-activity.git</developerConnection>
- <url>https://github.com/taverna/taverna-xpath-activity/</url>
- <tag>master</tag>
- </scm>
-
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-reference-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-api</artifactId>
- <version>${t2.core.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>